[cp-patches] FYI: API and style fixes in org.omg.DynamicAny

[Meskauskas Audrius]

2005-07-31  Audrius Meskauskas  <address@hidden>

       * org/omg/DynamicAny/DynFixedOperations.java,
       org/omg/DynamicAny/DynEnum.java,
       org/omg/DynamicAny/DynArrayOperations.java: Inherit from
       DynAnyOperations.
       * org/omg/DynamicAny/NameDynAnyPair.java: Inherit from
       org.omg.CORBA.portable.IDLEntity.
       * org/omg/DynamicAny/DynAnyOperations.java
       (assign, current_component): Fixes in throws declaration.
       * org/omg/DynamicAny/DynEnumOperations.java,
       org/omg/DynamicAny/DynSequenceOperations.java,
       org/omg/DynamicAny/DynStructOperations.java,
       org/omg/DynamicAny/DynUnionOperations.java,
       org/omg/DynamicAny/DynAny.java,
       org/omg/DynamicAny/DynFixed.java,
       org/omg/DynamicAny/DynSequence.java,
       org/omg/DynamicAny/DynStruct.java,
       org/omg/DynamicAny/DynUnion.java,
       org/omg/DynamicAny/DynArray.java,
       org/omg/DynamicAny/NameValuePair.java: Reformatted.


Index: org/omg/DynamicAny/DynAny.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynAny.java,v
retrieving revision 1.1
diff -u -r1.1 DynAny.java
--- org/omg/DynamicAny/DynAny.java      28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynAny.java      31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynAny.java --
    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
@@ -66,7 +65,7 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynAny extends DynAnyOperations, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynAny
+  extends DynAnyOperations, IDLEntity, org.omg.CORBA.Object, Serializable
 {
 }
Index: org/omg/DynamicAny/DynAnyOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynAnyOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynAnyOperations.java
--- org/omg/DynamicAny/DynAnyOperations.java    28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynAnyOperations.java    31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynAnyOperations.java --
    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
@@ -60,7 +59,7 @@
    * @throws TypeMismatch if the source DynAny is invalid.
    */
   void assign(DynAny from)
-       throws TypeMismatch, InvalidValue;
+    throws TypeMismatch;
 
   /**
    * Fully clones the content of this Any, returning a deep copy.
@@ -73,8 +72,12 @@
    * DynAny can be used to get or set the value of the focused component. If 
the
    * DynAny holds a primitive type with no components, this implementation
    * returns <code>null</code>.
+   *
+   * @throws TypeMismatch if called on DynAny that cannot have active
+   * components, like address@hidden DynEnum}.
    */
-  DynAny current_component();
+  DynAny current_component()
+    throws TypeMismatch;
 
   /**
    * Destroys this DynAny, freeing the used resources. In java, resources are
@@ -95,7 +98,7 @@
    * 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
@@ -105,7 +108,7 @@
    * 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.
@@ -113,7 +116,7 @@
    * @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.
@@ -121,7 +124,7 @@
    * @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
@@ -130,7 +133,7 @@
    * @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
@@ -139,7 +142,7 @@
    * @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
@@ -148,7 +151,7 @@
    * @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
@@ -157,7 +160,7 @@
    * @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
@@ -166,7 +169,7 @@
    * @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
@@ -175,7 +178,7 @@
    * @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
@@ -184,7 +187,7 @@
    * @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.
@@ -192,7 +195,7 @@
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   String get_string()
-             throws TypeMismatch, InvalidValue;
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Extract the address@hidden TypeCode} value that is expected to be stored 
in this
@@ -201,7 +204,7 @@
    * @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
@@ -210,7 +213,7 @@
    * @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
@@ -219,7 +222,7 @@
    * @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
@@ -228,7 +231,7 @@
    * @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.
@@ -236,7 +239,7 @@
    * @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
@@ -245,7 +248,7 @@
    * @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
@@ -254,7 +257,7 @@
    * @throws TypeMismatch if this DynAny holds the value of the different type.
    */
   String get_wstring()
