2005-08-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>

        * gnu/CORBA/CDR/noHeaderInput.java,
        gnu/CORBA/gnuValueHolder.java,
        gnu/CORBA/DynAn/gnuDynAny.java,
        gnu/CORBA/DynAn/gnuDynArray.java,
        gnu/CORBA/DynAn/gnuDynSequence.java,
        gnu/CORBA/DynAn/gnuDynValueBox.java,
        gnu/CORBA/DynAn/abstractRecord.java,
        gnu/CORBA/DynAn/gnuDynAnyFactory.java,
        gnu/CORBA/DynAn/gnuDynValue.java,
        gnu/CORBA/DynAn/gnuDynStruct.java,
        gnu/CORBA/DynAn/anyDivideable.java,
        gnu/CORBA/DynAn/anyUndivideable.java,
        gnu/CORBA/DynAn/gnuDynEnum.java,
        gnu/CORBA/DynAn/abstractDynAny.java,
        gnu/CORBA/DynAn/gnuDynFixed.java,
        gnu/CORBA/DynAn/valueChangedListener.java,
        gnu/CORBA/DynAn/gnuDynUnion.java: New files.
        * org/omg/DynamicAny/DynUnionOperations.java,
        org/omg/DynamicAny/DynAnyOperations.java,
        org/omg/DynamicAny/DynAnyFactoryOperations.java,
        org/omg/DynamicAny/DynValueBox.java,
        org/omg/DynamicAny/DynValueCommon.java,
        org/omg/DynamicAny/DynAnyFactoryHelper.java,
        gnu/CORBA/typeNamer.java,
        gnu/CORBA/fixedTypeCode.java,
        gnu/CORBA/CDR/Vio.java,
        gnu/CORBA/CDR/cdrInput.java,
        gnu/CORBA/CDR/cdrOutput.java,
        gnu/CORBA/holderFactory.java,
        gnu/CORBA/universalHolder.java,
        gnu/CORBA/Poa/ORB_1_4.java,
        gnu/CORBA/Restricted_ORB.java,
        gnu/CORBA/gnuAny.java,
        org/omg/CORBA/TypeCode.java
        org/omg/CORBA/Any.java,
        org/omg/CORBA/ORB.java,
        org/omg/CORBA/ObjectHelper.java,
        org/omg/CORBA/ObjectHolder.java,
        org/omg/CORBA_2_3/portable/InputStream.java,
        org/omg/CORBA_2_3/portable/OutputStream.java,
        gnu/CORBA/DynAn/NameValuePairHolder.java: Rewritten.

13 files changed, 138 insertions, 108 deletions

