2005-08-28 <AudriusA@Bioinformatics.org>

        * gnu/CORBA/Interceptor/ForwardRequestHolder.java,
        gnu/CORBA/Interceptor/gnuClientRequestInfo.java,
        gnu/CORBA/Interceptor/gnuIcCurrent.java,
        gnu/CORBA/Interceptor/gnuIorInfo.java,
        gnu/CORBA/Interceptor/gnuServerRequestInfo.java,
        gnu/CORBA/Interceptor/IORInterceptors.java,
        gnu/CORBA/Interceptor/ClientRequestInterceptors.java,
        gnu/CORBA/Interceptor/Registrator.java,
        gnu/CORBA/Interceptor/ServerRequestInterceptors.java,
        gnu/CORBA/GIOP/contextSupportingHeader.java,
        org/omg/PortableInterceptor/ClientRequestInfo.java,
        org/omg/PortableInterceptor/ClientRequestInfoOperations.java,
        org/omg/PortableInterceptor/ClientRequestInterceptor.java,
        org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java,
        org/omg/PortableInterceptor/Current.java,
        org/omg/PortableInterceptor/CurrentHelper.java,
        org/omg/PortableInterceptor/CurrentOperations.java,
        org/omg/PortableInterceptor/ForwardRequest.java,
        org/omg/PortableInterceptor/ForwardRequestHelper.java,
        org/omg/PortableInterceptor/InvalidSlot.java,
        org/omg/PortableInterceptor/InvalidSlotHelper.java,
        org/omg/PortableInterceptor/ORBInitInfo.java,
        org/omg/PortableInterceptor/ORBInitInfoOperations.java,
        org/omg/PortableInterceptor/ORBInitializer.java,
        org/omg/PortableInterceptor/ORBInitializerOperations.java,
        org/omg/PortableInterceptor/PolicyFactory.java,
        org/omg/PortableInterceptor/PolicyFactoryOperations.java,
        org/omg/PortableInterceptor/RequestInfo.java,
        org/omg/PortableInterceptor/RequestInfoOperations.java,
        org/omg/PortableInterceptor/ServerRequestInfo.java,
        org/omg/PortableInterceptor/ServerRequestInfoOperations.java,
        org/omg/PortableInterceptor/ServerRequestInterceptor.java,
        org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java,
        org/omg/PortableInterceptor/package.html: New files.
        * gnu/CORBA/ExceptionCreator.java,
        gnu/CORBA/Functional_ORB.java,
        gnu/CORBA/IOR.java,
        gnu/CORBA/IOR_Delegate.java,
        gnu/CORBA/ObjectCreator.java,
        gnu/CORBA/Restricted_ORB.java,
        gnu/CORBA/bufferedResponseHandler.java,
        gnu/CORBA/gnuCodecFactory.java,
        gnu/CORBA/gnuRequest.java,
        gnu/CORBA/primitiveArrayTypeCode.java,
        gnu/CORBA/primitiveTypeCode.java,
        gnu/CORBA/CDR/Vio.java,
        gnu/CORBA/CDR/cdrOutput.java,
        gnu/CORBA/DynAn/gnuDynAny.java,
        gnu/CORBA/DynAn/gnuDynEnum.java,
        gnu/CORBA/DynAn/gnuDynFixed.java,
        gnu/CORBA/DynAn/gnuDynValue.java,
        gnu/CORBA/GIOP/ReplyHeader.java,
        gnu/CORBA/GIOP/RequestHeader.java,
        gnu/CORBA/GIOP/ServiceContext.java,
        gnu/CORBA/GIOP/v1_0/RequestHeader.java,
        gnu/CORBA/Poa/LocalDelegate.java,
        gnu/CORBA/Poa/LocalRequest.java,
        gnu/CORBA/Poa/ORB_1_4.java,
        gnu/CORBA/Poa/gnuServantObject.java,
        gnu/CORBA/Poa/servantDelegate.java,
        org/omg/CORBA/ServiceDetailHelper.java,
        org/omg/CORBA/DynAnyPackage/Invalid.java,
        org/omg/CORBA/DynAnyPackage/InvalidSeq.java,
        org/omg/CORBA/DynAnyPackage/InvalidValue.java,
        org/omg/CORBA/DynAnyPackage/TypeMismatch.java,
        org/omg/DynamicAny/NameDynAnyPairSeqHelper.java,
        org/omg/DynamicAny/_DynAnyFactoryStub.java,
        org/omg/DynamicAny/_DynAnyStub.java,
        org/omg/DynamicAny/_DynArrayStub.java,
        org/omg/DynamicAny/_DynEnumStub.java,
        org/omg/DynamicAny/_DynFixedStub.java,
        org/omg/DynamicAny/_DynSequenceStub.java,
        org/omg/DynamicAny/_DynStructStub.java,
        org/omg/DynamicAny/_DynUnionStub.java,
        org/omg/DynamicAny/_DynValueStub.java,
        org/omg/IOP/ServiceContext.java,
        org/omg/IOP/TaggedComponentHelper.java,
        org/omg/IOP/TaggedProfileHelper.java,
        org/omg/PortableInterceptor/IORInfo.java,
        org/omg/PortableInterceptor/IORInfoOperations.java,
        org/omg/PortableInterceptor/IORInterceptor.java,
        org/omg/PortableInterceptor/IORInterceptorOperations.java,
        org/omg/PortableInterceptor/Interceptor.java,
        org/omg/PortableInterceptor/LOCATION_FORWARD.java,
        org/omg/PortableInterceptor/SUCCESSFUL.java,
        org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java,
        org/omg/PortableInterceptor/TRANSPORT_RETRY.java,
        org/omg/PortableInterceptor/USER_EXCEPTION.java,
        org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java,
        org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java,
        org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java,
        org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java,
        org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java: Rewritten.
        * org/omg/CORBA/ORB.java,
        org/omg/CORBA/package.html,
        NEWS: Documentation update.

