2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)

10 files changed, 40 insertions, 45 deletions

diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index df891367e..89bc53764 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -208,6 +208,34 @@ public abstract class ORB
   }
 
   /**
+   * Create a typecode, representing a tree-like structure.
+   * This structure contains a member that is a sequence of the same type,
+   * as the structure itself. You can imagine as if the folder definition
+   * contains a variable-length array of the enclosed (nested) folder
+   * definitions. In this way, it is possible to have a tree like
+   * structure that can be transferred via CORBA CDR stream.
+   *
+   * @deprecated It is easier and clearler to use a combination of
+   * create_recursive_tc and create_sequence_tc instead.
+   *
+   * @param bound the maximal expected number of the nested components
+   * on each node; 0 if not limited.
+   *
+   * @param offset the position of the field in the returned structure
+   * that contains the sequence of the structures of the same field.
+   * The members before this field are intialised using parameterless
+   * StructMember constructor.
+   *
+   * @return a typecode, defining a stucture, where a member at the
+   * <code>offset</code> position defines an array of the identical
+   * structures.
+   *
+   * @see #create_recursive_tc(String)
+   * @see #create_sequence_tc(int, TypeCode)
+   */
+  public abstract TypeCode create_recursive_sequence_tc(int bound, int offset);
+
+  /**
    * Create alias typecode for the given typecode.
    */
   public abstract TypeCode create_alias_tc(String id, String name,
@@ -494,7 +522,7 @@ public abstract class ORB
    */
   public abstract Request get_next_response()
                                      throws WrongTransaction;
-
+ 
   /**
    * Create a new CDR output stream, where the parameter values can be written
    * during the method invocation.
@@ -645,33 +673,6 @@ public abstract class ORB
     return t;
   }
 
-  /**
-   * Create a typecode, representing a tree-like structure.
-   * This structure contains a member that is a sequence of the same type,
-   * as the structure itself. You can imagine as if the folder definition
-   * contains a variable-length array of the enclosed (nested) folder
-   * definitions. In this way, it is possible to have a tree like
-   * structure that can be transferred via CORBA CDR stream.
-   *
-   * @deprecated It is easier and clearler to use a combination of
-   * create_recursive_tc and create_sequence_tc instead.
-   *
-   * @param bound the maximal expected number of the nested components
-   * on each node; 0 if not limited.
-   *
-   * @param offset the position of the field in the returned structure
-   * that contains the sequence of the structures of the same field.
-   * The members before this field are intialised using parameterless
-   * StructMember constructor.
-   *
-   * @return a typecode, defining a stucture, where a member at the
-   * <code>offset</code> position defines an array of the identical
-   * structures.
-   *
-   * @see #create_recursive_tc(String)
-   * @see #create_sequence_tc(int, TypeCode)
-   */
-  public abstract TypeCode create_recursive_sequence_tc(int bound, int offset);
 
   /**
    * Create a typecode which serves as a placeholder for typcode, containing
@@ -1236,4 +1237,4 @@ public abstract class ORB
                                why
                               );
   }
-}
\ No newline at end of file
+}
diff --git a/org/omg/CORBA/portable/ApplicationException.jbx b/org/omg/CORBA/portable/ApplicationException.jbx
deleted file mode 100644
index 0113ff3e0..000000000
--- a/org/omg/CORBA/portable/ApplicationException.jbx
+++ /dev/null
@@ -1,6 +0,0 @@
-[PropertyInfo]
-[IconNames]
-
-
-
-
diff --git a/org/omg/CORBA/portable/BoxedValueHelper.java b/org/omg/CORBA/portable/BoxedValueHelper.java
index 504749f11..47c2b9106 100644
--- a/org/omg/CORBA/portable/BoxedValueHelper.java
+++ b/org/omg/CORBA/portable/BoxedValueHelper.java
@@ -76,4 +76,4 @@ public interface BoxedValueHelper
    * @param value a value to write.
    */
   void write_value(OutputStream ostream, Serializable value);
-}
\ No newline at end of file
+}
diff --git a/org/omg/CORBA/portable/ValueFactory.java b/org/omg/CORBA/portable/ValueFactory.java
index 339bcddb3..aaffe8684 100644
--- a/org/omg/CORBA/portable/ValueFactory.java
+++ b/org/omg/CORBA/portable/ValueFactory.java
@@ -59,4 +59,4 @@ public interface ValueFactory
    * the stream.
    */
   Serializable read_value(org.omg.CORBA_2_3.portable.InputStream from_stream);