diff --git a/org/omg/CORBA/Any.java b/org/omg/CORBA/Any.java
index d8c892d21..1e72709d2 100644
--- a/org/omg/CORBA/Any.java
+++ b/org/omg/CORBA/Any.java
@@ -51,7 +51,7 @@ import org.omg.CORBA.portable.IDLEntity;
 public abstract class Any
   implements Serializable, IDLEntity
 {
-  /** 
+  /**
    * Using v 1.4 serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 1217179597823814463L;
@@ -312,12 +312,18 @@ public abstract class Any
   public abstract void insert_TypeCode(TypeCode typecode);
 
   /**
-   * Insert the CORBA <code>Value</code> into this <code>Any</code>
+   * Insert the CORBA <code>Value</code> into this <code>Any</code>.
+   *
+   * The type of the Any should be set (by {@link #type(TypeCode)})
+   * before inserting the value.
    */
   public abstract void insert_Value(Serializable x, TypeCode typecode);
 
   /**
-   * Insert the CORBA <code>Value</code> into this <code>Any</code>
+   * Insert the CORBA <code>Value</code> into this <code>Any</code>.
+   *
+   * The type of the Any should be set (by {@link #type(TypeCode)})
+   * before inserting the value.
    */
   public abstract void insert_Value(Serializable x);
 
diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 6a53ccc11..772642e93 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -881,6 +881,10 @@ public abstract class ORB
    * <td>Encodes/decodes IDL data types into/from byte arrays.</td>
    * </tr>
    *
+   * <tr><td>DynAnyFactory</td><td>{@link org.omg.DynamicAny.DynAnyFactory}</td>
+   * <td>Creates DynAny's.</td>
+   * </tr>
+   *
    * </table>
    *
    * @param name the object name.
diff --git a/org/omg/CORBA/ObjectHelper.java b/org/omg/CORBA/ObjectHelper.java
index 0e0efa51e..1324c621f 100644
--- a/org/omg/CORBA/ObjectHelper.java
+++ b/org/omg/CORBA/ObjectHelper.java
@@ -50,10 +50,7 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class ObjectHelper
 {
-  /**
-   * The cached binding list type code.
-   */
-  private static TypeCode typeCode = new primitiveTypeCode(TCKind.tk_objref);
+  static TypeCode typeCode;
 
   /**
    * Extract the array of object from the given {@link Any}.
@@ -100,6 +97,8 @@ public abstract class ObjectHelper
    */
   public static TypeCode type()
   {
+    if (typeCode == null)
+      typeCode = ORB.init().get_primitive_tc(TCKind.tk_objref);
     return typeCode;
   }
 
diff --git a/org/omg/CORBA/ObjectHolder.java b/org/omg/CORBA/ObjectHolder.java
index 02526bee1..27ae67416 100644
--- a/org/omg/CORBA/ObjectHolder.java
+++ b/org/omg/CORBA/ObjectHolder.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.recordTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -59,10 +60,16 @@ public final class ObjectHolder
   implements Streamable
 {
   /**
-   * The default type code for this holder.
+   * The default type code for this holder if the object type code with
+   * the zero length string as id.
    */
-  private static final TypeCode t_object =
-    new primitiveTypeCode(TCKind.tk_objref);
+  private static final recordTypeCode t_object;
+
+  static
+  {
+    t_object = new recordTypeCode(TCKind.tk_objref);
+    t_object.setId("");
+  }
 
   /**
    * The <code>org.omg.CORBA.Object</code> (CORBA <code>Object</code>) value,
@@ -109,7 +116,7 @@ public final class ObjectHolder
    */
   public TypeCode _type()
   {
-    return t_object;
+    return ObjectHelper.type();
   }
 
   /**
@@ -124,4 +131,4 @@ public final class ObjectHolder
   {
     output.write_Object(value);
   }
-}
+}
\ No newline at end of file
diff --git a/org/omg/CORBA/TypeCode.java b/org/omg/CORBA/TypeCode.java
index 38fb0564f..a1ad3db9e 100644
--- a/org/omg/CORBA/TypeCode.java
+++ b/org/omg/CORBA/TypeCode.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import java.io.Serializable;
-
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.IDLEntity;
 
+import java.io.Serializable;
+
 /**
  * An information about a CORBA data type.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
@@ -57,10 +57,12 @@ public abstract class TypeCode
   private static final long serialVersionUID = -6521025782489515676L;
 
   /**
-   * Returns the concrete base type for this TypeCode.
-   * @return a TypeCode, defining the concrete base type for this
-   * Typecode.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind
+   * For value types that support inheritance this method returns the
+   * of the ancestor type code.
+   *
+   * @return the ancestor TypeCode.
+   *
+   * @throws BadKind for all typecodes except the value type typecodes.
    */
   public abstract TypeCode concrete_base_type()
                                        throws BadKind;
@@ -69,7 +71,7 @@ public abstract class TypeCode
    * For sequences, arrays, aliases and value boxes, returns the IDL type for
    * the members of the object.
    * @return a TypeCode of the memebers of this type.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
+   * @throws BadKind for types other than
    * sequences, arrays, aliases and value boxes.
    */
   public abstract TypeCode content_type()
@@ -79,7 +81,7 @@ public abstract class TypeCode
    * For unions, returs the index of the default member.
    * @return the index of the default member, -1 if there is
    * no default member.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this type is not
+   * @throws BadKind if this type is not
    * a union.
    */
   public abstract int default_index()
@@ -88,15 +90,15 @@ public abstract class TypeCode
   /**
    * Returs definition of member labels for untions
    * @return a TypeCode, describing all non-default member labels.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this type is not a
+   * @throws BadKind if this type is not a
    * union.
    */
   public abstract TypeCode discriminator_type()
                                        throws BadKind;
 
   /**
-   * Test two types for equality. The default implementation
-   * returs true of the types of the same kind.
+   * Test two types for equality.
+   *
    * @param other the other type to compere with
    * @return true if the types are interchangeable.
    */
@@ -112,7 +114,7 @@ public abstract class TypeCode
   /**
    * For the fixed type, returns the number of digits.
    * @return the number of digits for the fixed type
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this is not a fixed
+   * @throws BadKind if this is not a fixed
    * type.
    */
   public abstract short fixed_digits()
@@ -123,7 +125,7 @@ public abstract class TypeCode
    * positive (the number of digits to the right of the decimal point) or
    * negative (adds zeros to the left of the decimal point).
    * @return the scale.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this is not a fixed
+   * @throws BadKind if this is not a fixed
    * type.
    */
   public abstract short fixed_scale()
@@ -140,7 +142,7 @@ public abstract class TypeCode
    * Returns the RepositoryId globally identifying the type, defined by
    * this TypeCode.
    * @return tje RepositoryId. In some cases, it may be an empty string.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if the type is other than
+   * @throws BadKind if the type is other than
    * reference, structure, union, enumeration, alias, exception, valuetype,
    * boxed valuetype and also native and abstract interfaces.
    */
@@ -161,7 +163,7 @@ public abstract class TypeCode
    *
    * @return length or bound
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
+   * @throws BadKind for types other than
    * string, sequence and array.
    */
   public abstract int length()
@@ -171,7 +173,7 @@ public abstract class TypeCode
    * Returns the number of type memebers.
    *
    * @return the number of memebers
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
+   * @throws BadKind for types other than
    * structure, union, enumeration or exception.
    */
   public abstract int member_count()
@@ -185,14 +187,14 @@ public abstract class TypeCode
    *
    * @return the label
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this is not a union
+   * @throws BadKind if this is not a union
    * type.
    * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is out of
    * valid bounds.
    */
   public abstract Any member_label(int index)
-    throws BadKind, 
-	   org.omg.CORBA.TypeCodePackage.Bounds;
+                            throws BadKind,
+                                   org.omg.CORBA.TypeCodePackage.Bounds;
 
   /**
    * Retrieves the simple name of the member identified by the given index.
@@ -201,14 +203,14 @@ public abstract class TypeCode
    *
    * @return the member name that in some cases can be an empty string.
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
+   * @throws BadKind for types other than
    * structure, union or enumeration.
    * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is out of
    * valid bounds.
    */
   public abstract String member_name(int index)
-    throws BadKind, 
-	   org.omg.CORBA.TypeCodePackage.Bounds;
+                              throws BadKind,
+                                     org.omg.CORBA.TypeCodePackage.Bounds;
 
   /**
    * Retrieves the member type of the member identified by the given index.
@@ -217,14 +219,14 @@ public abstract class TypeCode
    *
    * @return the member type.
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
+   * @throws BadKind for types other than
    * structure, union, enumeration or exception.
    * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is out of
    * valid bounds.
    */
   public abstract TypeCode member_type(int index)
-    throws BadKind,
-	   org.omg.CORBA.TypeCodePackage.Bounds;
+                                throws BadKind,
+                                       org.omg.CORBA.TypeCodePackage.Bounds;
 
   /**
    * Returns the visibility scope of the member at the given index.
@@ -234,22 +236,21 @@ public abstract class TypeCode
    *
    * @return either PRIVATE_MEMBER.value or PUBLIC_MEMBER.value
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind if this is not a non boxed
+   * @throws BadKind if this is not a non boxed
    * value type.
    *
    * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is out of
    * valid bounds.
    */
   public abstract short member_visibility(int index)
-    throws BadKind,
-	   org.omg.CORBA.TypeCodePackage.Bounds;
-
+                                   throws BadKind,
+                                          org.omg.CORBA.TypeCodePackage.Bounds;
 
   /**
    * Retrieves the simple name identifying this TypeCode object
    * within its enclosing scope.
    * @return the name, can be an empty string.
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for typer other than
+   * @throws BadKind for typer other than
    * reference, structure, union, enumeration, alias, exception,
    * valuetype, boxed valuetype, native, and abstract interface
    */
@@ -263,9 +264,8 @@ public abstract class TypeCode
    * VM_NONE.value, VM_ABSTRACT.value, VM_CUSTOM.value, or
    * VM_TRUNCATABLE.value,
    *
-   * @throws org.omg.CORBA.TypeCodePackage.BadKind for types other than
-   * value type.
+   * @throws BadKind for all types other than value type.
    */
   public abstract short type_modifier()
                                throws BadKind;
-}
+}
\ No newline at end of file
diff --git a/org/omg/CORBA_2_3/portable/InputStream.java b/org/omg/CORBA_2_3/portable/InputStream.java
index 3ab264f60..06ee33e66 100644
--- a/org/omg/CORBA_2_3/portable/InputStream.java
+++ b/org/omg/CORBA_2_3/portable/InputStream.java
@@ -40,7 +40,9 @@ package org.omg.CORBA_2_3.portable;
 
 import gnu.CORBA.CDR.Vio;
 
+import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.portable.BoxedValueHelper;
+import org.omg.CORBA.portable.ValueFactory;
 
 import java.io.Serializable;
 
@@ -170,7 +172,7 @@ public abstract class InputStream
    */
   public Serializable read_value(Serializable unitialised_value)
   {
-    return Vio.read(this, unitialised_value);
+    return (Serializable) Vio.read(this, unitialised_value, null);
   }
 
   /**
@@ -190,8 +192,11 @@ public abstract class InputStream
    */
   public Serializable read_value(String repository_id)
   {
-    return ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id)
-            .read_value(this);
+    ValueFactory factory =
+      ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id);
+    if (factory == null)
+      throw new MARSHAL("No factory");
+    return (Serializable) Vio.read(this, null, factory);
   }
 
   /**
@@ -203,6 +208,6 @@ public abstract class InputStream
    */
   public Serializable read_value(BoxedValueHelper helper)
   {
-    return helper.read_value(this);
+    return Vio.read(this, helper);
   }
 }
