2005-10-28 Audrius Meskauskas <AudriusA@Bioinformatics.org>

* gnu/CORBA/typecodes/AliasTypeCode.java,
gnu/CORBA/typecodes/ArrayTypeCode.java,
gnu/CORBA/typecodes/FixedTypeCode.java,
gnu/CORBA/typecodes/GeneralTypeCode.java,
gnu/CORBA/typecodes/PrimitiveTypeCode.java,
gnu/CORBA/typecodes/RecordTypeCode.java,
gnu/CORBA/typecodes/RecursiveTypeCode.java,
gnu/CORBA/typecodes/StringTypeCode.java,
gnu/CORBA/typecodes/package.html: New files.
* gnu/CORBA/aliasTypeCode.java,
gnu/CORBA/primitiveArrayTypeCode.java,
gnu/CORBA/fixedTypeCode.java,
gnu/CORBA/generalTypeCode.java,
gnu/CORBA/primitiveTypeCode.java,
gnu/CORBA/recordTypeCode.java,
gnu/CORBA/recursiveTypeCode.java,
gnu/CORBA/stringTypeCode.java: Deleted.
* gnu/CORBA/CDR/cdrOutput.java,
gnu/CORBA/ObjectCreator.java,
gnu/CORBA/OctetHolder.java,
gnu/CORBA/Poa/LocalRequest.java,
gnu/CORBA/Poa/gnuServantObject.java,
gnu/CORBA/Restricted_ORB.java,
gnu/CORBA/TypeCodeHelper.java,
gnu/CORBA/WCharHolder.java,
gnu/CORBA/WStringHolder.java,
gnu/CORBA/gnuAny.java,
gnu/CORBA/typeNamer.java,
gnu/javax/rmi/CORBA/UtilDelegateImpl.java,
org/omg/CORBA/AnyHolder.java,
org/omg/CORBA/AnySeqHelper.java,
org/omg/CORBA/AnySeqHolder.java,
org/omg/CORBA/BooleanHolder.java,
org/omg/CORBA/BooleanSeqHelper.java,
org/omg/CORBA/BooleanSeqHolder.java,
org/omg/CORBA/ByteHolder.java,
org/omg/CORBA/CharHolder.java,
org/omg/CORBA/CharSeqHelper.java,
org/omg/CORBA/CharSeqHolder.java,
org/omg/CORBA/DefinitionKindHelper.java,
org/omg/CORBA/DoubleHolder.java,
org/omg/CORBA/DoubleSeqHelper.java,
org/omg/CORBA/DoubleSeqHolder.java,
org/omg/CORBA/FixedHolder.java,
org/omg/CORBA/FloatHolder.java,
org/omg/CORBA/FloatSeqHelper.java,
org/omg/CORBA/FloatSeqHolder.java,
org/omg/CORBA/IntHolder.java,
org/omg/CORBA/LongHolder.java,
org/omg/CORBA/LongLongSeqHelper.java,
org/omg/CORBA/LongLongSeqHolder.java,
org/omg/CORBA/LongSeqHelper.java,
org/omg/CORBA/LongSeqHolder.java,
org/omg/CORBA/NameValuePairHelper.java,
org/omg/CORBA/ORB.java,
org/omg/CORBA/ObjectHelper.java,
org/omg/CORBA/ObjectHolder.java,
org/omg/CORBA/OctetSeqHelper.java,
org/omg/CORBA/OctetSeqHolder.java,
org/omg/CORBA/PolicyErrorCodeHelper.java,
org/omg/CORBA/PrincipalHolder.java,
org/omg/CORBA/ShortHolder.java,
org/omg/CORBA/ShortSeqHelper.java,
org/omg/CORBA/ShortSeqHolder.java,
org/omg/CORBA/StringHolder.java,
org/omg/CORBA/StringSeqHelper.java,
org/omg/CORBA/StringSeqHolder.java,
org/omg/CORBA/TypeCodeHolder.java,
org/omg/CORBA/ULongLongSeqHelper.java,
org/omg/CORBA/ULongLongSeqHolder.java,
org/omg/CORBA/ULongSeqHelper.java,
org/omg/CORBA/ULongSeqHolder.java,
org/omg/CORBA/UShortSeqHelper.java,
org/omg/CORBA/UShortSeqHolder.java,
org/omg/CORBA/ValueBaseHelper.java,
org/omg/CORBA/WCharSeqHelper.java,
org/omg/CORBA/WCharSeqHolder.java,
org/omg/CORBA/WStringSeqHelper.java,
org/omg/CORBA/WStringSeqHolder.java,
org/omg/Messaging/SyncScopeHelper.java: References modified.