4 files changed, 110 insertions, 174 deletions

diff --git a/gnu/CORBA/DynAn/gnuDynAny.java b/gnu/CORBA/DynAn/gnuDynAny.java
index a12706176..015628ebf 100644
--- a/gnu/CORBA/DynAn/gnuDynAny.java
+++ b/gnu/CORBA/DynAn/gnuDynAny.java
@@ -1,4 +1,4 @@
-/* primitiveDynAny.java --
+/* gnuDynAny.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,13 +38,14 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.*;
 import gnu.CORBA.CDR.cdrBufOutput;
 import gnu.CORBA.OctetHolder;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.WCharHolder;
 import gnu.CORBA.WStringHolder;
+import gnu.CORBA.holderFactory;
 import gnu.CORBA.typeNamer;
+import gnu.CORBA.universalHolder;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.AnyHolder;
@@ -65,7 +66,8 @@ import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodeHolder;
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.ValueBaseHolder;
-import org.omg.CORBA.portable.*;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
 import org.omg.DynamicAny.DynAny;
 import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
@@ -82,9 +84,7 @@ import java.util.Arrays;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynAny
-  extends abstractDynAny
-  implements DynAny, Serializable
+public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -102,8 +102,8 @@ public class gnuDynAny
    * @param a_holder
    */
   public gnuDynAny(Streamable aHolder, TypeCode oType, TypeCode aType,
-                   gnuDynAnyFactory aFactory, ORB anOrb
-                  )
+    gnuDynAnyFactory aFactory, ORB anOrb
+  )
   {
     super(oType, aType, aFactory, anOrb);
     holder = aHolder;
@@ -114,8 +114,7 @@ public class gnuDynAny
    *
    * @param from the source to assign from.
    */
-  public void assign(DynAny from)
-              throws TypeMismatch
+  public void assign(DynAny from) throws TypeMismatch
   {
     checkType(official_type, from.type());
 
@@ -141,8 +140,8 @@ public class gnuDynAny
           {
             other =
               new gnuDynAny((Streamable) (holder.getClass().newInstance()),
-                            official_type, final_type, factory, orb
-                           );
+                official_type, final_type, factory, orb
+              );
           }
         catch (Exception e)
           {
@@ -163,12 +162,11 @@ public class gnuDynAny
    *
    * @return <code>null</code>, always.
    */
-  public DynAny current_component()
-                           throws TypeMismatch
+  public DynAny current_component() throws TypeMismatch
   {
     throw new TypeMismatch("Not applicable for " +
-                           typeNamer.nameIt(final_type)
-                          );
+      typeNamer.nameIt(final_type)
+    );
   }
 
   /**
@@ -186,8 +184,7 @@ public class gnuDynAny
    * @throws TypeMismatch if the final_type of the passed Any is not the same as
    * the final_type, currently stored in this Any.
    */
-  public void from_any(Any an_any)
-                throws TypeMismatch, InvalidValue
+  public void from_any(Any an_any) throws TypeMismatch, InvalidValue
   {
     checkType(official_type, an_any.type());
 
@@ -240,8 +237,7 @@ public class gnuDynAny
   /**
    * Return the second (enclosed any) that is stored in the wrapped Any.
    */
-  public Any get_any()
-              throws TypeMismatch
+  public Any get_any() throws TypeMismatch
   {
     try
       {
@@ -256,8 +252,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public boolean get_boolean()
-                      throws TypeMismatch
+  public boolean get_boolean() throws TypeMismatch
   {
     try
       {
@@ -272,8 +267,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public char get_char()
-                throws TypeMismatch
+  public char get_char() throws TypeMismatch
   {
     try
       {
@@ -288,8 +282,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public double get_double()
-                    throws TypeMismatch
+  public double get_double() throws TypeMismatch
   {
     try
       {
@@ -304,8 +297,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public float get_float()
-                  throws TypeMismatch
+  public float get_float() throws TypeMismatch
   {
     try
       {
@@ -320,8 +312,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public int get_long()
-               throws TypeMismatch
+  public int get_long() throws TypeMismatch
   {
     try
       {
@@ -336,8 +327,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public long get_longlong()
-                    throws TypeMismatch
+  public long get_longlong() throws TypeMismatch
   {
     try
       {
@@ -352,8 +342,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public byte get_octet()
-                 throws TypeMismatch
+  public byte get_octet() throws TypeMismatch
   {
     try
       {
@@ -368,8 +357,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public Object get_reference()
-                       throws TypeMismatch
+  public Object get_reference() throws TypeMismatch
   {
     try
       {
@@ -384,8 +372,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public short get_short()
-                  throws TypeMismatch
+  public short get_short() throws TypeMismatch
   {
     try
       {
@@ -400,8 +387,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public String get_string()
-                    throws TypeMismatch
+  public String get_string() throws TypeMismatch
   {
     try
       {
@@ -416,8 +402,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public TypeCode get_typecode()
-                        throws TypeMismatch
+  public TypeCode get_typecode() throws TypeMismatch
   {
     try
       {
@@ -432,32 +417,28 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public int get_ulong()
-                throws TypeMismatch
+  public int get_ulong() throws TypeMismatch
   {
     check(TCKind.tk_ulong);
     return get_long();
   }
 
   /** {@inheritDoc} */
-  public long get_ulonglong()
-                     throws TypeMismatch
+  public long get_ulonglong() throws TypeMismatch
   {
     check(TCKind.tk_ulonglong);
     return get_longlong();
   }
 
   /** {@inheritDoc} */
-  public short get_ushort()
-                   throws TypeMismatch
+  public short get_ushort() throws TypeMismatch
   {
     check(TCKind.tk_ushort);
     return get_short();
   }
 
   /** {@inheritDoc} */
-  public Serializable get_val()
-                       throws TypeMismatch
+  public Serializable get_val() throws TypeMismatch
   {
     try
       {
@@ -472,8 +453,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public char get_wchar()
-                 throws TypeMismatch
+  public char get_wchar() throws TypeMismatch
   {
     try
       {
@@ -488,8 +468,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public String get_wstring()
-                     throws TypeMismatch
+  public String get_wstring() throws TypeMismatch
   {
     try
       {
@@ -504,8 +483,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_any(Any a_x)
-                  throws TypeMismatch, InvalidValue
+  public void insert_any(Any a_x) throws TypeMismatch, InvalidValue
   {
     try
       {
@@ -539,8 +517,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_boolean(boolean a_x)
-                      throws InvalidValue, TypeMismatch
+  public void insert_boolean(boolean a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -556,8 +533,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_char(char a_x)
-                   throws InvalidValue, TypeMismatch
+  public void insert_char(char a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -573,8 +549,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_double(double a_x)
-                     throws InvalidValue, TypeMismatch
+  public void insert_double(double a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -590,8 +565,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_float(float a_x)
-                    throws InvalidValue, TypeMismatch
+  public void insert_float(float a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -607,8 +581,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_long(int a_x)
-                   throws InvalidValue, TypeMismatch
+  public void insert_long(int a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -624,8 +597,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_longlong(long a_x)
-                       throws InvalidValue, TypeMismatch
+  public void insert_longlong(long a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -641,8 +613,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_octet(byte a_x)
-                    throws InvalidValue, TypeMismatch
+  public void insert_octet(byte a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -658,8 +629,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_reference(Object a_x)
-                        throws InvalidValue, TypeMismatch
+  public void insert_reference(Object a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -675,8 +645,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_short(short a_x)
-                    throws InvalidValue, TypeMismatch
+  public void insert_short(short a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -692,17 +661,17 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_string(String a_x)
-                     throws InvalidValue, TypeMismatch
+  public void insert_string(String a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
-        if (a_x != null && final_type.length() > 0 &&
-            a_x.length() > final_type.length()
-           )
+        if (a_x != null &&
+          final_type.length() > 0 &&
+          a_x.length() > final_type.length()
+        )
           throw new InvalidValue(a_x.length() + " exceeds bound, " +
-                                 final_type.length()
-                                );
+            final_type.length()
+          );
         ((StringHolder) holder).value = a_x;
         valueChanged();
       }
@@ -721,8 +690,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_typecode(TypeCode a_x)
-                       throws InvalidValue, TypeMismatch
+  public void insert_typecode(TypeCode a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -738,8 +706,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_ulong(int a_x)
-                    throws InvalidValue, TypeMismatch
+  public void insert_ulong(int a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -755,8 +722,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_ulonglong(long a_x)
-                        throws InvalidValue, TypeMismatch
+  public void insert_ulonglong(long a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -772,8 +738,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_ushort(short a_x)
-                     throws InvalidValue, TypeMismatch
+  public void insert_ushort(short a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -789,8 +754,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_val(Serializable a_x)
-                  throws InvalidValue, TypeMismatch
+  public void insert_val(Serializable a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -806,8 +770,7 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_wchar(char a_x)
-                    throws InvalidValue, TypeMismatch
+  public void insert_wchar(char a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
@@ -823,17 +786,17 @@ public class gnuDynAny
   }
 
   /** {@inheritDoc} */
-  public void insert_wstring(String a_x)
-                      throws InvalidValue, TypeMismatch
+  public void insert_wstring(String a_x) throws InvalidValue, TypeMismatch
   {
     try
       {
-        if (a_x != null && final_type.length() > 0 &&
-            a_x.length() > type().length()
-           )
+        if (a_x != null &&
+          final_type.length() > 0 &&
+          a_x.length() > type().length()
+        )
           throw new InvalidValue(a_x.length() + " exceeds bound, " +
-                                 final_type.length()
-                                );
+            final_type.length()
+          );
         ((WStringHolder) holder).value = a_x;
         valueChanged();
       }
@@ -913,8 +876,7 @@ public class gnuDynAny
    * Inserts Any, contained in the parameter, into Any, contained in this
    * DynAny.
    */
-  public void insert_dyn_any(DynAny d)
-                      throws TypeMismatch, InvalidValue
+  public void insert_dyn_any(DynAny d) throws TypeMismatch, InvalidValue
   {
     check(d.type().kind());
 
@@ -944,8 +906,8 @@ public class gnuDynAny
             holder._write(b2);
 
             return Arrays.equals(b1.buffer.toByteArray(),
-                                 b2.buffer.toByteArray()
-                                );
+              b2.buffer.toByteArray()
+            );
           }
         else
           return false;
@@ -953,8 +915,8 @@ public class gnuDynAny
     if (other == null)
       return false;
     else if (other.component_count() != component_count() ||
-             !official_type.equal(other.type())
-            )
+      !official_type.equal(other.type())
+    )
       return false;
     else
       return other.to_any().equal(to_any());
@@ -970,14 +932,12 @@ public class gnuDynAny
     return 0;
   }
 
-  public DynAny get_dyn_any()
-                     throws TypeMismatch, InvalidValue
+  public DynAny get_dyn_any() throws TypeMismatch, InvalidValue
   {
     return new gnuDynAny(holder, official_type, final_type, factory, orb);
   }
 
-  private void check(TCKind t)
-              throws TypeMismatch
+  private void check(TCKind t) throws TypeMismatch
   {
     if (t.value() != final_type.kind().value())
       throw new TypeMismatch(t.value() + "!=" + final_type.kind().value());
diff --git a/gnu/CORBA/DynAn/gnuDynEnum.java b/gnu/CORBA/DynAn/gnuDynEnum.java
index 148d99375..2fccc85c5 100644
--- a/gnu/CORBA/DynAn/gnuDynEnum.java
+++ b/gnu/CORBA/DynAn/gnuDynEnum.java
@@ -51,7 +51,7 @@ import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
 import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
 import org.omg.DynamicAny.DynEnum;
 
-import java.io.*;
+import java.io.IOException;
 
 import java.util.Arrays;
 
@@ -60,9 +60,7 @@ import java.util.Arrays;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynEnum
-  extends anyUndivideable
-  implements DynEnum
+public class gnuDynEnum extends anyUndivideable implements DynEnum
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -85,8 +83,8 @@ public class gnuDynEnum
    * Create a new dyn enum from the given typecode.
    */
   public gnuDynEnum(TypeCode oType, TypeCode aType, gnuDynAnyFactory aFactory,
-                    ORB anOrb
-                   )
+    ORB anOrb
+  )
   {
     super(oType, aType, aFactory, anOrb);
     try
@@ -117,8 +115,7 @@ public class gnuDynEnum
    * Assign the Enum from the passed value. The passed DynAny must hold the
    * enumeration of exactly the same final_type.
    */
-  public void assign(DynAny from)
-              throws TypeMismatch
+  public void assign(DynAny from) throws TypeMismatch
   {
     checkType(official_type, from.type());
     if (!(from instanceof DynEnum))
@@ -154,7 +151,7 @@ public class gnuDynEnum
       {
         gnuDynEnum oe = (gnuDynEnum) other;
         return current == oe.current &&
-               (oe.values == values || Arrays.equals(values, oe.values));
+        (oe.values == values || Arrays.equals(values, oe.values));
       }
     else if (other instanceof DynEnum)
       {
@@ -168,8 +165,7 @@ public class gnuDynEnum
   /**
    * Set value from any that must contain enumeration.
    */
-  public void from_any(Any an_any)
-                throws TypeMismatch, InvalidValue
+  public void from_any(Any an_any) throws TypeMismatch, InvalidValue
   {
     checkType(official_type, an_any.type());
     try
@@ -207,8 +203,7 @@ public class gnuDynEnum
   /**
    * Set the value of this enumeration as string.
    */
-  public void set_as_string(String value)
-                     throws InvalidValue
+  public void set_as_string(String value) throws InvalidValue
   {
     for (int i = 0; i < values.length; i++)
       {
@@ -225,8 +220,7 @@ public class gnuDynEnum
   /**
    * Set the value of this enumeration as int.
    */
-  public void set_as_ulong(int value)
-                    throws InvalidValue
+  public void set_as_ulong(int value) throws InvalidValue
   {
     if (value < 0 || value >= values.length)
       throw new InvalidValue(value + " not in [0.." + values.length);
diff --git a/gnu/CORBA/DynAn/gnuDynFixed.java b/gnu/CORBA/DynAn/gnuDynFixed.java
index 13ec24e6c..39b002262 100644
--- a/gnu/CORBA/DynAn/gnuDynFixed.java
+++ b/gnu/CORBA/DynAn/gnuDynFixed.java
@@ -43,7 +43,6 @@ import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.*;
 import org.omg.DynamicAny.DynAny;
 import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
 import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
@@ -58,9 +57,7 @@ import java.math.BigDecimal;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynFixed
-  extends anyUndivideable
-  implements DynFixed
+public class gnuDynFixed extends anyUndivideable implements DynFixed
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -90,9 +87,9 @@ public class gnuDynFixed
   /**
    * Create a new instance of the dyn fixed.
    */
-  public gnuDynFixed(TypeCode oType, TypeCode aType, gnuDynAnyFactory aFactory,
-                     ORB anOrb
-                    )
+  public gnuDynFixed(TypeCode oType, TypeCode aType,
+    gnuDynAnyFactory aFactory, ORB anOrb
+  )
   {
     super(oType, aType, aFactory, anOrb);
     try
@@ -130,7 +127,7 @@ public class gnuDynFixed
    * Set the value.
    */
   public boolean set_value(String fixed_value)
-                    throws TypeMismatch, InvalidValue
+    throws TypeMismatch, InvalidValue
   {
     // Count the digits till decimal point.
     int digs = 0;
@@ -152,8 +149,8 @@ public class gnuDynFixed
       }
     if (digs > (digits - scale))
       throw new InvalidValue("Too many digits: " + digs + " for " + digits +
-                             "." + scale
-                            );
+        "." + scale
+      );
 
     try
       {
@@ -177,8 +174,7 @@ public class gnuDynFixed
   /**
    * Assign the value from another BigDecimal.
    */
-  public void assign(DynAny from)
-              throws TypeMismatch
+  public void assign(DynAny from) throws TypeMismatch
   {
     checkType(official_type, from.type());
 
@@ -227,8 +223,7 @@ public class gnuDynFixed
    * Set the value from Any (must hold <code>fixed</code> with the matching
    * typecode.).
    */
-  public void from_any(Any an_any)
-                throws TypeMismatch, InvalidValue
+  public void from_any(Any an_any) throws TypeMismatch, InvalidValue
   {
     try
       {
diff --git a/gnu/CORBA/DynAn/gnuDynValue.java b/gnu/CORBA/DynAn/gnuDynValue.java
index db37be016..c2db94797 100644
--- a/gnu/CORBA/DynAn/gnuDynValue.java
+++ b/gnu/CORBA/DynAn/gnuDynValue.java
@@ -42,13 +42,10 @@ import gnu.CORBA.Unexpected;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.*;
 import org.omg.CORBA.VM_TRUNCATABLE;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.ValueFactory;
@@ -69,9 +66,8 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class gnuDynValue
-  extends abstractRecord
-  implements DynValue, Serializable
+public class gnuDynValue extends abstractRecord implements DynValue,
+  Serializable
 {
   /**
    * Use serialVersionUID for interoperability.
@@ -86,9 +82,9 @@ public class gnuDynValue
   /**
    * Create an instance.
    */
-  public gnuDynValue(TypeCode oType, TypeCode aType, gnuDynAnyFactory aFactory,
-                     ORB anOrb
-                    )
+  public gnuDynValue(TypeCode oType, TypeCode aType,
+    gnuDynAnyFactory aFactory, ORB anOrb
+  )
   {
     super(oType, aType, aFactory, anOrb);
 
@@ -116,6 +112,7 @@ public class gnuDynValue
                 // Add members of ancestor in front of the curren members.
                 DynValue anc = (DynValue) ancestor;
                 anc.set_to_value();
+
                 NameDynAnyPair[] aar = anc.get_members_as_dyn_any();
                 inheritFields(aar);
               }
@@ -128,9 +125,8 @@ public class gnuDynValue
               }
             else
               throw new BAD_PARAM("The parent of " + final_type.id() + ", " +
-                                  parent.id() +
-                                  ", is not structure nor value."
-                                 );
+                parent.id() + ", is not structure nor value."
+              );
           }
       }
     catch (Exception e)
@@ -168,8 +164,7 @@ public class gnuDynValue
   }
 
   /** @inheritDoc */
-  public TCKind current_member_kind()
-                             throws TypeMismatch, InvalidValue
+  public TCKind current_member_kind() throws TypeMismatch, InvalidValue
   {
     if (isNull)
       throw new TypeMismatch(ISNULL);
@@ -179,8 +174,7 @@ public class gnuDynValue
   ;
 
   /** @inheritDoc */
-  public String current_member_name()
-                             throws TypeMismatch, InvalidValue
+  public String current_member_name() throws TypeMismatch, InvalidValue
   {
     if (isNull)
       throw new TypeMismatch(ISNULL);
@@ -190,8 +184,7 @@ public class gnuDynValue
   ;
 
   /** @inheritDoc */
-  public NameDynAnyPair[] get_members_as_dyn_any()
-                                          throws InvalidValue
+  public NameDynAnyPair[] get_members_as_dyn_any() throws InvalidValue
   {
     if (isNull)
       throw new InvalidValue(ISNULL);
@@ -200,8 +193,7 @@ public class gnuDynValue
   ;
 
   /** @inheritDoc */
-  public NameValuePair[] get_members()
-                              throws InvalidValue
+  public NameValuePair[] get_members() throws InvalidValue
   {
     if (isNull)
       throw new InvalidValue(ISNULL);
@@ -212,7 +204,7 @@ public class gnuDynValue
 
   /** @inheritDoc */
   public void set_members_as_dyn_any(NameDynAnyPair[] value)
-                              throws TypeMismatch, InvalidValue
+    throws TypeMismatch, InvalidValue
   {
     super.set_members_as_dyn_any(value);
     isNull = false;
@@ -221,7 +213,7 @@ public class gnuDynValue
 
   /** @inheritDoc */
   public void set_members(NameValuePair[] value)
-                   throws TypeMismatch, InvalidValue
+    throws TypeMismatch, InvalidValue
   {
     super.set_members(value);
     isNull = false;
@@ -252,8 +244,8 @@ public class gnuDynValue
    * Create a new instance.
    */
   protected abstractRecord newInstance(TypeCode oType, TypeCode aType,
-                                       gnuDynAnyFactory aFactory, ORB anOrb
-                                      )
+    gnuDynAnyFactory aFactory, ORB anOrb
+  )
   {
     gnuDynValue v = new gnuDynValue(oType, aType, aFactory, anOrb);
     if (isNull)
@@ -283,8 +275,7 @@ public class gnuDynValue
   /**
    * Get the focused component, throwing exception if the current value is null.
    */
-  protected DynAny focused()
-                    throws InvalidValue, TypeMismatch
+  protected DynAny focused() throws InvalidValue, TypeMismatch
   {
     if (isNull)
       throw new TypeMismatch(ISNULL);
@@ -311,8 +302,8 @@ public class gnuDynValue
               ((org.omg.CORBA_2_3.ORB) orb).lookup_value_factory(official_type.id());
             if (factory == null)
               throw new MARSHAL("Factory for " + official_type.id() +
-                                " not registered."
-                               );
+                " not registered."
+              );
 
             OutputStream out = orb.create_output_stream();
 
@@ -337,8 +328,7 @@ public class gnuDynValue
   }
 
   /** @inheritDoc */
-  public void assign(DynAny from)
-              throws TypeMismatch
+  public void assign(DynAny from) throws TypeMismatch
   {
     checkType(official_type, from.type());
 
@@ -376,16 +366,13 @@ public class gnuDynValue
   }
 
   /** {@inheritDoc} */
-  public Serializable get_val()
-                       throws TypeMismatch, InvalidValue
+  public Serializable get_val() throws TypeMismatch, InvalidValue
   {
     return to_any().extract_Value();
   }
 
-
   /** {@inheritDoc} */
-  public void insert_val(Serializable a_x)
-                  throws InvalidValue, TypeMismatch
+  public void insert_val(Serializable a_x) throws InvalidValue, TypeMismatch
   {
     Any a = to_any();
     a.insert_Value(a_x);