-}
\ No newline at end of file
+}
diff --git a/org/omg/CosNaming/NamingContextPackage/NotEmpty.java b/org/omg/CosNaming/NamingContextPackage/NotEmpty.java
index 3fe98d564..c80cfcc7a 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotEmpty.java
+++ b/org/omg/CosNaming/NamingContextPackage/NotEmpty.java
@@ -71,4 +71,4 @@ public final class NotEmpty
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/org/omg/CosNaming/_NamingContextExtImplBase.java b/org/omg/CosNaming/_NamingContextExtImplBase.java
index 03630f8d6..617f7aec4 100644
--- a/org/omg/CosNaming/_NamingContextExtImplBase.java
+++ b/org/omg/CosNaming/_NamingContextExtImplBase.java
@@ -66,7 +66,7 @@ public abstract class _NamingContextExtImplBase
   extends _NamingContextImplBase
   implements NamingContextExt, InvokeHandler
 {
-  static Hashtable _methods = new Hashtable();
+  static Hashtable<String,Integer> _methods = new Hashtable<String,Integer>();
 
   static
   {
@@ -234,4 +234,4 @@ public abstract class _NamingContextExtImplBase
       }
     gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
   }
-}
\ No newline at end of file
+}
diff --git a/org/omg/CosNaming/_NamingContextImplBase.java b/org/omg/CosNaming/_NamingContextImplBase.java
index 33bddef5d..1c2a56be6 100644
--- a/org/omg/CosNaming/_NamingContextImplBase.java
+++ b/org/omg/CosNaming/_NamingContextImplBase.java
@@ -82,7 +82,7 @@ public abstract class _NamingContextImplBase
    * As there are quite many methods, it may be sensible to use the hashtable.
    * This field is also reused in NamingContextPOA.
    */
-  static Hashtable methods = new Hashtable();
+  static Hashtable<String,Integer> methods = new Hashtable<String,Integer>();
 
   /**
    * Put all methods into the table.
@@ -412,4 +412,4 @@ public abstract class _NamingContextImplBase
 
     gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
   }
-}
\ No newline at end of file
+}
diff --git a/org/omg/DynamicAny/DynAnyOperations.java b/org/omg/DynamicAny/DynAnyOperations.java
index 2660014bd..a009f4c88 100644
--- a/org/omg/DynamicAny/DynAnyOperations.java
+++ b/org/omg/DynamicAny/DynAnyOperations.java
@@ -537,4 +537,4 @@ public interface DynAnyOperations
    */
   DynAny get_dyn_any()
               throws TypeMismatch, InvalidValue;
-}
\ No newline at end of file
+}
diff --git a/org/omg/DynamicAny/DynUnionOperations.java b/org/omg/DynamicAny/DynUnionOperations.java
index c046e69e7..30b891a2d 100644
--- a/org/omg/DynamicAny/DynUnionOperations.java
+++ b/org/omg/DynamicAny/DynUnionOperations.java
@@ -146,4 +146,4 @@ public interface DynUnionOperations
    */
   void set_to_no_active_member()
                         throws TypeMismatch;
-}
\ No newline at end of file
+}
diff --git a/org/omg/stub/java/rmi/_Remote_Stub.java b/org/omg/stub/java/rmi/_Remote_Stub.java
index da597e917..0d0bac661 100644
--- a/org/omg/stub/java/rmi/_Remote_Stub.java
+++ b/org/omg/stub/java/rmi/_Remote_Stub.java
@@ -75,4 +75,4 @@ public final class _Remote_Stub
     return new String[] { "" };
   }
 
-}
\ No newline at end of file
+}