-              throws TypeMismatch, InvalidValue;
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Insert the address@hidden Any} value into the enclosed address@hidden 
Any} inside this
@@ -265,7 +268,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_any(Any an_any)
-           throws TypeMismatch, InvalidValue;
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Insert the boolean value into the enclosed address@hidden Any} inside 
this DynAny
@@ -275,7 +278,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_boolean(boolean a_x)
-               throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the char value into the enclosed address@hidden Any} inside this 
DynAny
@@ -285,7 +288,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_char(char a_x)
-            throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the double value into the enclosed address@hidden Any} inside this 
DynAny
@@ -295,7 +298,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_double(double a_x)
-              throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the float value into the enclosed address@hidden Any} inside this 
DynAny
@@ -305,7 +308,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_float(float a_x)
-             throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the int (CORBA long) value into the enclosed address@hidden Any} 
inside this
@@ -316,7 +319,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_long(int a_x)
-            throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the long (CORBA long long) value into the enclosed address@hidden 
Any}
@@ -327,7 +330,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_longlong(long a_x)
-                throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the byte (CORBA octet) value into the enclosed address@hidden Any} 
inside
@@ -338,7 +341,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_octet(byte a_x)
-             throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the object reference into the enclosed address@hidden Any} inside 
this
@@ -349,7 +352,7 @@
    * enclosed address@hidden 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 address@hidden Any} 
inside
@@ -360,7 +363,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_short(short a_x)
-             throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the string value into the enclosed address@hidden Any} inside this 
DynAny
@@ -370,7 +373,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_string(String a_x)
-              throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the address@hidden TypeCode} value into the enclosed 
address@hidden Any} inside this
@@ -381,7 +384,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_typecode(TypeCode a_x)
-  throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the int (CORBA unsinged long) value into the enclosed 
address@hidden Any}
@@ -392,7 +395,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_ulong(int a_x)
-             throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the long (CORBA unsigned long long) value into the enclosed
@@ -403,7 +406,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_ulonglong(long a_x)
-                 throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the short (CORBA unsigned short) value into the enclosed 
address@hidden Any}
@@ -414,7 +417,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_ushort(short a_x)
-              throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the value into the enclosed address@hidden Any} inside this DynAny
@@ -424,7 +427,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_val(Serializable a_x)
-           throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the wide char (usually UTF-16) value into the enclosed 
address@hidden Any}
@@ -435,7 +438,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_wchar(char a_x)
-             throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Insert the wide string (usually UTF-16) into the enclosed address@hidden 
Any}
@@ -446,7 +449,7 @@
    * enclosed address@hidden Any}.
    */
   void insert_wstring(String a_x)
-               throws InvalidValue, TypeMismatch;
+    throws InvalidValue, TypeMismatch;
 
   /**
    * Advances the internal pointer, described in the address@hidden 
current_component},
@@ -481,8 +484,7 @@
    *
    * @return shallow copy of the enclosed address@hidden Any}.
    */
-  Any to_any()
-      throws TypeMismatch;
+  Any to_any();
 
   /**
    * Returns the typecode of the object, inserted into this DynAny.
@@ -501,17 +503,17 @@
    * @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.
    *
    *
    * @specnote This method is currently only implemented only for case when
-   * another DynAny was created by the factory of this implementation and
-   * is not an independent class, just implementing interface. Otherwise,
-   * a NO_IMPLEMENT minor 8148 will be thrown. General implementation is
-   * highly ineffective, but we will do if somebody would ever need it.
+   * another DynAny was created by the factory of this implementation and is 
not
+   * an independent class, just implementing interface. Otherwise, a
+   * NO_IMPLEMENT minor 8148 will be thrown. General implementation is highly
+   * ineffective, but we will do if somebody would ever need it.
    */
   boolean equal(DynAny other);
 
@@ -534,5 +536,5 @@
    * @throws InvalidValue if the current position points nowhere.
    */
   DynAny get_dyn_any()
-              throws TypeMismatch, InvalidValue;
+    throws TypeMismatch, InvalidValue;
 }
Index: org/omg/DynamicAny/DynArray.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynArray.java,v
retrieving revision 1.1
diff -u -r1.1 DynArray.java
--- org/omg/DynamicAny/DynArray.java    28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynArray.java    31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynArray.java --
    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
@@ -43,11 +42,13 @@
 import org.omg.CORBA.portable.IDLEntity;
 
 /**
- * Represents a fixed size array. All components in the array have the same 
type.
+ * Represents a fixed size array. All components in the array have the same
+ * type.
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynArray extends DynArrayOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynArray
+  extends DynArrayOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynArrayOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynArrayOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynArrayOperations.java
--- org/omg/DynamicAny/DynArrayOperations.java  28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynArrayOperations.java  31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynArrayOperations.java --
    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
@@ -47,7 +46,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynArrayOperations extends DynAnyOperations
+public interface DynArrayOperations
+  extends DynAnyOperations
 {
   /**
    * Returns the array.
@@ -68,25 +68,26 @@
    *
    * @param value the array of elements an DynAny's.
    *
-   * @throws TypeMismatch if the members of the passed array does not
-   * match array component type.
+   * @throws TypeMismatch if the members of the passed array does not match
+   * array component type.
    *
-   * @throws InvalidValue if the number of elements in the passed array
-   * is not the same as the size of this DynArray.
+   * @throws InvalidValue if the number of elements in the passed array is not
+   * the same as the size of this DynArray.
    */
