14 files changed, 148 insertions, 79 deletions

diff --git a/java/com/xagasoft/gats/Boolean.java b/java/com/xagasoft/gats/Boolean.java
deleted file mode 100644
index 692247a..0000000
--- a/java/com/xagasoft/gats/Boolean.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xagasoft.gats;
-
-public class Boolean extends GatsObject
-{
-        public int getGatsObject()
-        {
-                return GatsObject.BOOLEAN;
-        }
-};
-
diff --git a/java/com/xagasoft/gats/Dictionary.java b/java/com/xagasoft/gats/Dictionary.java
deleted file mode 100644
index d96ff76..0000000
--- a/java/com/xagasoft/gats/Dictionary.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xagasoft.gats;
-
-public class Dictionary extends GatsObject
-{
-        public int getGatsObject()
-        {
-                return GatsObject.DICTIONARY;
-        }
-};
-
diff --git a/java/com/xagasoft/gats/Float.java b/java/com/xagasoft/gats/Float.java
deleted file mode 100644
index d0a9604..0000000
--- a/java/com/xagasoft/gats/Float.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xagasoft.gats;
-
-public class Float extends GatsObject
-{
-        public int getGatsObject()
-        {
-                return GatsObject.FLOAT;
-        }
-};
-
diff --git a/java/com/xagasoft/gats/GatsBoolean.java b/java/com/xagasoft/gats/GatsBoolean.java
new file mode 100644
index 0000000..8fec64a
--- /dev/null
+++ b/java/com/xagasoft/gats/GatsBoolean.java
@@ -0,0 +1,17 @@
+package com.xagasoft.gats;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class GatsBoolean extends GatsObject
+{
+        public int getType()
+        {
+                return GatsObject.BOOLEAN;
+        }
+
+        public void read( InputStream is, char cType )
+        {
+        }
+};
+
diff --git a/java/com/xagasoft/gats/GatsDictionary.java b/java/com/xagasoft/gats/GatsDictionary.java
new file mode 100644
index 0000000..1cf126e
--- /dev/null
+++ b/java/com/xagasoft/gats/GatsDictionary.java
@@ -0,0 +1,17 @@
+package com.xagasoft.gats;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class GatsDictionary extends GatsObject
+{
+        public int getType()
+        {
+                return GatsObject.DICTIONARY;
+        }
+
+        public void read( InputStream is, char cType )
+        {
+        }
+};
+
diff --git a/java/com/xagasoft/gats/GatsFloat.java b/java/com/xagasoft/gats/GatsFloat.java
new file mode 100644
index 0000000..b98c73a
--- /dev/null
+++ b/java/com/xagasoft/gats/GatsFloat.java
@@ -0,0 +1,17 @@
+package com.xagasoft.gats;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class GatsFloat extends GatsObject
+{
+        public int getType()
+        {
+                return GatsObject.FLOAT;
+        }
+
+        public void read( InputStream is, char cType )
+        {
+        }
+};
+
diff --git a/java/com/xagasoft/gats/GatsInputStream.java b/java/com/xagasoft/gats/GatsInputStream.java
index e787d56..e1c4781 100644
--- a/java/com/xagasoft/gats/GatsInputStream.java
+++ b/java/com/xagasoft/gats/GatsInputStream.java
@@ -2,6 +2,7 @@ package com.xagasoft.gats;
 
 import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
 public class GatsInputStream
@@ -16,7 +17,7 @@ public class GatsInputStream
                 this.is = is;
         }
 
