1 files changed, 21 insertions, 10 deletions

diff --git a/src/org/gnunet/construct/MessageLoader.java b/src/org/gnunet/construct/MessageLoader.java
index d40dfda..7ba2e60 100644
--- a/src/org/gnunet/construct/MessageLoader.java
+++ b/src/org/gnunet/construct/MessageLoader.java
@@ -37,21 +37,26 @@ import java.util.Map;
 
 
 /**
- * Load message maps
+ * Load message maps, which contain the information the parse/write unions.
  */
 public class MessageLoader {
     private static final Logger logger = LoggerFactory
             .getLogger(MessageLoader.class);
 
 
-
-
+    /**
+     * Thrown when a trying to serialize an object that is not registered as a union type.
+     */
     public static class UnknownUnionException extends RuntimeException {
         public UnknownUnionException(String msg) {
             super(msg);
         }
     }
 
+
+    /**
+     * Thrown when parsing a union whose ID is not known.
+     */
     public static class UnknownUnionIdException extends RuntimeException {
 
     }
@@ -86,19 +91,22 @@ public class MessageLoader {
     }
 
     public static void loadMessageMap(URL loc) {
-        if (loc == null)
+        if (loc == null) {
             throw new RuntimeException("could not load message map");
+        }
         BufferedReader in = null;
         try {
             in = new BufferedReader(new InputStreamReader(loc.openStream()));
             String line;
             while ((line = in.readLine()) != null) {
                 // skip empty lines and comments
-                if (line.isEmpty() || line.charAt(0) == '#')
+                if (line.isEmpty() || line.charAt(0) == '#') {
                     continue;
+                }
                 String[] m = line.split("=");
-                if (m.length != 2)
+                if (m.length != 2) {
                     throw new RuntimeException("invalid message map format (separation by '=')");
+                }
                 String[] left = m[0].split("[|]");
                 if (left.length != 2) {
                     logger.debug(m[0]);
@@ -134,8 +142,9 @@ public class MessageLoader {
 
     private static void maybeClose(Closeable in) {
         try {
-            if (in != null)
+            if (in != null) {
                 in.close();
+            }
         } catch (IOException e) {
             throw new RuntimeException("error closing stream: " + e.getMessage());
         }
@@ -164,7 +173,7 @@ public class MessageLoader {
 
         Class<? extends MessageUnion> cls = map.get(tag);
         if (cls == null) {
-            throw new ProtocolViolation("don't know how to translate message of type " + tag);
+            throw new ProtocolViolationException("don't know how to translate message of type " + tag);
         }
 
         return cls;
@@ -173,10 +182,12 @@ public class MessageLoader {
 
     public static int getUnionTag(Class<? extends MessageUnion> unionInterface, Class<? extends MessageUnion> unionCase) {
         Map<Class<? extends MessageUnion>, Integer> map = tagmap.get(unionInterface);
-        if (map == null)
+        if (map == null) {
             throw new AssertionError(String.format("%s is not a known union type", unionInterface));
-        if (!map.containsKey(unionCase))
+        }
+        if (!map.containsKey(unionCase)) {
             throw new AssertionError(String.format("%s is not a known instance of %s", unionCase, unionInterface));
+        }
         return map.get(unionCase);
     }
 }