|
From: <ls...@us...> - 2007-01-07 08:24:58
|
Revision: 3005
http://jnode.svn.sourceforge.net/jnode/?rev=3005&view=rev
Author: lsantha
Date: 2007-01-07 00:24:57 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
Classpath patches.
Modified Paths:
--------------
trunk/core/src/classpath/org/org/omg/CORBA/ORB.java
trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextExtImplBase.java
trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextImplBase.java
Modified: trunk/core/src/classpath/org/org/omg/CORBA/ORB.java
===================================================================
--- trunk/core/src/classpath/org/org/omg/CORBA/ORB.java 2007-01-07 08:24:38 UTC (rev 3004)
+++ trunk/core/src/classpath/org/org/omg/CORBA/ORB.java 2007-01-07 08:24:57 UTC (rev 3005)
@@ -208,6 +208,34 @@
}
/**
+ * 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,
@@ -252,7 +280,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynAny} and derived interfaces
@@ -268,7 +295,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynArray}
@@ -285,7 +311,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynEnum}
@@ -302,7 +327,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynSequence}
@@ -319,7 +343,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynStruct} and derived interfaces
@@ -336,7 +359,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for {@link DynUnion} and derived interfaces
@@ -353,7 +375,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* Create a typecode, defining the given enumeration.
@@ -645,33 +666,6 @@
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
Modified: trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextExtImplBase.java
===================================================================
--- trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextExtImplBase.java 2007-01-07 08:24:38 UTC (rev 3004)
+++ trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextExtImplBase.java 2007-01-07 08:24:57 UTC (rev 3005)
@@ -66,7 +66,7 @@
extends _NamingContextImplBase
implements NamingContextExt, InvokeHandler
{
- static Hashtable _methods = new Hashtable();
+ static Hashtable<String,Integer> _methods = new Hashtable<String,Integer>();
static
{
Modified: trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextImplBase.java
===================================================================
--- trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextImplBase.java 2007-01-07 08:24:38 UTC (rev 3004)
+++ trunk/core/src/classpath/org/org/omg/CosNaming/_NamingContextImplBase.java 2007-01-07 08:24:57 UTC (rev 3005)
@@ -82,7 +82,7 @@
* 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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|