-  void set_elements_as_dyn_any(DynAny[] value) throws TypeMismatch,
-      InvalidValue;
+  void set_elements_as_dyn_any(DynAny[] value)
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Sets the array.
    *
    * @param value the array of elements as Any's.
    *
-   * @throws TypeMismatch if the members of the passed array does not
-   * match array component type.
+   * @throws TypeMismatch if the members of the passed array does not match
+   * array component type.
    *
-   * @throws InvalidValue if the number of elements in the passed array
-   * is not the same as the size of this DynArray.
+   * @throws InvalidValue if the number of elements in the passed array is not
+   * the same as the size of this DynArray.
    */
-  void set_elements(Any[] value) throws TypeMismatch, InvalidValue;
+  void set_elements(Any[] value)
+    throws TypeMismatch, InvalidValue;
 }
Index: org/omg/DynamicAny/DynEnum.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynEnum.java,v
retrieving revision 1.1
diff -u -r1.1 DynEnum.java
--- org/omg/DynamicAny/DynEnum.java     28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynEnum.java     31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynEnum.java --
    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
@@ -50,7 +49,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynEnum extends DynEnumOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynEnum
+  extends DynEnumOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynEnumOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynEnumOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynEnumOperations.java
--- org/omg/DynamicAny/DynEnumOperations.java   28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynEnumOperations.java   31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynEnumOperations.java --
    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
@@ -50,6 +49,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface DynEnumOperations
+  extends DynAnyOperations
 {
   /**
    * Get the current enumeration value, as string.
@@ -67,7 +67,8 @@
    * @throws InvalidValue if the passed string is not one of the allowed values
    * for this enumeration.
    */
-  void set_as_string(String value) throws InvalidValue;
+  void set_as_string(String value)
+    throws InvalidValue;
 
   /**
    * Set the current enumeration value, as int.
@@ -75,6 +76,7 @@
    * @throws InvalidValue if the passed string is not one of the allowed values
    * for this enumeration.
    */
-  void set_as_ulong(int value) throws InvalidValue;
+  void set_as_ulong(int value)
+    throws InvalidValue;
 
 }
Index: org/omg/DynamicAny/DynFixed.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynFixed.java,v
retrieving revision 1.1
diff -u -r1.1 DynFixed.java
--- org/omg/DynamicAny/DynFixed.java    28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynFixed.java    31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynFixed.java --
    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
@@ -49,7 +48,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynFixed extends DynFixedOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynFixed
+  extends DynFixedOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynFixedOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynFixedOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynFixedOperations.java
--- org/omg/DynamicAny/DynFixedOperations.java  28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynFixedOperations.java  31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynFixedOperations.java --
    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
@@ -48,6 +47,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface DynFixedOperations
+  extends DynAnyOperations
 {
   /**
    * Get the value of the enclosed DynFixed, as string.
@@ -66,5 +66,6 @@
    * @return true if the passed value can be represented without the loss of
    * precision, false if some fractional digits were truncated.
    */
-  boolean set_value(String fixed_value) throws TypeMismatch, InvalidValue;
+  boolean set_value(String fixed_value)
+    throws TypeMismatch, InvalidValue;
 }
Index: org/omg/DynamicAny/DynSequence.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynSequence.java,v
retrieving revision 1.1
diff -u -r1.1 DynSequence.java
--- org/omg/DynamicAny/DynSequence.java 28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynSequence.java 31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynSequence.java --
    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
@@ -48,7 +47,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynSequence extends DynSequenceOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynSequence
+  extends DynSequenceOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynSequenceOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynSequenceOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynSequenceOperations.java
--- org/omg/DynamicAny/DynSequenceOperations.java       28 Jul 2005 14:38:13 
-0000      1.1
+++ org/omg/DynamicAny/DynSequenceOperations.java       31 Jul 2005 18:00:24 
-0000
@@ -1,6 +1,5 @@
 /* DynSequenceOperations.java --
    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
@@ -53,6 +52,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface DynSequenceOperations
+  extends DynAnyOperations
 {
   /**
    * Get the length of the sequence.
@@ -74,7 +74,8 @@
    * @throws InvalidValue if this is a bounded sequence, and the size being set
    * exceeds the sequence bound.
    */
