1 files changed, 45 insertions, 16 deletions

diff --git a/src/org/gnunet/construct/Construct.java b/src/org/gnunet/construct/Construct.java
index 603f5a5..965b97b 100644
--- a/src/org/gnunet/construct/Construct.java
+++ b/src/org/gnunet/construct/Construct.java
@@ -50,7 +50,7 @@ Wanted syntax (not fully implemented yet)
 
 
 /**
- * Parse and write the binary representation of java classes, as defined by org.gnunet.construct.*-Annotations
+ * Parse and write the binary representation of java classes, as defined by org.gnunet.construct.*-annotations
  * on their members.
  *
  * @author Christian Grothoff
@@ -62,9 +62,18 @@ public class Construct {
             .getLogger(Construct.class);
 
 
-    private static HashMap<Class<? extends Message>, Parser> parserCache = new HashMap<Class<? extends Message>,
+    private static Map<Class<? extends Message>, Parser> parserCache = new HashMap<Class<? extends Message>,
             Parser>(100);
 
+
+    /**
+     * The class Construct is not intended to be instantiated, this its constructor is private.
+     */
+    private Construct() {
+
+    }
+
+
     /**
      * Given a byte buffer with a message, parse it into an object of type c. The
      * fields of the class are expected to be annotated with annotations from
@@ -82,6 +91,15 @@ public class Construct {
         return m;
     }
 
+    /**
+     * Given a byte array with a message, parse it into an object of type c. The
+     * fields of the class are expected to be annotated with annotations from
+     * the construct package.
+     *
+     * @param srcBuf buffer with the serialized binary data
+     * @param c      desired object type to return
+     * @return instance of the desired object type
+     */
     public static <T extends Message> T parseAs(byte[] srcBuf, Class<T> c) {
         return parseAs(ByteBuffer.wrap(srcBuf), c);
     }
@@ -248,8 +266,7 @@ public class Construct {
             Field nestedField = field;
 
             if (n.newFrame()) {
-                ParserGenerator pg = new ParserGenerator();
-                Parser p = getParser((Class<Message>) nestedField.getType(), pg);
+                Parser p = getParser((Class<Message>) nestedField.getType());
 
                 parser = new NestedParser(p, n.optional(), nestedField, true);
 
@@ -269,11 +286,6 @@ public class Construct {
             }
         }
 
-        public void visit(ByteFill bf) {
-            parser = new ByteFillParser(field);
-        }
-
-
         public void visit(FixedSizeArray fsa) {
             Field f = field;
             int elemNumber = fsa.length();
@@ -284,14 +296,13 @@ public class Construct {
             parser = new FixedSizeArrayParser(elemNumber, parser, f);
         }
 
-        public void visit(FixedSizeByteArray fsba) {
-            Field f = field;
-            int elemNumber = fsba.length();
 
-            parser = new FixedSizeByteArrayParser(elemNumber, f);
+        public void visit(FixedSizeIntegerArray fsa) {
+            Field f = field;
+            int elemNumber = fsa.length();
+            parser = new FixedSizeIntegerArrayParser(elemNumber, fsa.signed(), fsa.bitSize() / 8, f);
         }
 
-
         public void visit(Double d) {
             if (!field.getType().equals(java.lang.Double.TYPE)) {
                 throw new AssertionError("@Double target must be a primitive 'double' field");
@@ -322,6 +333,10 @@ public class Construct {
             Parser p = getParser((Class<? extends Message>) field.getType()
                     .getComponentType());
 
+            if (!Message.class.isAssignableFrom(field.getType().getComponentType())) {
+                throw new AssertionError("VariableSizeArray only valid on arrays of messages.");
+            }
+
             try {
                 parser = new VariableSizeArrayParser(p, c.getField(vsa
                         .lengthField()), field);
@@ -412,10 +427,10 @@ public class Construct {
     }
 
     /**
-     * Compute the size of a serialized message.
+     * Compute the exact size of a serialized message.
      *
      * @param m object to serialize
-     * @return number of bytes required, -1 on error
+     * @return number of bytes required to store the message in binary form
      */
     public static int getSize(Message m) {
         if (m == null) {
@@ -425,6 +440,13 @@ public class Construct {
         return p.getSize(m);
     }
 
+
+    /**
+     * Return the binary representation of the message m
+     *
+     * @param m the message to serialize
+     * @return a byte array containing the serialized message
+     */
     public static byte[] toBinary(Message m) {
         byte[] a = new byte[getSize(m)];
         ByteBuffer buf = ByteBuffer.wrap(a);
@@ -432,6 +454,13 @@ public class Construct {
         return a;
     }
 
+    /**
+     * Fill in all fields of a message that are inferable from existing information.
+     *
+     * Examples: The size field for variable size arrays, the type of unions, ...
+     *
+     * @param m the message that should be patched
+     */
     public static void patch(Message m) {
         Parser p = getParser(m.getClass());
         p.patch(m, p.getSize(m), null, m);