20 files changed, 248 insertions, 129 deletions

diff --git a/gnu/CORBA/CDR/cdrOutput.java b/gnu/CORBA/CDR/cdrOutput.java
index 67033c7c4..e8dd4582a 100644
--- a/gnu/CORBA/CDR/cdrOutput.java
+++ b/gnu/CORBA/CDR/cdrOutput.java
@@ -45,9 +45,9 @@ import gnu.CORBA.Minor;
 import gnu.CORBA.TypeCodeHelper;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
-import gnu.CORBA.primitiveTypeCode;
 import gnu.CORBA.GIOP.CharSets_OSF;
 import gnu.CORBA.GIOP.cxCodeSet;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -422,7 +422,7 @@ public abstract class cdrOutput
       }
     else
       {
-        primitiveTypeCode p = new primitiveTypeCode(TCKind.tk_null);
+        PrimitiveTypeCode p = new PrimitiveTypeCode(TCKind.tk_null);
         write_TypeCode(p);
       }
   }
diff --git a/gnu/CORBA/ObjectCreator.java b/gnu/CORBA/ObjectCreator.java
index 50037edda..bade69278 100644
--- a/gnu/CORBA/ObjectCreator.java
+++ b/gnu/CORBA/ObjectCreator.java
@@ -43,6 +43,7 @@ import gnu.CORBA.CDR.cdrBufInput;
 import gnu.CORBA.CDR.cdrBufOutput;
 import gnu.CORBA.CDR.cdrInput;
 import gnu.CORBA.GIOP.ServiceContext;
+import gnu.CORBA.typecodes.RecordTypeCode;
 import gnu.classpath.VMStackWalker;
 
 import org.omg.CORBA.Any;
@@ -475,7 +476,7 @@ public class ObjectCreator
 
         into.insert_Streamable(h);
 
-        recordTypeCode r = new recordTypeCode(TCKind.tk_except);
+        RecordTypeCode r = new RecordTypeCode(TCKind.tk_except);
         r.setId(m_exception_id);
         r.setName(name);
         into.type(r);
diff --git a/gnu/CORBA/OctetHolder.java b/gnu/CORBA/OctetHolder.java
index 02fd9a432..06d7538d7 100644
--- a/gnu/CORBA/OctetHolder.java
+++ b/gnu/CORBA/OctetHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -64,7 +64,7 @@ public final class OctetHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_octet =
-    new primitiveTypeCode(TCKind.tk_octet);
+    new PrimitiveTypeCode(TCKind.tk_octet);
 
   /**
    * The <code>long</code> (CORBA <code>octet</code>) value,
diff --git a/gnu/CORBA/Poa/LocalRequest.java b/gnu/CORBA/Poa/LocalRequest.java
index a727499fc..5d9282913 100644
--- a/gnu/CORBA/Poa/LocalRequest.java
+++ b/gnu/CORBA/Poa/LocalRequest.java
@@ -44,11 +44,11 @@ import gnu.CORBA.GIOP.v1_2.ReplyHeader;
 import gnu.CORBA.GIOP.v1_2.RequestHeader;
 import gnu.CORBA.Interceptor.gnuClientRequestInfo;
 import gnu.CORBA.Interceptor.gnuServerRequestInfo;
+import gnu.CORBA.typecodes.RecordTypeCode;
 import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.gnuAny;
 import gnu.CORBA.gnuRequest;
-import gnu.CORBA.recordTypeCode;
 import gnu.CORBA.streamReadyHolder;
 import gnu.CORBA.streamRequest;
 
@@ -373,8 +373,8 @@ public class LocalRequest extends gnuRequest implements ResponseHandler,
                           )
                         );
 
-                        recordTypeCode r =
-                          new recordTypeCode(TCKind.tk_except);
+                        RecordTypeCode r =
+                          new RecordTypeCode(TCKind.tk_except);
                         r.setId(uex_idl);
                         r.setName(ObjectCreator.getDefaultName(uex_idl));
                       }
diff --git a/gnu/CORBA/Poa/gnuServantObject.java b/gnu/CORBA/Poa/gnuServantObject.java
index 6a5dfaa1f..f2b86bde2 100644
--- a/gnu/CORBA/Poa/gnuServantObject.java
+++ b/gnu/CORBA/Poa/gnuServantObject.java
@@ -42,13 +42,13 @@ import gnu.CORBA.GIOP.ReplyHeader;
 import gnu.CORBA.IOR_Delegate;
 import gnu.CORBA.IOR_contructed_object;
 import gnu.CORBA.Interceptor.gnuServerRequestInfo;
+import gnu.CORBA.typecodes.RecordTypeCode;
 import gnu.CORBA.IOR;
 import gnu.CORBA.IorProvider;
 import gnu.CORBA.Minor;
 import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.bufferedResponseHandler;
-import gnu.CORBA.recordTypeCode;
 import gnu.CORBA.streamReadyHolder;
 
 import org.omg.CORBA.Any;
@@ -551,8 +551,8 @@ public class gnuServantObject extends ObjectImpl
                                         )
                                       );
 
-                                      recordTypeCode r =
-                                        new recordTypeCode(TCKind.tk_except);
+                                      RecordTypeCode r =
+                                        new RecordTypeCode(TCKind.tk_except);
                                       r.setId(uex_idl);
                                       r.setName(ObjectCreator.getDefaultName(
                                           uex_idl
diff --git a/gnu/CORBA/Restricted_ORB.java b/gnu/CORBA/Restricted_ORB.java
index 247cd205c..86f120514 100644
--- a/gnu/CORBA/Restricted_ORB.java
+++ b/gnu/CORBA/Restricted_ORB.java
@@ -39,6 +39,10 @@ exception statement from your version. */
 package gnu.CORBA;
 
 import gnu.CORBA.CDR.cdrBufOutput;