-  public void set_length(int length) throws InvalidValue;
+  public void set_length(int length)
+    throws InvalidValue;
 
   /**
    * Returns the array, containing the sequence elements.
@@ -102,8 +103,8 @@
    * @throws InvalidValue if this is a bounded sequence and the number of
    * elements in the passed array exceeds the sequence bound.
    */
-  void set_elements_as_dyn_any(DynAny[] value) throws TypeMismatch,
-      InvalidValue;
+  void set_elements_as_dyn_any(DynAny[] value)
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Sets the sequence elements from the array. The length of the sequence is
@@ -118,5 +119,6 @@
    * @throws InvalidValue if this is a bounded sequence and the number of
    * elements in the passed array exceeds the sequence bound.
    */
-  void set_elements(Any[] value) throws TypeMismatch, InvalidValue;
+  void set_elements(Any[] value)
+    throws TypeMismatch, InvalidValue;
 }
Index: org/omg/DynamicAny/DynStruct.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynStruct.java,v
retrieving revision 1.1
diff -u -r1.1 DynStruct.java
--- org/omg/DynamicAny/DynStruct.java   28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynStruct.java   31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynStruct.java --
    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
@@ -43,12 +42,13 @@
 import org.omg.CORBA.portable.IDLEntity;
 
 /**
- * Defines a fixed size structure with the named fields that may have
- * different types.
+ * Defines a fixed size structure with the named fields that may have different
+ * types.
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynStruct extends DynStructOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynStruct
+  extends DynStructOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynStructOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynStructOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynStructOperations.java
--- org/omg/DynamicAny/DynStructOperations.java 28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynStructOperations.java 31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynStructOperations.java --
    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
@@ -47,7 +46,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynStructOperations extends DynAnyOperations
+public interface DynStructOperations
+  extends DynAnyOperations
 {
   /**
    * Get the kind of the structure field at the current position.
@@ -57,7 +57,8 @@
    * @throws TypeMismatch for an empty structure (normally exception).
    * @throws InvalidValue if the current position does not indicate a memeber.
    */
-  TCKind current_member_kind() throws TypeMismatch, InvalidValue;
+  TCKind current_member_kind()
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Get the name of the structure field at the current position.
@@ -67,7 +68,8 @@
    * @throws TypeMismatch for an empty structure (normally exception).
    * @throws InvalidValue if the current position does not indicate a memeber.
    */
-  String current_member_name() throws TypeMismatch, InvalidValue;
+  String current_member_name()
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Return array, describing describing the name and the value of each member
@@ -102,14 +104,14 @@
    * @param an array of NameDynValuePair's, each defining a single field in the
    * structure.
    *
-   * @throws TypeMismatch if the member of the passed array has a different
-   * type than the corresponding structure field.
+   * @throws TypeMismatch if the member of the passed array has a different 
type
+   * than the corresponding structure field.
    *
    * @throws InvalidValue if the size of the passed array is not the same as 
the
    * number of fields in this structure.
    */
-  void set_members_as_dyn_any(NameDynAnyPair[] value) throws TypeMismatch,
-      InvalidValue;
+  void set_members_as_dyn_any(NameDynAnyPair[] value)
+    throws TypeMismatch, InvalidValue;
 
   /**
    * Set the structure contend from the array, where each member defines the
@@ -126,12 +128,13 @@
    * @param an array of NameValuePair's, each defining a single field in the
    * structure.
    *
-   * @throws TypeMismatch if the member of the passed array has a different
-   * type than the corresponding structure field.
+   * @throws TypeMismatch if the member of the passed array has a different 
type
+   * than the corresponding structure field.
    *
    * @throws InvalidValue if the size of the passed array is not the same as 
the
    * number of fields in this structure.
    */
-  void set_members(NameValuePair[] value) throws TypeMismatch, InvalidValue;
+  void set_members(NameValuePair[] value)
+    throws TypeMismatch, InvalidValue;
 
 }
Index: org/omg/DynamicAny/DynUnion.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/DynUnion.java,v
retrieving revision 1.1
diff -u -r1.1 DynUnion.java
--- org/omg/DynamicAny/DynUnion.java    28 Jul 2005 14:38:13 -0000      1.1
+++ org/omg/DynamicAny/DynUnion.java    31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynUnion.java --
    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