-        public GatsObject readObject()
+        public GatsObject readObject() throws java.io.IOException
         {
                 do
                 {
@@ -24,7 +25,7 @@ public class GatsInputStream
                         {
                                 byte aBuf[] = new byte[5-baos.size()];
                                 int iRead = is.read( aBuf );
-                                baos.write( ret, iRead );
+                                baos.write( aBuf, 0, iRead );
 
                                 if( baos.size() < 5 )
                                         return null;
@@ -36,7 +37,7 @@ public class GatsInputStream
                         ByteArrayInputStream bais = new ByteArrayInputStream(
                                 baos.toByteArray()
                                 );
-                        DataInputStream dis( bais );
+                        DataInputStream dis = new DataInputStream( bais );
                         iVer = dis.readUnsignedByte();
                         iSize = dis.readInt();
                 }
@@ -49,7 +50,7 @@ public class GatsInputStream
                                 iGoal = 1500;
 
                         int iRead = is.read( aBuf );
-                        baos.write( abuf, 0, iRead );
+                        baos.write( aBuf, 0, iRead );
 
                         if( iRead < iGoal )
                                 return null;
@@ -63,14 +64,13 @@ public class GatsInputStream
                         );
                 bais.skip( 5 );
                 
-                GatsObject goRet = GatsObject::read( bais );
+                GatsObject goRet = GatsObject.read( bais );
                 iVer = 0;
 
                 return goRet;
         }
 
-
-        private bool skipReadNulls()
+        private boolean skipReadNulls()
         {
                 if( baos.size() == 0 )
                         return false;
@@ -79,17 +79,17 @@ public class GatsInputStream
                 if( aBuf[0] != 0 )
                         return true;
 
-                for( int j = 1; j < aBuf.size; j++ )
+                for( int j = 1; j < aBuf.length; j++ )
                 {
                         if( aBuf[j] != 0 )
                         {
-                                baos.clear();
-                                baos.write( aBuf, j, aBuf.size-j );
+                                baos.reset();
+                                baos.write( aBuf, j, aBuf.length-j );
                                 return true;
                         }
                 }
 
-                baos.clear();
+                baos.reset();
                 return true;
         }
 };
diff --git a/java/com/xagasoft/gats/Integer.java b/java/com/xagasoft/gats/GatsInteger.java
index ab3d6de..1093ab2 100644
--- a/java/com/xagasoft/gats/Integer.java
+++ b/java/com/xagasoft/gats/GatsInteger.java
@@ -3,19 +3,51 @@ package com.xagasoft.gats;
 import java.io.OutputStream;
 import java.io.InputStream;
 
