diff options
Diffstat (limited to 'libjava/classpath/org/omg/IOP')
14 files changed, 107 insertions, 193 deletions
diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java index fea0b887bd9..89404f7d584 100644 --- a/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.CompletionStatus; @@ -56,18 +58,11 @@ import org.omg.CORBA.portable.OutputStream; public abstract class CodecFactoryHelper { /** - * The cached {@link CodecFactory} typecode, computed once. - */ - private static TypeCode typeCode; - - /** * Get the type code of the {@link CodecFactory}. */ public static TypeCode type() { - if (typeCode == null) - typeCode = ORB.init().create_interface_tc(id(), "CodecFactory"); - return typeCode; + return OrbRestricted.Singleton.create_interface_tc(id(), "CodecFactory"); } /** diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java index e036dbf1f42..8861e43da5f 100644 --- a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java @@ -40,6 +40,7 @@ package org.omg.IOP.CodecFactoryPackage; import gnu.CORBA.EmptyExceptionHolder; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.ORB; import org.omg.CORBA.Any; @@ -59,25 +60,16 @@ import org.omg.CORBA.BAD_OPERATION; public abstract class UnknownEncodingHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the UnknownEncoding typecode (structure, * named "UnknownEncoding"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[0]; - typeCode = - orb.create_exception_tc (id(), "UnknownEncoding", members); + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[0]; + return + orb.create_exception_tc (id(), "UnknownEncoding", members); - } - return typeCode; } /* Every user exception with no user defined fields can use EmptyExceptionHolder */ diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java index e353be8f9ed..2a9295ae877 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java @@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream; public abstract class FormatMismatchHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the FormatMismatch typecode (structure, * named "FormatMismatch"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 0 ]; - typeCode = orb.create_exception_tc(id(), "FormatMismatch", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[ 0 ]; + return orb.create_exception_tc(id(), "FormatMismatch", members); } /** diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java index 8a93c5895a0..e2a8c905793 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java @@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -58,29 +59,19 @@ import org.omg.CORBA.portable.OutputStream; public abstract class InvalidTypeForEncodingHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** - * Create the InvalidTypeForEncoding typecode (structure, - * named "InvalidTypeForEncoding"). + * Create the InvalidTypeForEncoding typecode (structure, named + * "InvalidTypeForEncoding"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 0 ]; - typeCode = - orb.create_exception_tc(id(), "InvalidTypeForEncoding", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[0]; + return orb.create_exception_tc(id(), "InvalidTypeForEncoding", members); } /** * Insert the InvalidTypeForEncoding into the given Any. - * + * * @param any the Any to insert into. * @param that the InvalidTypeForEncoding to insert. */ diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java index 33951de701f..432e84d24cb 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java @@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage; import gnu.CORBA.EmptyExceptionHolder; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream; public abstract class TypeMismatchHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the TypeMismatch typecode (structure, * named "TypeMismatch"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 0 ]; - typeCode = orb.create_exception_tc(id(), "TypeMismatch", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[ 0 ]; + return orb.create_exception_tc(id(), "TypeMismatch", members); } /** diff --git a/libjava/classpath/org/omg/IOP/ComponentIdHelper.java b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java index 64fbdfd74f5..35ffd9a69e4 100644 --- a/libjava/classpath/org/omg/IOP/ComponentIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -65,10 +67,10 @@ public abstract class ComponentIdHelper */ public static TypeCode type() { - ORB orb = ORB.init(); - return orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0", "ComponentId", - orb.get_primitive_tc(TCKind.tk_ulong) - ); + ORB orb = OrbRestricted.Singleton; + return orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0", + "ComponentId", + orb.get_primitive_tc(TCKind.tk_ulong)); } /** diff --git a/libjava/classpath/org/omg/IOP/IORHelper.java b/libjava/classpath/org/omg/IOP/IORHelper.java index 77f18d9b9cd..197e15a1203 100644 --- a/libjava/classpath/org/omg/IOP/IORHelper.java +++ b/libjava/classpath/org/omg/IOP/IORHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -57,42 +58,30 @@ import org.omg.CORBA.portable.OutputStream; public abstract class IORHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** - * Create the IOR typecode (structure, - * named "IOR"). - * The typecode states that the structure contains the - * following fields: type_id, profiles. + * Create the IOR typecode (structure, named "IOR"). The typecode states that + * the structure contains the following fields: type_id, profiles. */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 2 ]; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[2]; - TypeCode field; + TypeCode field; - field = orb.get_primitive_tc(TCKind.tk_string); - members [ 0 ] = new StructMember("type_id", field, null); + field = orb.get_primitive_tc(TCKind.tk_string); + members[0] = new StructMember("type_id", field, null); - field = orb.create_sequence_tc(0, TaggedProfileHelper.type()); - members [ 1 ] = new StructMember("profiles", field, null); - typeCode = orb.create_struct_tc(id(), "IOR", members); - } - return typeCode; + field = orb.create_sequence_tc(0, TaggedProfileHelper.type()); + members[1] = new StructMember("profiles", field, null); + return orb.create_struct_tc(id(), "IOR", members); } /** - * Insert the IOR into the given Any. - * This method uses the IORHolder. - * - * @param any the Any to insert into. - * @param that the IOR to insert. - */ + * Insert the IOR into the given Any. This method uses the IORHolder. + * + * @param any the Any to insert into. + * @param that the IOR to insert. + */ public static void insert(Any any, IOR that) { any.insert_Streamable(new IORHolder(that)); diff --git a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java index 6f5156fe223..1c04ec54f9c 100644 --- a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java +++ b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.ORB; import org.omg.CORBA.Any; @@ -57,24 +58,15 @@ import org.omg.CORBA.portable.InputStream; */ public abstract class MultipleComponentProfileHelper { - /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - typeCode = orb.create_sequence_tc(0, TaggedComponentHelper.type()); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + return orb.create_sequence_tc(0, TaggedComponentHelper.type()); } /** - * Insert the MultipleComponentProfile into the given Any. - * This method uses the MultipleComponentProfileHolder. - * + * Insert the MultipleComponentProfile into the given Any. This method uses + * the MultipleComponentProfileHolder. + * * @param any the Any to insert into. * @param those the TaggedComponent[] to insert. */ diff --git a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java index 2e3c8f08dbf..340fa27d550 100644 --- a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -65,15 +67,14 @@ public abstract class ProfileIdHelper */ public static TypeCode type() { - ORB orb = ORB.init(); + ORB orb = OrbRestricted.Singleton; return orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0", "ProfileId", - orb.get_primitive_tc(TCKind.tk_ulong) - ); + orb.get_primitive_tc(TCKind.tk_ulong)); } /** - * Insert the int into the given Any. - */ + * Insert the int into the given Any. + */ public static void insert(Any any, int that) { any.insert_ulong(that); diff --git a/libjava/classpath/org/omg/IOP/ServiceContextHelper.java b/libjava/classpath/org/omg/IOP/ServiceContextHelper.java index 5693a32357a..d6549fa5405 100644 --- a/libjava/classpath/org/omg/IOP/ServiceContextHelper.java +++ b/libjava/classpath/org/omg/IOP/ServiceContextHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -57,46 +58,33 @@ import org.omg.CORBA.portable.OutputStream; public abstract class ServiceContextHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** - * Create the ServiceContext typecode (structure, - * named "ServiceContext"). - * The typecode states that the structure contains the - * following fields: context_id, context_data. + * Create the ServiceContext typecode (structure, named "ServiceContext"). The + * typecode states that the structure contains the following fields: + * context_id, context_data. */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 2 ]; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[2]; - TypeCode field; + TypeCode field; - field = - orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId", - orb.get_primitive_tc(TCKind.tk_ulong) - ); - members [ 0 ] = new StructMember("context_id", field, null); + field = orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId", + orb.get_primitive_tc(TCKind.tk_ulong)); + members[0] = new StructMember("context_id", field, null); - field = - orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); - members [ 1 ] = new StructMember("context_data", field, null); - typeCode = orb.create_struct_tc(id(), "ServiceContext", members); - } - return typeCode; + field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); + members[1] = new StructMember("context_data", field, null); + return orb.create_struct_tc(id(), "ServiceContext", members); } /** - * Insert the ServiceContext into the given Any. - * This method uses the ServiceContextHolder. - * - * @param any the Any to insert into. - * @param that the ServiceContext to insert. - */ + * Insert the ServiceContext into the given Any. This method uses the + * ServiceContextHolder. + * + * @param any the Any to insert into. + * @param that the ServiceContext to insert. + */ public static void insert(Any any, ServiceContext that) { any.insert_Streamable(new ServiceContextHolder(that)); diff --git a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java index fa436cbb885..7875db29e1d 100644 --- a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java +++ b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -56,18 +57,12 @@ import org.omg.CORBA.portable.OutputStream; public abstract class ServiceContextListHelper { /** - * The cached {@link ServiceContext[]} typecode, computed once. - */ - private static TypeCode typeCode; - - /** * Get the type code of the {@link ServiceContext[]}. */ public static TypeCode type() { - if (typeCode == null) - typeCode = ORB.init().create_interface_tc(id(), "ServiceContextList"); - return typeCode; + return OrbRestricted.Singleton.create_interface_tc(id(), + "ServiceContextList"); } /** diff --git a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java index fac0746a82a..084dbd06d97 100644 --- a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.IOP; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -65,7 +67,7 @@ public abstract class ServiceIdHelper */ public static TypeCode type() { - ORB orb = ORB.init(); + ORB orb = OrbRestricted.Singleton; return orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId", orb.get_primitive_tc(TCKind.tk_ulong) ); diff --git a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java index eaee120f081..633891b9b57 100644 --- a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java +++ b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -60,34 +61,25 @@ import java.io.IOException; public abstract class TaggedComponentHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the TaggedComponent typecode (structure, named "TaggedComponent"). * The typecode states that the structure contains the following fields: tag, * component_data. */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[2]; - - TypeCode field; - - field = orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0", - "ComponentId", - orb.get_primitive_tc(TCKind.tk_ulong)); - members[0] = new StructMember("tag", field, null); - - field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); - members[1] = new StructMember("component_data", field, null); - typeCode = orb.create_struct_tc(id(), "TaggedComponent", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[2]; + + TypeCode field; + + field = orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0", + "ComponentId", + orb.get_primitive_tc(TCKind.tk_ulong)); + members[0] = new StructMember("tag", field, null); + + field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); + members[1] = new StructMember("component_data", field, null); + return orb.create_struct_tc(id(), "TaggedComponent", members); } /** diff --git a/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java b/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java index 2943657c01f..9dbbfdaff1d 100644 --- a/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java +++ b/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.IOP; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import gnu.CORBA.CDR.BufferredCdrInput; import gnu.CORBA.CDR.BufferedCdrOutput; @@ -62,40 +63,30 @@ import java.io.IOException; public abstract class TaggedProfileHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the TaggedProfile typecode (structure, named "TaggedProfile"). The * typecode states that the structure contains the following fields: tag, * profile_data. */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[2]; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[2]; - TypeCode field; + TypeCode field; - field = orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0", - "ProfileId", - orb.get_primitive_tc(TCKind.tk_ulong)); - members[0] = new StructMember("tag", field, null); + field = orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0", "ProfileId", + orb.get_primitive_tc(TCKind.tk_ulong)); + members[0] = new StructMember("tag", field, null); - field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); - members[1] = new StructMember("profile_data", field, null); - typeCode = orb.create_struct_tc(id(), "TaggedProfile", members); - } - return typeCode; + field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet)); + members[1] = new StructMember("profile_data", field, null); + return orb.create_struct_tc(id(), "TaggedProfile", members); } /** * Insert the TaggedProfile into the given Any. This method uses the * TaggedProfileHolder. - * + * * @param any the Any to insert into. * @param that the TaggedProfile to insert. */ |