+import gnu.CORBA.typecodes.AliasTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
+import gnu.CORBA.typecodes.StringTypeCode;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
@@ -133,7 +137,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_alias_tc(String id, String name, TypeCode typecode)
   {
-    return new aliasTypeCode(typecode, id, name);
+    return new AliasTypeCode(typecode, id, name);
   }
 
   /** {@inheritDoc} */
@@ -147,8 +151,8 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_array_tc(int length, TypeCode element_type)
   {
-    primitiveArrayTypeCode p =
-      new primitiveArrayTypeCode(TCKind.tk_array, element_type);
+    ArrayTypeCode p =
+      new ArrayTypeCode(TCKind.tk_array, element_type);
     p.setLength(length);
     return p;
   }
@@ -162,7 +166,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_enum_tc(String id, String name, String[] values)
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_enum);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_enum);
     for (int i = 0; i < values.length; i++)
       {
         r.field().name = values [ i ];
@@ -191,7 +195,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
     StructMember[] members
   )
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_except);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_except);
     r.setId(id);
     r.setName(name);
 
@@ -237,8 +241,8 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_sequence_tc(int bound, TypeCode element_type)
   {
-    primitiveArrayTypeCode p =
-      new primitiveArrayTypeCode(TCKind.tk_sequence, element_type);
+    ArrayTypeCode p =
+      new ArrayTypeCode(TCKind.tk_sequence, element_type);
     p.setLength(bound);
     return p;
   }
@@ -246,7 +250,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_string_tc(int bound)
   {
-    stringTypeCode p = new stringTypeCode(TCKind.tk_string);
+    StringTypeCode p = new StringTypeCode(TCKind.tk_string);
     p.setLength(bound);
     return p;
   }
@@ -256,7 +260,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
     StructMember[] members
   )
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_struct);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_struct);
     r.setId(id);
     r.setName(name);
 
@@ -273,7 +277,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
     TypeCode discriminator_type, UnionMember[] members
   )
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_union);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_union);
     r.setId(id);
     r.setName(name);
     r.setDiscriminator_type(discriminator_type);
@@ -290,7 +294,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   /** {@inheritDoc} */
   public TypeCode create_wstring_tc(int bound)
   {
-    stringTypeCode p = new stringTypeCode(TCKind.tk_wstring);
+    StringTypeCode p = new StringTypeCode(TCKind.tk_wstring);
     p.setLength(bound);
     return p;
   }