\ No newline at end of file
diff --git a/org/omg/CORBA_2_3/portable/OutputStream.java b/org/omg/CORBA_2_3/portable/OutputStream.java
index 2f83a939f..2ff8c226a 100644
--- a/org/omg/CORBA_2_3/portable/OutputStream.java
+++ b/org/omg/CORBA_2_3/portable/OutputStream.java
@@ -117,7 +117,7 @@ public abstract class OutputStream
    */
   public void write_value(Serializable value, BoxedValueHelper helper)
   {
-    helper.write_value(this, value);
+    Vio.write(this, value, helper);
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynAnyFactoryHelper.java b/org/omg/DynamicAny/DynAnyFactoryHelper.java
index b6fd15151..0c02916e5 100644
--- a/org/omg/DynamicAny/DynAnyFactoryHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryHelper.java
@@ -62,7 +62,7 @@ public abstract class DynAnyFactoryHelper
 {
   /**
    * Cast the passed object into the DynAnyFactory. As DynAnyFactory is a local
-   * object, the method just uses java type cast.
+   * object, the method just uses java final_type cast.
    * 
    * @param obj the object to narrow.
    * @return narrowed instance.
@@ -82,7 +82,7 @@ public abstract class DynAnyFactoryHelper
   }
 
   /**
-   * Get the type code of the {@link DynAnyFactory}.
+   * Get the final_type code of the {@link DynAnyFactory}.
    */
   public static TypeCode type()
   {
diff --git a/org/omg/DynamicAny/DynAnyFactoryOperations.java b/org/omg/DynamicAny/DynAnyFactoryOperations.java
index c3ea4a9dc..058e36958 100644
--- a/org/omg/DynamicAny/DynAnyFactoryOperations.java
+++ b/org/omg/DynamicAny/DynAnyFactoryOperations.java
@@ -118,6 +118,11 @@ public interface DynAnyFactoryOperations
    * <td>null</td>
    * <td>{@link DynValue}, {@link DynValueBox}</td>
    * </tr>
+   * <tr>
+   * <td>TypeCode</td>
+   * <td>Typecode of kind <code>TCKind.tk_null</code></td>
+   * <td>{@link DynValue}, {@link DynValueBox}</td>
+   * </tr>
    *
    * </table>
    *
diff --git a/org/omg/DynamicAny/DynAnyOperations.java b/org/omg/DynamicAny/DynAnyOperations.java
index 9c1aaf686..0e743136d 100644
--- a/org/omg/DynamicAny/DynAnyOperations.java
+++ b/org/omg/DynamicAny/DynAnyOperations.java
@@ -59,7 +59,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if the source DynAny is invalid.
    */
   void assign(DynAny from)
-    throws TypeMismatch;
+       throws TypeMismatch;
 
   /**
    * Fully clones the content of this Any, returning a deep copy.
@@ -77,7 +77,7 @@ public interface DynAnyOperations
    * components, like {@link DynEnum}.
    */
   DynAny current_component()
-    throws TypeMismatch;
+                    throws TypeMismatch;
 
   /**
    * Destroys this DynAny, freeing the used resources. In java, resources are
@@ -98,7 +98,7 @@ public interface DynAnyOperations
    * otherwise invalid.
    */
   void from_any(Any an_any)
-    throws TypeMismatch, InvalidValue;
+         throws TypeMismatch, InvalidValue;
 
   /**
    * This method is used when the wrapped Any contains an instance of another
@@ -108,7 +108,7 @@ public interface DynAnyOperations
    * the typecode of this DynAny.
    */
   Any get_any()
-    throws TypeMismatch, InvalidValue;
+       throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the boolean value that is expected to be stored in this DynAny.
@@ -116,7 +116,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   boolean get_boolean()
-    throws TypeMismatch, InvalidValue;
+               throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the char value that is expected to be stored in this DynAny.
@@ -124,7 +124,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   char get_char()
-    throws TypeMismatch, InvalidValue;
+         throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the <code>double</code> value that is expected to be stored in
@@ -133,7 +133,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   double get_double()
-    throws TypeMismatch, InvalidValue;
+             throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the <code>float</code> value that is expected to be stored in
@@ -142,7 +142,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   float get_float()
-    throws TypeMismatch, InvalidValue;
+           throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the int (CORBA long) value that is expected to be stored in this
@@ -151,7 +151,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   int get_long()
-    throws TypeMismatch, InvalidValue;
+        throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the long (CORBA long long) value that is expected to be stored in
@@ -160,7 +160,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   long get_longlong()
-    throws TypeMismatch, InvalidValue;
+             throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the byte (CORBA octet) value that is expected to be stored in this
@@ -169,7 +169,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   byte get_octet()
-    throws TypeMismatch, InvalidValue;
+          throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the CORBA object reference that is expected to be stored in this
@@ -178,7 +178,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   org.omg.CORBA.Object get_reference()
-    throws TypeMismatch, InvalidValue;
+                              throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the <code>short</code> value that is expected to be stored in
@@ -187,7 +187,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   short get_short()
-    throws TypeMismatch, InvalidValue;
+           throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the string value that is expected to be stored in this DynAny.
@@ -195,7 +195,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   String get_string()
-    throws TypeMismatch, InvalidValue;
+             throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the {@link TypeCode} value that is expected to be stored in this
@@ -204,7 +204,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   TypeCode get_typecode()
-    throws TypeMismatch, InvalidValue;
+                 throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the unsigned int (CORBA ulong) value that is expected to be stored
@@ -213,7 +213,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   int get_ulong()
-    throws TypeMismatch, InvalidValue;
+         throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the unsingel long (CORBA unsigned long long )value that is expected
@@ -222,7 +222,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   long get_ulonglong()
-    throws TypeMismatch, InvalidValue;
+              throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the unsigned short value that is expected to be stored in this
@@ -231,7 +231,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   short get_ushort()
-    throws TypeMismatch, InvalidValue;
+            throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the value that is expected to be stored in this DynAny.
@@ -239,7 +239,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   Serializable get_val()
-    throws TypeMismatch, InvalidValue;
+                throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the wide (usually UTF-16) character value that is expected to be
@@ -248,7 +248,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   char get_wchar()
-    throws TypeMismatch, InvalidValue;
+          throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the wide (usually UFT-16) string that is expected to be stored in
@@ -257,7 +257,7 @@ public interface DynAnyOperations
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   String get_wstring()
-    throws TypeMismatch, InvalidValue;
+              throws TypeMismatch, InvalidValue;
 
   /**
    * Insert the {@link Any} value into the enclosed {@link Any} inside this
@@ -268,7 +268,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_any(Any an_any)
-    throws TypeMismatch, InvalidValue;
+           throws TypeMismatch, InvalidValue;
 
   /**
    * Insert the boolean value into the enclosed {@link Any} inside this DynAny
@@ -278,7 +278,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_boolean(boolean a_x)
-    throws InvalidValue, TypeMismatch;
+               throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the char value into the enclosed {@link Any} inside this DynAny
@@ -288,7 +288,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_char(char a_x)
-    throws InvalidValue, TypeMismatch;
+            throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the double value into the enclosed {@link Any} inside this DynAny
@@ -298,7 +298,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_double(double a_x)
-    throws InvalidValue, TypeMismatch;
+              throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the float value into the enclosed {@link Any} inside this DynAny
@@ -308,7 +308,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_float(float a_x)
-    throws InvalidValue, TypeMismatch;
+             throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the int (CORBA long) value into the enclosed {@link Any} inside this
@@ -319,7 +319,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_long(int a_x)
-    throws InvalidValue, TypeMismatch;
+            throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the long (CORBA long long) value into the enclosed {@link Any}
@@ -330,7 +330,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_longlong(long a_x)
-    throws InvalidValue, TypeMismatch;
+                throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the byte (CORBA octet) value into the enclosed {@link Any} inside
@@ -341,7 +341,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_octet(byte a_x)
-    throws InvalidValue, TypeMismatch;
+             throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the object reference into the enclosed {@link Any} inside this
@@ -352,7 +352,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_reference(org.omg.CORBA.Object a_x)
-    throws InvalidValue, TypeMismatch;
+                 throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the <code>short</code> value into the enclosed {@link Any} inside
@@ -363,7 +363,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_short(short a_x)
-    throws InvalidValue, TypeMismatch;
+             throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the string value into the enclosed {@link Any} inside this DynAny
@@ -373,7 +373,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_string(String a_x)
-    throws InvalidValue, TypeMismatch;
+              throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the {@link TypeCode} value into the enclosed {@link Any} inside this
@@ -384,7 +384,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_typecode(TypeCode a_x)
-    throws InvalidValue, TypeMismatch;
+                throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the int (CORBA unsinged long) value into the enclosed {@link Any}
@@ -395,7 +395,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_ulong(int a_x)
-    throws InvalidValue, TypeMismatch;
+             throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the long (CORBA unsigned long long) value into the enclosed
@@ -406,7 +406,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_ulonglong(long a_x)
-    throws InvalidValue, TypeMismatch;
+                 throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the short (CORBA unsigned short) value into the enclosed {@link Any}
@@ -417,7 +417,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_ushort(short a_x)
-    throws InvalidValue, TypeMismatch;
+              throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the value into the enclosed {@link Any} inside this DynAny
@@ -427,7 +427,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_val(Serializable a_x)
-    throws InvalidValue, TypeMismatch;
+           throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the wide char (usually UTF-16) value into the enclosed {@link Any}
@@ -438,7 +438,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_wchar(char a_x)
-    throws InvalidValue, TypeMismatch;
+             throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the wide string (usually UTF-16) into the enclosed {@link Any}
@@ -449,7 +449,7 @@ public interface DynAnyOperations
    * enclosed {@link Any}.
    */
   void insert_wstring(String a_x)
-    throws InvalidValue, TypeMismatch;
+               throws InvalidValue, TypeMismatch;
 
   /**
    * Advances the internal pointer, described in the {@link current_component},
@@ -503,7 +503,7 @@ public interface DynAnyOperations
    * @throws InvalidValue if the current position points nowhere.
    */
   void insert_dyn_any(DynAny insert_it)
-    throws TypeMismatch, InvalidValue;
+               throws TypeMismatch, InvalidValue;
 
   /**
    * Checks for equality with another Dynamic Any.
@@ -536,5 +536,5 @@ public interface DynAnyOperations
    * @throws InvalidValue if the current position points nowhere.
    */
   DynAny get_dyn_any()
-    throws TypeMismatch, InvalidValue;
+              throws TypeMismatch, InvalidValue;
 }
\ No newline at end of file
diff --git a/org/omg/DynamicAny/DynUnionOperations.java b/org/omg/DynamicAny/DynUnionOperations.java
index c45eb17a7..c046e69e7 100644
--- a/org/omg/DynamicAny/DynUnionOperations.java
+++ b/org/omg/DynamicAny/DynUnionOperations.java
@@ -59,24 +59,28 @@ public interface DynUnionOperations
   extends DynAnyOperations
 {
   /**
-   * Get the value of discriminator, defining which content variant (member) is
-   * active.
+   * <p>Get the value of discriminator, defining which content variant
+   * (member) is active.
+   * </p><p>
+   * In the current implementation, the later changes on the returned value
+   * alter the state of the union via implemented internal listener.
+   * </p>
    */
   DynAny get_discriminator();
 
   /**
-   * Set the value of discriminator, activating the member variant that is
+   * <p>Set the value of discriminator, activating the member variant that is
    * consistent with the discriminator value. If the current member variant
    * matches the discriminator being set, it is unchanged. Otherwise, it is
    * replaced by the matching member variant with fields, initialised to default
    * values. The current position is set to 0 if the discriminator value does
    * not match any member variant. Otherwise, the current position is set to 1,
    * index of the member variant.
-   *
+   * </p>
    * @throws TypeMismatch if the discriminator has a wrong type of this union.
    */
   void set_discriminator(DynAny aDiscriminator)
-    throws TypeMismatch;
+                  throws TypeMismatch;
 
   /**
    * Get the kind of the union descriminator.
@@ -94,7 +98,7 @@ public interface DynUnionOperations
    * @throws InvalidValue if the union has no active member.
    */
   DynAny member()
-    throws InvalidValue;
+         throws InvalidValue;
 
   /**
    * Returns the kind of the currently active union member.
@@ -104,7 +108,7 @@ public interface DynUnionOperations
    * @throws InvalidValue if the union has no active member.
    */
   TCKind member_kind()
-    throws InvalidValue;
+              throws InvalidValue;
 
   /**
    * Returns the name of the currently active union member.
@@ -114,7 +118,7 @@ public interface DynUnionOperations
    * @throws InvalidValue if the union has no active member.
    */
   String member_name()
-    throws InvalidValue;
+              throws InvalidValue;
 
   /**
    * Returns true if the union has no active member. This happens if If the
@@ -131,7 +135,7 @@ public interface DynUnionOperations
    * @throws TypeMismatch if the default case is not defined for this union.
    */
   void set_to_default_member()
-    throws TypeMismatch;
+                      throws TypeMismatch;
 
   /**
    * Set the discriminator to value that does not correspond any content variant
@@ -141,5 +145,5 @@ public interface DynUnionOperations
    * @throws TypeMismatch if the union has explicit default case.
    */
   void set_to_no_active_member()
-    throws TypeMismatch;
+                        throws TypeMismatch;
 }
\ No newline at end of file
diff --git a/org/omg/DynamicAny/DynValueBox.java b/org/omg/DynamicAny/DynValueBox.java
index e3806464f..bd758b50c 100644
--- a/org/omg/DynamicAny/DynValueBox.java
+++ b/org/omg/DynamicAny/DynValueBox.java
@@ -49,7 +49,7 @@ import java.io.Serializable;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface DynValueBox
-  extends DynValueBoxOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
-  Serializable
+  extends DynValueBoxOperations, DynValueCommon, DynAny, IDLEntity,
+    org.omg.CORBA.Object, Serializable
 {
 }
\ No newline at end of file
diff --git a/org/omg/DynamicAny/DynValueCommon.java b/org/omg/DynamicAny/DynValueCommon.java
index 0982eee12..1b324aa7d 100644
--- a/org/omg/DynamicAny/DynValueCommon.java
+++ b/org/omg/DynamicAny/DynValueCommon.java
@@ -47,16 +47,16 @@ import java.io.Serializable;
  * {@link DynValueCommonOperations} provides methods for setting the value to
  * <code>null</code> or non-<code>null</code> and checking if the value is
  * <code>null</code>.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface DynValueCommon
-  extends DynValueOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  extends DynValueCommonOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
   Serializable
 {
   /**
    * Check if this {@link DynAny} is holding the <code>null</code>.
-   * 
+   *
    * @return true if this {@link DynAny} is holding the <code>null</code>,
    * false otherwise.
    */