-public class Integer extends GatsObject
+public class GatsInteger extends GatsObject
 {
-        public int getGatsObject()
+        private long iValue = 0;
+
+        public GatsInteger()
+        {
+        }
+
+        public GatsInteger( long iValue )
+        {
+                this.iValue = iValue;
+        }
+
+        public long getValue()
+        {
+                return iValue;
+        }
+
+        public void setValue( long iValue )
+        {
+                this.iValue = iValue;
+        }
+
+        public int getType()
         {
                 return GatsObject.INTEGER;
         };
 
+        public void read( InputStream is, char cType ) throws java.io.IOException
+
+        {
+                iValue = readPackedInt( is );
+        }
+
+        public void write( OutputStream os ) throws java.io.IOException
+        {
+                os.write( (int)'i' );
+                writePackedInt( os, iValue );
+        }
+
         /**
          * Possible TODO: have this return a Number, and construct either a Long
          * or BigInteger when appropriate.
          */
-        public static long readPackedInt( InputStream is )
-                throws java.io.IOException
+        public static long readPackedInt( InputStream is ) throws java.io.IOException
         {
                 int b;
                 long rOut = 0;
@@ -35,8 +67,7 @@ public class Integer extends GatsObject
                 return rOut;
         }
 
-        public static void writePackedInt( OutputStream os, long iIn )
-                throws java.io.IOException
+        public static void writePackedInt( OutputStream os, long iIn ) throws java.io.IOException
         {
                 int b;
 
diff --git a/java/com/xagasoft/gats/GatsList.java b/java/com/xagasoft/gats/GatsList.java
new file mode 100644
index 0000000..7c238be
--- /dev/null
+++ b/java/com/xagasoft/gats/GatsList.java
@@ -0,0 +1,17 @@
+package com.xagasoft.gats;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class GatsList extends GatsObject
+{
+        public int getType()
+        {
+                return GatsObject.LIST;
+        }
+
+        public void read( InputStream is, char cType )
+        {
+        }
+};
+
diff --git a/java/com/xagasoft/gats/GatsObject.java b/java/com/xagasoft/gats/GatsObject.java
index 63fcf36..852a18c 100644
--- a/java/com/xagasoft/gats/GatsObject.java
+++ b/java/com/xagasoft/gats/GatsObject.java
@@ -1,6 +1,7 @@
 package com.xagasoft.gats;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 
 public abstract class GatsObject
 {
@@ -13,45 +14,45 @@ public abstract class GatsObject
 
         public abstract int getType();
 
-        public abstract void read( InputStream is, char cType );
+        public abstract void read( InputStream is, char cType ) throws java.io.IOException;
 
-        public static GatsObject read( InputStream is )
+        public static GatsObject read( InputStream is ) throws java.io.IOException
         {
-                char type = is.read();
-                GatsObject goRet;
+                char type = (char)is.read();
+                GatsObject goRet = null;
                 switch( type )
                 {
                         case 'i':
-                                goRet = new Integer();
+                                goRet = new GatsInteger();
                                 break;
 
                         case 's':
-                                goRet = new String();
+                //              goRet = new GatsString();
                                 break;
 
                         case '0':
                         case '1':
-                                goRet = new Boolean();
+                //              goRet = new GatsBoolean();
                                 break;
 
                         case 'l':
-                                goRet = new List();
+                //              goRet = new GatsList();
                                 break;
 
                         case 'd':
-                                goRet = new Dictionary();
+                //              goRet = new GatsDictionary();
                                 break;
 
                         case 'f':
                         case 'F':
-                                goRet = new Float();
+                //              goRet = new GatsFloat();
                                 break;
 
                         case 'e':
                                 return null;
 
                         default:
-                                throw new Exception("Invalid gats type discovered: " + (char)type );
+                                throw new java.io.IOException("Invalid gats type discovered: " + (char)type );
                 }
 
                 goRet.read( is, type );
diff --git a/java/com/xagasoft/gats/GatsOutputStream.java b/java/com/xagasoft/gats/GatsOutputStream.java
index f3020f4..0ba452d 100644
--- a/java/com/xagasoft/gats/GatsOutputStream.java
+++ b/java/com/xagasoft/gats/GatsOutputStream.java
@@ -1,7 +1,9 @@
 package com.xagasoft.gats;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+
 public class GatsOutputStream
 {
-        public GatsOutputStream( 
 };
 
diff --git a/java/com/xagasoft/gats/GatsString.java b/java/com/xagasoft/gats/GatsString.java
new file mode 100644
index 0000000..07456b5
--- /dev/null
+++ b/java/com/xagasoft/gats/GatsString.java
@@ -0,0 +1,17 @@
+package com.xagasoft.gats;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class GatsString extends GatsObject
+{
+        public int getType()
+        {
+                return GatsObject.STRING;
+        }
+
+        public void read( InputStream is, char cType )
+        {
+        }
+};
+
diff --git a/java/com/xagasoft/gats/List.java b/java/com/xagasoft/gats/List.java
deleted file mode 100644
index dbc729b..0000000
--- a/java/com/xagasoft/gats/List.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xagasoft.gats;
-
-public class List extends GatsObject
-{
-        public int getGatsObject()
-        {
-                return GatsObject.LIST;
-        }
-};
-
diff --git a/java/com/xagasoft/gats/String.java b/java/com/xagasoft/gats/String.java
deleted file mode 100644
index 301a98a..0000000
--- a/java/com/xagasoft/gats/String.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xagasoft.gats;
-
-public class String extends GatsObject
-{
-        public int getGatsObject()
-        {
-                return GatsObject.STRING;
-        }
-};
-