diff --git a/gnu/CORBA/TypeCodeHelper.java b/gnu/CORBA/TypeCodeHelper.java
index c74227542..4ffb0b744 100644
--- a/gnu/CORBA/TypeCodeHelper.java
+++ b/gnu/CORBA/TypeCodeHelper.java
@@ -38,6 +38,13 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
+import gnu.CORBA.typecodes.FixedTypeCode;
+import gnu.CORBA.typecodes.GeneralTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
+import gnu.CORBA.typecodes.StringTypeCode;
+
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodePackage.BadKind;
@@ -62,10 +69,10 @@ public class TypeCodeHelper
   {
     TCKind kind = TCKind.from_int(in.read_long());
     TypeCode rt;
-    generalTypeCode g;
-    recordTypeCode r;
-    recordTypeCode.Field f;
-    stringTypeCode s;
+    GeneralTypeCode g;
+    RecordTypeCode r;
+    RecordTypeCode.Field f;
+    StringTypeCode s;
     int n;
 
     switch (kind.value())
@@ -73,21 +80,21 @@ public class TypeCodeHelper
         case TCKind._tk_sequence :
         case TCKind._tk_array :
 
-          primitiveArrayTypeCode p = new primitiveArrayTypeCode(kind);
+          ArrayTypeCode p = new ArrayTypeCode(kind);
           p.setLength(in.read_long());
           rt = p;
           break;
           
         case TCKind._tk_string :
         case TCKind._tk_wstring :
-          s = new stringTypeCode(kind);
+          s = new StringTypeCode(kind);
           s.setLength(in.read_long());
           rt = s;
           break;
 
         case TCKind._tk_fixed :
 
-          fixedTypeCode fx = new fixedTypeCode();
+          FixedTypeCode fx = new FixedTypeCode();
           fx.setDigits(in.read_short());
           fx.setScale(in.read_short());
           rt = fx;
@@ -96,7 +103,7 @@ public class TypeCodeHelper
         case TCKind._tk_objref :
         case TCKind._tk_native :
         case TCKind._tk_abstract_interface :
-          g = new generalTypeCode(kind);
+          g = new GeneralTypeCode(kind);
           g.setId(in.read_string());
           g.setName(in.read_string());
           rt = g;
@@ -104,7 +111,7 @@ public class TypeCodeHelper
 
         case TCKind._tk_alias :
         case TCKind._tk_value_box :
-          g = new generalTypeCode(kind);
+          g = new GeneralTypeCode(kind);
           g.setId(in.read_string());
           g.setName(in.read_string());
           g.setContentType(in.read_TypeCode());
@@ -113,7 +120,7 @@ public class TypeCodeHelper
 
         case TCKind._tk_struct :
         case TCKind._tk_except :
-          r = new recordTypeCode(kind);
+          r = new RecordTypeCode(kind);
           r.setId(in.read_string());
           r.setName(in.read_string());
 
@@ -129,7 +136,7 @@ public class TypeCodeHelper
           break;
 
         case TCKind._tk_enum :
-          r = new recordTypeCode(kind);
+          r = new RecordTypeCode(kind);
           r.setId(in.read_string());
           r.setName(in.read_string());
 
@@ -144,7 +151,7 @@ public class TypeCodeHelper
           break;
 
         case TCKind._tk_union :
-          r = new recordTypeCode(kind);
+          r = new RecordTypeCode(kind);
           r.setId(in.read_string());
           r.setName(in.read_string());
           r.setDiscriminator_type(in.read_TypeCode());
@@ -164,7 +171,7 @@ public class TypeCodeHelper
           break;
 
         case TCKind._tk_value :
-          r = new recordTypeCode(kind);
+          r = new RecordTypeCode(kind);
           r.setId(in.read_string());
           r.setName(in.read_string());
           r.setTypeModifier(in.read_short());
@@ -183,7 +190,7 @@ public class TypeCodeHelper
           break;
 
         default :
-          rt = new primitiveTypeCode(kind);
+          rt = new PrimitiveTypeCode(kind);
       }
     return rt;
   }
diff --git a/gnu/CORBA/WCharHolder.java b/gnu/CORBA/WCharHolder.java
index 23f0ad100..3c6a87fbe 100644
--- a/gnu/CORBA/WCharHolder.java
+++ b/gnu/CORBA/WCharHolder.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
@@ -61,7 +63,7 @@ public final class WCharHolder
   /**
    * The default type code for this holder.
    */
-  private static final TypeCode t_char = new primitiveTypeCode(TCKind.tk_wchar);
+  private static final TypeCode t_char = new PrimitiveTypeCode(TCKind.tk_wchar);
 
   /**
    * The <code>char</code> (CORBA <code>wchar</code>) value,
diff --git a/gnu/CORBA/WStringHolder.java b/gnu/CORBA/WStringHolder.java
index c9e8e3323..7f18791df 100644
--- a/gnu/CORBA/WStringHolder.java
+++ b/gnu/CORBA/WStringHolder.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
+import gnu.CORBA.typecodes.StringTypeCode;
+
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
@@ -62,8 +64,8 @@ public class WStringHolder
   /**
    * The default type code for this holder.
    */
