diff options
Diffstat (limited to 'org/omg/DynamicAny')
18 files changed, 93 insertions, 150 deletions
diff --git a/org/omg/DynamicAny/AnySeqHelper.java b/org/omg/DynamicAny/AnySeqHelper.java index 60e4e6ea7..ddf1422ff 100644 --- a/org/omg/DynamicAny/AnySeqHelper.java +++ b/org/omg/DynamicAny/AnySeqHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.ORB; import org.omg.CORBA.TCKind; @@ -54,11 +56,6 @@ import org.omg.CORBA.portable.OutputStream; public abstract class AnySeqHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Delegates call to {@link org.omg.CORBA.AnySeqHelper#extract}. */ public static Any[] extract(Any any) @@ -102,14 +99,10 @@ public abstract class AnySeqHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - TypeCode t = - orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_any)); - typeCode = orb.create_alias_tc(id(), "AnySeq", t); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + TypeCode t = + orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_any)); + return orb.create_alias_tc(id(), "AnySeq", t); } /** diff --git a/org/omg/DynamicAny/DynAnyFactoryHelper.java b/org/omg/DynamicAny/DynAnyFactoryHelper.java index b8e3aafef..97b54873f 100644 --- a/org/omg/DynamicAny/DynAnyFactoryHelper.java +++ b/org/omg/DynamicAny/DynAnyFactoryHelper.java @@ -40,6 +40,7 @@ exception statement from your version. */ package org.omg.DynamicAny; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; @@ -107,7 +108,7 @@ public abstract class DynAnyFactoryHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynAnyFactory"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynAnyFactory"); } /** diff --git a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java index a9f45c4b7..96dbb5fb6 100644 --- a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java +++ b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyFactoryPackage; 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 InconsistentTypeCodeHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** - * Create the InconsistentTypeCode typecode (structure, - * named "InconsistentTypeCode"). + * Create the InconsistentTypeCode typecode (structure, named + * "InconsistentTypeCode"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 0 ]; - typeCode = - orb.create_exception_tc(id(), "InconsistentTypeCode", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[0]; + return orb.create_exception_tc(id(), "InconsistentTypeCode", members); } /** * Insert the InconsistentTypeCode into the given Any. - * + * * @param any the Any to insert into. * @param that the InconsistentTypeCode to insert. */ diff --git a/org/omg/DynamicAny/DynAnyHelper.java b/org/omg/DynamicAny/DynAnyHelper.java index 73e2d9856..a238bf48b 100644 --- a/org/omg/DynamicAny/DynAnyHelper.java +++ b/org/omg/DynamicAny/DynAnyHelper.java @@ -39,6 +39,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -104,7 +106,7 @@ public abstract class DynAnyHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynAny"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynAny"); } /** diff --git a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java index 1b5004f07..0258d3589 100644 --- a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java +++ b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyPackage; 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,13 @@ import org.omg.CORBA.portable.OutputStream; public abstract class InvalidValueHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** - * Create the InvalidValue typecode (structure, - * named "InvalidValue"). + * Create the InvalidValue typecode (structure, named "InvalidValue"). */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - StructMember[] members = new StructMember[ 0 ]; - typeCode = orb.create_exception_tc(id(), "InvalidValue", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[0]; + return orb.create_exception_tc(id(), "InvalidValue", members); } /* Every user exception with no user defined diff --git a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java index b09ab4db8..244a98aa0 100644 --- a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java +++ b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyPackage; 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,13 @@ 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"). + * 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); } /* Every user exception with no user defined diff --git a/org/omg/DynamicAny/DynAnySeqHelper.java b/org/omg/DynamicAny/DynAnySeqHelper.java index ec3f0c481..66208ea19 100644 --- a/org/omg/DynamicAny/DynAnySeqHelper.java +++ b/org/omg/DynamicAny/DynAnySeqHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny; import gnu.CORBA.DynAnySeqHolder; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -63,20 +64,11 @@ import org.omg.CORBA.portable.OutputStream; */ public abstract class DynAnySeqHelper { - /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - TypeCode t = orb.create_sequence_tc(0, DynAnyHelper.type()); - typeCode = orb.create_alias_tc(id(), "DynAnySeq", t); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + TypeCode t = orb.create_sequence_tc(0, DynAnyHelper.type()); + return orb.create_alias_tc(id(), "DynAnySeq", t); } /** diff --git a/org/omg/DynamicAny/DynArrayHelper.java b/org/omg/DynamicAny/DynArrayHelper.java index f2892c856..26824d747 100644 --- a/org/omg/DynamicAny/DynArrayHelper.java +++ b/org/omg/DynamicAny/DynArrayHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -103,7 +105,7 @@ public abstract class DynArrayHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynArray"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynArray"); } /** diff --git a/org/omg/DynamicAny/DynEnumHelper.java b/org/omg/DynamicAny/DynEnumHelper.java index 8db1a2006..9af2e1194 100644 --- a/org/omg/DynamicAny/DynEnumHelper.java +++ b/org/omg/DynamicAny/DynEnumHelper.java @@ -39,6 +39,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -104,7 +106,7 @@ public abstract class DynEnumHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynEnum"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynEnum"); } /** diff --git a/org/omg/DynamicAny/DynFixedHelper.java b/org/omg/DynamicAny/DynFixedHelper.java index 84bb59d9f..4471bb26b 100644 --- a/org/omg/DynamicAny/DynFixedHelper.java +++ b/org/omg/DynamicAny/DynFixedHelper.java @@ -39,6 +39,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -104,7 +106,7 @@ public abstract class DynFixedHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynFixed"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynFixed"); } /** diff --git a/org/omg/DynamicAny/DynSequenceHelper.java b/org/omg/DynamicAny/DynSequenceHelper.java index ad3013371..0aa7cdd2a 100644 --- a/org/omg/DynamicAny/DynSequenceHelper.java +++ b/org/omg/DynamicAny/DynSequenceHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -103,7 +105,7 @@ public abstract class DynSequenceHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynSequence"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynSequence"); } /** diff --git a/org/omg/DynamicAny/DynStructHelper.java b/org/omg/DynamicAny/DynStructHelper.java index 021c5d031..c683260f6 100644 --- a/org/omg/DynamicAny/DynStructHelper.java +++ b/org/omg/DynamicAny/DynStructHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -103,7 +105,7 @@ public abstract class DynStructHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynStruct"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynStruct"); } /** diff --git a/org/omg/DynamicAny/DynUnionHelper.java b/org/omg/DynamicAny/DynUnionHelper.java index 8f924c086..e868ea412 100644 --- a/org/omg/DynamicAny/DynUnionHelper.java +++ b/org/omg/DynamicAny/DynUnionHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -103,7 +105,7 @@ public abstract class DynUnionHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynUnion"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynUnion"); } /** diff --git a/org/omg/DynamicAny/DynValueHelper.java b/org/omg/DynamicAny/DynValueHelper.java index 026ca4990..ad75bc31f 100644 --- a/org/omg/DynamicAny/DynValueHelper.java +++ b/org/omg/DynamicAny/DynValueHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -103,7 +105,7 @@ public abstract class DynValueHelper */ public static TypeCode type() { - return ORB.init().create_interface_tc(id(), "DynValue"); + return OrbRestricted.Singleton.create_interface_tc(id(), "DynValue"); } /** diff --git a/org/omg/DynamicAny/NameDynAnyPairHelper.java b/org/omg/DynamicAny/NameDynAnyPairHelper.java index a0e5c6b85..a9d9edba7 100644 --- a/org/omg/DynamicAny/NameDynAnyPairHelper.java +++ b/org/omg/DynamicAny/NameDynAnyPairHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny; import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairHolder; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -64,11 +65,6 @@ import org.omg.CORBA.portable.OutputStream; public abstract class NameDynAnyPairHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Extract the NameDynAnyPair from given Any. * This method uses the NameDynAnyPairHolder. * @@ -107,25 +103,21 @@ public abstract class NameDynAnyPairHelper */ 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/DynamicAny/FieldName:1.0", - "FieldName", - orb.get_primitive_tc(TCKind.tk_string) - ); - members [ 0 ] = new StructMember("id", field, null); - - field = DynAnyHelper.type(); - members [ 1 ] = new StructMember("value", field, null); - typeCode = orb.create_struct_tc(id(), "NameDynAnyPair", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[ 2 ]; + + TypeCode field; + + field = + orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0", + "FieldName", + orb.get_primitive_tc(TCKind.tk_string) + ); + members [ 0 ] = new StructMember("id", field, null); + + field = DynAnyHelper.type(); + members [ 1 ] = new StructMember("value", field, null); + return orb.create_struct_tc(id(), "NameDynAnyPair", members); } /** diff --git a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java index ec4f72822..56e6104ec 100644 --- a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java +++ b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny; import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairSeqHolder; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -62,20 +63,11 @@ import org.omg.CORBA.portable.OutputStream; */ public abstract class NameDynAnyPairSeqHelper { - /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - TypeCode t = orb.create_sequence_tc(0, NameDynAnyPairHelper.type()); - typeCode = orb.create_alias_tc(id(), "NameDynAnyPairSeq", t); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + TypeCode t = orb.create_sequence_tc(0, NameDynAnyPairHelper.type()); + return orb.create_alias_tc(id(), "NameDynAnyPairSeq", t); } /** diff --git a/org/omg/DynamicAny/NameValuePairHelper.java b/org/omg/DynamicAny/NameValuePairHelper.java index 1e0f52b59..75bbf9a74 100644 --- a/org/omg/DynamicAny/NameValuePairHelper.java +++ b/org/omg/DynamicAny/NameValuePairHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny; import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairHolder; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -58,11 +59,6 @@ import org.omg.CORBA.portable.OutputStream; public abstract class NameValuePairHelper { /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - - /** * Create the NameValuePair typecode (structure, * named "NameValuePair"). * The typecode states that the structure contains the @@ -70,25 +66,21 @@ public abstract class NameValuePairHelper */ 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/DynamicAny/FieldName:1.0", - "FieldName", - orb.get_primitive_tc(TCKind.tk_string) - ); - members [ 0 ] = new StructMember("id", field, null); - - field = orb.get_primitive_tc(TCKind.tk_any); - members [ 1 ] = new StructMember("value", field, null); - typeCode = orb.create_struct_tc(id(), "NameValuePair", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + StructMember[] members = new StructMember[ 2 ]; + + TypeCode field; + + field = + orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0", + "FieldName", + orb.get_primitive_tc(TCKind.tk_string) + ); + members [ 0 ] = new StructMember("id", field, null); + + field = orb.get_primitive_tc(TCKind.tk_any); + members [ 1 ] = new StructMember("value", field, null); + return orb.create_struct_tc(id(), "NameValuePair", members); } /** diff --git a/org/omg/DynamicAny/NameValuePairSeqHelper.java b/org/omg/DynamicAny/NameValuePairSeqHelper.java index 62481534e..018ee7d2d 100644 --- a/org/omg/DynamicAny/NameValuePairSeqHelper.java +++ b/org/omg/DynamicAny/NameValuePairSeqHelper.java @@ -40,6 +40,7 @@ package org.omg.DynamicAny; import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairSeqHolder; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -55,20 +56,11 @@ import org.omg.CORBA.portable.OutputStream; */ public abstract class NameValuePairSeqHelper { - /** - * The cached typecode value, computed only once. - */ - private static TypeCode typeCode; - public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - TypeCode t = orb.create_sequence_tc(0, NameValuePairHelper.type()); - typeCode = orb.create_alias_tc(id(), "NameValuePairSeq", t); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + TypeCode t = orb.create_sequence_tc(0, NameValuePairHelper.type()); + return orb.create_alias_tc(id(), "NameValuePairSeq", t); } /** |