[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21026 - in gnunet-java: . src/org/gnunet/construct
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21026 - in gnunet-java: . src/org/gnunet/construct |
Date: |
Thu, 19 Apr 2012 13:51:11 +0200 |
Author: dold
Date: 2012-04-19 13:51:11 +0200 (Thu, 19 Apr 2012)
New Revision: 21026
Modified:
gnunet-java/ISSUES
gnunet-java/src/org/gnunet/construct/MessageLoader.java
gnunet-java/src/org/gnunet/construct/MsgMap.txt
Log:
added mechanism to find new MsgMap.txt files
Modified: gnunet-java/ISSUES
===================================================================
--- gnunet-java/ISSUES 2012-04-19 11:39:16 UTC (rev 21025)
+++ gnunet-java/ISSUES 2012-04-19 11:51:11 UTC (rev 21026)
@@ -451,8 +451,16 @@
---------------------------------------------------------------------------------------
+
+* regarding message maps of extensions: isn't it a better solution to just
+ search the classpath (with
getResources("org/gnunet/construct/MessageMap.txt")), or am I missing
+ something?
+ * this approach works, just implemented. one can now add message maps by
adding them to classpath
+
* questions on https://gnunet.org/bugs/view.php?id=2277
+
+
* if bufferbloat is bad, why do we keep reimplementing action queues / buffers
and in almost every
service api, just not on the lowest level (client)? (c.f. the ControlMessage
queue)
Modified: gnunet-java/src/org/gnunet/construct/MessageLoader.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/MessageLoader.java 2012-04-19
11:39:16 UTC (rev 21025)
+++ gnunet-java/src/org/gnunet/construct/MessageLoader.java 2012-04-19
11:51:11 UTC (rev 21026)
@@ -32,8 +32,8 @@
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.lang.Integer;
import java.net.URL;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -57,11 +57,20 @@
static {
- loadMessageMap();
+ ClassLoader classLoader = MessageLoader.class.getClassLoader();
+ Enumeration<URL> resources;
+ try {
+ resources =
classLoader.getResources("org/gnunet/construct/MsgMap.txt");
+ } catch (IOException e) {
+ throw new RuntimeException("something went wrong with loading
MsgMap.txt");
+ }
+ while (resources.hasMoreElements()) {
+ loadMessageMap(resources.nextElement());
+ }
+
}
- public static void loadMessageMap() {
- URL loc = MessageLoader.class.getResource("MsgMap.txt");
+ public static void loadMessageMap(URL loc) {
if (loc == null)
throw new RuntimeException("could not load message map");
BufferedReader in = null;
Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt 2012-04-19 11:39:16 UTC
(rev 21025)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt 2012-04-19 11:51:11 UTC
(rev 21026)
@@ -24,4 +24,4 @@
org.gnunet.util.GnunetMessage$Body|321=org.gnunet.nse.NetworkSizeEstimation$StartMessage
org.gnunet.util.GnunetMessage$Body|144=org.gnunet.dht.DistributedHashTable$DHTClientGetStopMessage
org.gnunet.util.GnunetMessage$Body|145=org.gnunet.dht.DistributedHashTable$DHTClientResultMessage
-# generated 2012/04/18 23:26:44
+# generated 2012/04/19 13:45:01
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21026 - in gnunet-java: . src/org/gnunet/construct,
gnunet <=