-  private static final stringTypeCode t_string =
-    new stringTypeCode(TCKind.tk_wstring);
+  private static final StringTypeCode t_string =
+    new StringTypeCode(TCKind.tk_wstring);
 
   /**
    * The <code>String</code> (CORBA <code>string</code>) value,
diff --git a/gnu/CORBA/gnuAny.java b/gnu/CORBA/gnuAny.java
index 07ae55f7d..808d526a9 100644
--- a/gnu/CORBA/gnuAny.java
+++ b/gnu/CORBA/gnuAny.java
@@ -41,6 +41,8 @@ package gnu.CORBA;
 import gnu.CORBA.CDR.Vio;
 import gnu.CORBA.CDR.cdrBufInput;
 import gnu.CORBA.CDR.cdrBufOutput;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.StringTypeCode;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.AnyHolder;
@@ -98,7 +100,7 @@ public class gnuAny
    * not intialized.
    */
   protected static final TypeCode nullType =
-    new primitiveTypeCode(TCKind.tk_null);
+    new PrimitiveTypeCode(TCKind.tk_null);
 
   /**
    * The Streamable, representing the value, held by this gnuAny.
@@ -692,7 +694,7 @@ public class gnuAny
     else
       has = new StringHolder(x);
 
-    typecode = new stringTypeCode(TCKind.tk_string);
+    typecode = new StringTypeCode(TCKind.tk_string);
   }
 
   /** {@inheritDoc} */
@@ -821,7 +823,7 @@ public class gnuAny
       return typecode;
     else if (xKind >= 0)
       {
-        typecode = new primitiveTypeCode(TCKind.from_int(xKind));
+        typecode = new PrimitiveTypeCode(TCKind.from_int(xKind));
         return typecode;
       }
     else
diff --git a/gnu/CORBA/typeNamer.java b/gnu/CORBA/typeNamer.java
index f790dc959..65a5043d1 100644
--- a/gnu/CORBA/typeNamer.java
+++ b/gnu/CORBA/typeNamer.java
@@ -38,6 +38,9 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
+
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodePackage.BadKind;
@@ -69,46 +72,46 @@ public class typeNamer
   protected static final TypeCode[] primitveCodes =
     new TypeCode[]
     {
-      new primitiveTypeCode(TCKind.tk_null),
-      new primitiveTypeCode(TCKind.tk_void),
-      new primitiveTypeCode(TCKind.tk_short),
-      new primitiveTypeCode(TCKind.tk_long),
-      new primitiveTypeCode(TCKind.tk_ushort),
-      new primitiveTypeCode(TCKind.tk_ulong),
-      new primitiveTypeCode(TCKind.tk_float),
-      new primitiveTypeCode(TCKind.tk_double),
-      new primitiveTypeCode(TCKind.tk_boolean),
-      new primitiveTypeCode(TCKind.tk_char),
-      new primitiveTypeCode(TCKind.tk_octet),
-      new primitiveTypeCode(TCKind.tk_any),
-      new primitiveTypeCode(TCKind.tk_TypeCode),
-      new primitiveTypeCode(TCKind.tk_Principal),
-      new recordTypeCode(TCKind.tk_objref),
-      new primitiveTypeCode(TCKind.tk_struct),
-      new primitiveTypeCode(TCKind.tk_union),
-      new primitiveTypeCode(TCKind.tk_enum),
-      new primitiveTypeCode(TCKind.tk_string),
-      new primitiveTypeCode(TCKind.tk_sequence),
-      new primitiveTypeCode(TCKind.tk_array),
-      new primitiveTypeCode(TCKind.tk_alias),
-      new primitiveTypeCode(TCKind.tk_except),
-      new primitiveTypeCode(TCKind.tk_longlong),
-      new primitiveTypeCode(TCKind.tk_ulonglong),
-      new primitiveTypeCode(TCKind.tk_longdouble),
-      new primitiveTypeCode(TCKind.tk_wchar),
-      new primitiveTypeCode(TCKind.tk_wstring),
-      new primitiveTypeCode(TCKind.tk_fixed),
-      new primitiveTypeCode(TCKind.tk_value),
-      new primitiveTypeCode(TCKind.tk_value_box),
-      new primitiveTypeCode(TCKind.tk_native),
-      new primitiveTypeCode(TCKind.tk_abstract_interface)
+      new PrimitiveTypeCode(TCKind.tk_null),
+      new PrimitiveTypeCode(TCKind.tk_void),
+      new PrimitiveTypeCode(TCKind.tk_short),
+      new PrimitiveTypeCode(TCKind.tk_long),
+      new PrimitiveTypeCode(TCKind.tk_ushort),
+      new PrimitiveTypeCode(TCKind.tk_ulong),
+      new PrimitiveTypeCode(TCKind.tk_float),
+      new PrimitiveTypeCode(TCKind.tk_double),
+      new PrimitiveTypeCode(TCKind.tk_boolean),
+      new PrimitiveTypeCode(TCKind.tk_char),
+      new PrimitiveTypeCode(TCKind.tk_octet),
+      new PrimitiveTypeCode(TCKind.tk_any),
+      new PrimitiveTypeCode(TCKind.tk_TypeCode),
+      new PrimitiveTypeCode(TCKind.tk_Principal),
+      new RecordTypeCode(TCKind.tk_objref),
+      new PrimitiveTypeCode(TCKind.tk_struct),
+      new PrimitiveTypeCode(TCKind.tk_union),
+      new PrimitiveTypeCode(TCKind.tk_enum),
+      new PrimitiveTypeCode(TCKind.tk_string),
+      new PrimitiveTypeCode(TCKind.tk_sequence),
+      new PrimitiveTypeCode(TCKind.tk_array),
+      new PrimitiveTypeCode(TCKind.tk_alias),
+      new PrimitiveTypeCode(TCKind.tk_except),
+      new PrimitiveTypeCode(TCKind.tk_longlong),
+      new PrimitiveTypeCode(TCKind.tk_ulonglong),
+      new PrimitiveTypeCode(TCKind.tk_longdouble),
+      new PrimitiveTypeCode(TCKind.tk_wchar),
+      new PrimitiveTypeCode(TCKind.tk_wstring),
+      new PrimitiveTypeCode(TCKind.tk_fixed),
+      new PrimitiveTypeCode(TCKind.tk_value),
+      new PrimitiveTypeCode(TCKind.tk_value_box),
+      new PrimitiveTypeCode(TCKind.tk_native),
+      new PrimitiveTypeCode(TCKind.tk_abstract_interface)
     };
 
   static
   {
     // The Id of the "abstract object" is defined as empty string.
-    recordTypeCode object =
-      (recordTypeCode) primitveCodes [ TCKind._tk_objref ];
+    RecordTypeCode object =
+      (RecordTypeCode) primitveCodes [ TCKind._tk_objref ];
     object.setId("");
     object.setName("Object");
   }