@@ -48,7 +47,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface DynUnion extends DynUnionOperations, DynAny, IDLEntity,
-    org.omg.CORBA.Object, Serializable
+public interface DynUnion
+  extends DynUnionOperations, DynAny, IDLEntity, org.omg.CORBA.Object,
+  Serializable
 {
 }
Index: org/omg/DynamicAny/DynUnionOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/DynamicAny/DynUnionOperations.java,v
retrieving revision 1.1
diff -u -r1.1 DynUnionOperations.java
--- org/omg/DynamicAny/DynUnionOperations.java  28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/DynUnionOperations.java  31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* DynUnionOperations.java --
    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
@@ -57,6 +56,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface DynUnionOperations
+  extends DynAnyOperations
 {
   /**
    * Get the value of discriminator, defining which content variant (member) is
@@ -75,7 +75,8 @@
    *
    * @throws TypeMismatch if the discriminator has a wrong type of this union.
    */
-  void set_discriminator(DynAny aDiscriminator) throws TypeMismatch;
+  void set_discriminator(DynAny aDiscriminator)
+    throws TypeMismatch;
 
   /**
    * Get the kind of the union descriminator.
@@ -92,7 +93,8 @@
    *
    * @throws InvalidValue if the union has no active member.
    */
-  DynAny member() throws InvalidValue;
+  DynAny member()
+    throws InvalidValue;
 
   /**
    * Returns the kind of the currently active union member.
@@ -101,7 +103,8 @@
    *
    * @throws InvalidValue if the union has no active member.
    */
-  TCKind member_kind() throws InvalidValue;
+  TCKind member_kind()
+    throws InvalidValue;
 
   /**
    * Returns the name of the currently active union member.
@@ -110,7 +113,8 @@
    *
    * @throws InvalidValue if the union has no active member.
    */
-  String member_name() throws InvalidValue;
+  String member_name()
+    throws InvalidValue;
 
   /**
    * Returns true if the union has no active member. This happens if If the
@@ -126,7 +130,8 @@
    *
    * @throws TypeMismatch if the default case is not defined for this union.
    */
-  void set_to_default_member() throws TypeMismatch;
+  void set_to_default_member()
+    throws TypeMismatch;
 
   /**
    * Set the discriminator to value that does not correspond any content 
variant
@@ -135,5 +140,6 @@
    *
    * @throws TypeMismatch if the union has explicit default case.
    */
-  void set_to_no_active_member() throws TypeMismatch;
+  void set_to_no_active_member()
+    throws TypeMismatch;
 }
Index: org/omg/DynamicAny/NameDynAnyPair.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/NameDynAnyPair.java,v
retrieving revision 1.1
diff -u -r1.1 NameDynAnyPair.java
--- org/omg/DynamicAny/NameDynAnyPair.java      28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/NameDynAnyPair.java      31 Jul 2005 18:00:24 -0000
@@ -1,6 +1,5 @@
 /* NameDynAnyPair.java --
    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
@@ -48,7 +47,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public final class NameDynAnyPair implements IDLEntity, Serializable
+public final class NameDynAnyPair
+  implements IDLEntity, Serializable
 {
   /**
    * Use serialVersionUID (v1.4) for interoperability.
Index: org/omg/DynamicAny/NameValuePair.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/DynamicAny/NameValuePair.java,v
retrieving revision 1.1
diff -u -r1.1 NameValuePair.java
--- org/omg/DynamicAny/NameValuePair.java       28 Jul 2005 14:38:13 -0000      
1.1
+++ org/omg/DynamicAny/NameValuePair.java       31 Jul 2005 18:00:24 -0000
@@ -1,56 +1,56 @@
 /* NameValuePair.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+This file is part of GNU Classpath.
 
- 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. */
+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. */
 
 
 package org.omg.DynamicAny;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.DynStruct;
-import org.omg.CORBA.IDLEntity;
+import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
 
 /**
  * Holds the value, having the given name(id). This class is used by with
  * address@hidden DynStruct} to name the fields of the record (structure).
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public final class NameValuePair implements Serializable, IDLEntity
+public final class NameValuePair
+  implements Serializable, IDLEntity
 {
   /**
    * Use serialVersionUID (v1.4) for interoperability.
@@ -76,10 +76,10 @@
 
   /**
    * Creates the name-value pair, initialising the fields to the passed values.
-   * 
+   *
    * @param aName the name (also called id) of the name-value pair, normally 
the
    * name of the structure field.
-   * 
+   *
    * @param aValue the value of the name-value pair.
    */
   public NameValuePair(String aName, Any aValue)