diff --git a/gnu/CORBA/aliasTypeCode.java b/gnu/CORBA/typecodes/AliasTypeCode.java
index 884663101..3cb8ebfb3 100644
--- a/gnu/CORBA/aliasTypeCode.java
+++ b/gnu/CORBA/typecodes/AliasTypeCode.java
@@ -1,4 +1,4 @@
-/* aliasTypeCode.java --
+/* AliasTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,8 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
 
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
@@ -47,9 +48,14 @@ import org.omg.CORBA.TypeCodePackage.BadKind;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class aliasTypeCode
-  extends primitiveTypeCode
+public class AliasTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
   /**
    * The typecode repository id.
    */
@@ -76,7 +82,7 @@ public class aliasTypeCode
    *
    * @param a_name the name of the newly created typecode.
    */
-  public aliasTypeCode(TypeCode an_aliasFor, String an_id, String a_name)
+  public AliasTypeCode(TypeCode an_aliasFor, String an_id, String a_name)
   {
     super(TCKind.tk_alias);
     aliasFor = an_aliasFor;
diff --git a/gnu/CORBA/primitiveArrayTypeCode.java b/gnu/CORBA/typecodes/ArrayTypeCode.java
index fc020bed7..bb798101a 100644
--- a/gnu/CORBA/primitiveArrayTypeCode.java
+++ b/gnu/CORBA/typecodes/ArrayTypeCode.java
@@ -1,4 +1,4 @@
-/* primitiveArrayTypeCode.java --
+/* ArrayTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,8 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
 
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
@@ -46,9 +47,15 @@ import org.omg.CORBA.TypeCodePackage.BadKind;
  * A TypeCode for arrays.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class primitiveArrayTypeCode
-  extends primitiveTypeCode
+public class ArrayTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
+  
   /**
    * The array components.
    */
@@ -67,10 +74,10 @@ public class primitiveArrayTypeCode
    *
    * @param array_of the sequence member type.
    */
-  public primitiveArrayTypeCode(TCKind array_of)
+  public ArrayTypeCode(TCKind array_of)
   {
     super(TCKind.tk_sequence);
-    of = new primitiveTypeCode(array_of);
+    of = new PrimitiveTypeCode(array_of);
   }
 
   /**
@@ -81,7 +88,7 @@ public class primitiveArrayTypeCode
    * sequence of array).
    * @param array_of the sequence member type.
    */
-  public primitiveArrayTypeCode(TCKind this_type, TypeCode array_of)
+  public ArrayTypeCode(TCKind this_type, TypeCode array_of)
   {
     super(this_type);
     of = array_of;
diff --git a/gnu/CORBA/fixedTypeCode.java b/gnu/CORBA/typecodes/FixedTypeCode.java
index eb610417b..c5fae63bd 100644
--- a/gnu/CORBA/fixedTypeCode.java
+++ b/gnu/CORBA/typecodes/FixedTypeCode.java
@@ -1,4 +1,4 @@
-/* fixedTypeCode.java --
+/* FixedTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,8 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
 
 import java.math.BigDecimal;
 
@@ -48,9 +49,15 @@ import org.omg.CORBA.TypeCodePackage.BadKind;
  * A typecode for CORBA <code>fixed</code>
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class fixedTypeCode
-  extends primitiveTypeCode
+public class FixedTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
+  
   /**
    * The number of the used digits.
    */
@@ -64,7 +71,7 @@ public class fixedTypeCode
   /**
    * Creates the instance of the fixed type code.
    */
-  public fixedTypeCode()
+  public FixedTypeCode()
   {
     super(TCKind.tk_fixed);
   }
@@ -73,7 +80,7 @@ public class fixedTypeCode
    * Creates the instance of the fixed type code,
    * setting the digits and scale by example.
    */
-  public fixedTypeCode(BigDecimal example)
+  public FixedTypeCode(BigDecimal example)
   {
     super(TCKind.tk_fixed);
     if (example != null)
diff --git a/gnu/CORBA/generalTypeCode.java b/gnu/CORBA/typecodes/GeneralTypeCode.java
index 3b7914878..29876c13d 100644
--- a/gnu/CORBA/generalTypeCode.java
+++ b/gnu/CORBA/typecodes/GeneralTypeCode.java
@@ -1,4 +1,4 @@
-/* generalTypeCode.java --
+/* GeneralTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
 
 import gnu.CORBA.CDR.cdrBufOutput;
 
@@ -56,9 +56,15 @@ import org.omg.CORBA.TypeCodePackage.BadKind;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class generalTypeCode
-  extends primitiveTypeCode
+public class GeneralTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
+  
   /**
    * Indicates that the field value has not been previously set.
    */
@@ -87,21 +93,21 @@ public class generalTypeCode
 
   /**
    * Create a new instance, setting kind to the given kind.
-   * @param kind
+   * @param a_kind the kind of the typecode being created.
    */
-  public generalTypeCode(TCKind kind)
+  public GeneralTypeCode(TCKind a_kind)
   {
-    super(kind);
-    if (!lengthAllowed.get(kind.value()))
+    super(a_kind);
+    if (!lengthAllowed.get(a_kind.value()))
       len = UNSET;
   }
 
   /**
    * Set this property.
    */
-  public void setConcreteBase_type(TypeCode concrete_base_type)
+  public void setConcreteBase_type(TypeCode a_concrete_base_type)
   {
-    this.concrete_base_type = concrete_base_type;
+    this.concrete_base_type = a_concrete_base_type;
   }
 
   /**
@@ -115,9 +121,9 @@ public class generalTypeCode
   /**
    * Set this property.
    */
-  public void setId(String id)
+  public void setId(String an_id)
   {
-    this.id = id;
+    this.id = an_id;
   }
 
   /**
@@ -132,9 +138,9 @@ public class generalTypeCode
   /**
    * Set this property.
    */
-  public void setName(String name)
+  public void setName(String a_name)
   {
-    this.name = name;
+    this.name = a_name;
   }
 
   /**
diff --git a/gnu/CORBA/primitiveTypeCode.java b/gnu/CORBA/typecodes/PrimitiveTypeCode.java
index 692f16a8c..22d39a82c 100644
--- a/gnu/CORBA/primitiveTypeCode.java
+++ b/gnu/CORBA/typecodes/PrimitiveTypeCode.java
@@ -1,4 +1,4 @@
-/* primitiveTypeCode.java --
+/* PrimitiveTypeCode.java --
     Copyright (C) 2005 Free Software Foundation, Inc.
 
    Copyright (C) 2005 Free Software Foundation, Inc.
@@ -37,7 +37,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
 
 import java.io.Serializable;
 
@@ -60,16 +60,21 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class primitiveTypeCode
+public class PrimitiveTypeCode
   extends TypeCode
   implements IDLEntity, Serializable
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
   /**
    * The kind of this TypeCode.
    */
   protected final TCKind kind;
 
-  public primitiveTypeCode(TCKind a_kind)
+  public PrimitiveTypeCode(TCKind a_kind)
   {
     kind = a_kind;
   }
diff --git a/gnu/CORBA/recordTypeCode.java b/gnu/CORBA/typecodes/RecordTypeCode.java
index 8f2ecde7d..b02d41af2 100644
--- a/gnu/CORBA/recordTypeCode.java
+++ b/gnu/CORBA/typecodes/RecordTypeCode.java
@@ -1,4 +1,4 @@
-/* recordTypeCode.java --
+/* RecordTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,9 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
+import gnu.CORBA.corbaArrayList;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.StructMember;
@@ -53,9 +55,14 @@ import org.omg.CORBA.ValueMember;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class recordTypeCode
-  extends generalTypeCode
+public class RecordTypeCode
+  extends GeneralTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
   /**
    * The individual field of the record.
    */
@@ -92,9 +99,9 @@ public class recordTypeCode
   /**
    * Creates the type code of the given kind.
    */
-  public recordTypeCode(TCKind kind)
+  public RecordTypeCode(TCKind a_kind)
   {
-    super(kind);
+    super(a_kind);
   }
 
   /**
diff --git a/gnu/CORBA/recursiveTypeCode.java b/gnu/CORBA/typecodes/RecursiveTypeCode.java
index 6bc672e6e..0e6ac375e 100644
--- a/gnu/CORBA/recursiveTypeCode.java
+++ b/gnu/CORBA/typecodes/RecursiveTypeCode.java
@@ -1,4 +1,4 @@
-/* recursiveTypeCode.java --
+/* RecursiveTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,8 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
 
 import org.omg.CORBA.TCKind;
 
@@ -44,9 +45,14 @@ import org.omg.CORBA.TCKind;
  * The typecode, serving as a placeholder in defining
  * typecodes, containing recursion.
  */
-public class recursiveTypeCode
-  extends primitiveTypeCode
+public class RecursiveTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
   /**
    * The id of the type for that this type serves as a
    * placeholder.
@@ -60,7 +66,7 @@ public class recursiveTypeCode
    * @param id the Id of the type for that this type serves as a
    * placeholder.
    */
-  public recursiveTypeCode(String an_id)
+  public RecursiveTypeCode(String an_id)
   {
     super(TCKind.tk_null);
     the_id = an_id;
diff --git a/gnu/CORBA/stringTypeCode.java b/gnu/CORBA/typecodes/StringTypeCode.java
index 27aa119f3..2d1689b45 100644
--- a/gnu/CORBA/stringTypeCode.java
+++ b/gnu/CORBA/typecodes/StringTypeCode.java
@@ -1,4 +1,4 @@
-/* stringTypeCode.java --
+/* StringTypeCode.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,7 +36,8 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package gnu.CORBA;
+package gnu.CORBA.typecodes;
+
 
 import org.omg.CORBA.TCKind;
 
@@ -44,9 +45,14 @@ import org.omg.CORBA.TCKind;
  * The typecode for string and wide string.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class stringTypeCode
-  extends primitiveTypeCode
+public class StringTypeCode
+  extends PrimitiveTypeCode
 {
+  /** 
+   * Use serialVersionUID for interoperability. 
+   */
+  private static final long serialVersionUID = 1;
+  
   private int len = 0;
 
   /**
@@ -55,7 +61,7 @@ public class stringTypeCode
    * @param a_kind a kind of this typecode, normally
    * either tk_string or tk_wstring.
    */
-  public stringTypeCode(TCKind a_kind)
+  public StringTypeCode(TCKind a_kind)
   {
     super(a_kind);
   }
diff --git a/gnu/CORBA/typecodes/package.html b/gnu/CORBA/typecodes/package.html
new file mode 100644
index 000000000..891b3b965
--- /dev/null
+++ b/gnu/CORBA/typecodes/package.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - gnu.CORBA.typecodes</title></head>
+
+<body>
+ Contains GNU Classpath specific typecode definitions.   
+  
+ @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+</body>
+</html>
+