diff options
Diffstat (limited to 'libjava/classpath/org/omg/DynamicAny')
19 files changed, 202 insertions, 12 deletions
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java index 0c02916e542..b8e3aafef5b 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java @@ -39,6 +39,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; import org.omg.CORBA.ORB; @@ -80,6 +82,25 @@ public abstract class DynAnyFactoryHelper + " is not a DynAnyFactory"); } } + + /** + * Narrow the given object to the DynAnyFactory. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynAnyFactory. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynAnyFactory unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the final_type code of the {@link DynAnyFactory}. @@ -161,13 +182,8 @@ public abstract class DynAnyFactoryHelper */ static String not_applicable(String Id) { - try - { - throw new MARSHAL("The read/write are not applicable for " + Id); - } - catch (Exception e) - { - throw new MARSHAL(); - } + MARSHAL m = new MARSHAL("The read/write are not applicable for " + Id); + m.minor = Minor.Inappropriate; + throw m; } }
\ No newline at end of file diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java index c7b54bef89d..a9f45c4b73c 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyFactoryPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class InconsistentTypeCodeHelper { BAD_OPERATION bad = new BAD_OPERATION("InconsistentTypeCode expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java index ca48cd4c5aa..73e2d9856a1 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java @@ -79,6 +79,25 @@ public abstract class DynAnyHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynAny"); } } + + /** + * Narrow the given object to the DynAny. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynAny. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynAny unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynAny}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java index 55e35eedc81..1b5004f072b 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class InvalidValueHelper { BAD_OPERATION bad = new BAD_OPERATION("InvalidValue expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java index e15fb72c668..b09ab4db863 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny.DynAnyPackage; import gnu.CORBA.EmptyExceptionHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -107,6 +108,7 @@ public abstract class TypeMismatchHelper { BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java index 87e34452319..ec3f0c4815f 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.DynamicAny; import gnu.CORBA.DynAnySeqHolder; +import gnu.CORBA.Minor; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -106,6 +107,7 @@ public abstract class DynAnySeqHelper { BAD_OPERATION bad = new BAD_OPERATION("DynAnySeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java index 0372b58518c..f2892c85692 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java @@ -78,6 +78,25 @@ public abstract class DynArrayHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynArray"); } } + + /** + * Narrow the given object to the DynArray. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynArray. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynArray unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynArray}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java index 944d4375739..8db1a20065e 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java @@ -79,6 +79,25 @@ public abstract class DynEnumHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynEnum"); } } + + /** + * Narrow the given object to the DynEnum. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynEnum. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynEnum unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynEnum}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java index 1d818d7b178..84bb59d9f3c 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java @@ -79,6 +79,25 @@ public abstract class DynFixedHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynFixed"); } } + + /** + * Narrow the given object to the DynFixed. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynFixed. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynFixed unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynFixed}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java index c38a51f0951..ad30133712e 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java @@ -78,6 +78,25 @@ public abstract class DynSequenceHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynSequence"); } } + + /** + * Narrow the given object to the DynSequence. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynSequence. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynSequence unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynSequence}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java index e4790b443ff..021c5d031a5 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java @@ -78,6 +78,25 @@ public abstract class DynStructHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynStruct"); } } + + /** + * Narrow the given object to the DynStruct. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynStruct. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynStruct unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynStruct}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java index 794098333e9..8f924c0864e 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java @@ -78,6 +78,25 @@ public abstract class DynUnionHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynUnion"); } } + + /** + * Narrow the given object to the DynUnion. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynUnion. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynUnion unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynUnion}. diff --git a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java index a6d7afaa9e3..026ca499077 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java @@ -78,6 +78,25 @@ public abstract class DynValueHelper throw new BAD_PARAM(obj.getClass().getName() + " is not a DynValue"); } } + + /** + * Narrow the given object to the DynValue. For the objects that are + * always local, this operation does not differ from the ordinary + * {@link #narrow} (ClassCastException will be thrown if narrowing something + * different). + * + * @param obj the object to cast. + * + * @return the casted DynValue. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static DynValue unchecked_narrow(org.omg.CORBA.Object obj) + { + return narrow(obj); + } /** * Get the type code of the {@link DynValue}. diff --git a/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java index 7c4cdbf4919..f15b8adfa4f 100644 --- a/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java @@ -38,7 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; -import gnu.CORBA.Restricted_ORB; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.ORB; @@ -84,7 +84,7 @@ public abstract class FieldNameHelper */ public static TypeCode type() { - ORB orb = Restricted_ORB.Singleton; + ORB orb = OrbRestricted.Singleton; return orb.create_alias_tc(id(), "FieldName", orb.create_string_tc(0)); } diff --git a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java index d649800b8b6..a0e5c6b85f9 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairHolder; import org.omg.CORBA.Any; @@ -83,6 +84,7 @@ public abstract class NameDynAnyPairHelper { BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPair expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java index f110926b853..ec4f728228f 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameDynAnyPairSeqHolder; import org.omg.CORBA.Any; @@ -105,6 +106,7 @@ public abstract class NameDynAnyPairSeqHelper { BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPairSeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java index a3d5bff4526..1e0f52b5946 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairHolder; import org.omg.CORBA.Any; @@ -118,6 +119,7 @@ public abstract class NameValuePairHelper { BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java b/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java index 400708e18e0..62481534e1a 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java @@ -38,6 +38,7 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; import gnu.CORBA.NameValuePairSeqHolder; import org.omg.CORBA.Any; @@ -98,6 +99,7 @@ public abstract class NameValuePairSeqHelper { BAD_OPERATION bad = new BAD_OPERATION("NameValuePairSeq expected"); bad.initCause(cex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java index b0f6d6052a6..15f7c816b44 100644 --- a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java +++ b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.DynamicAny; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.MARSHAL; import org.omg.CORBA.TypeCode; @@ -101,7 +103,9 @@ public class _DynAnyFactoryStub public DynAny create_dyn_any(Any _0) throws InconsistentTypeCode { - throw new MARSHAL(NOT_APPLICABLE); + MARSHAL m = new MARSHAL(NOT_APPLICABLE); + m.minor = Minor.Inappropriate; + throw m; } /** @@ -113,7 +117,9 @@ public class _DynAnyFactoryStub public DynAny create_dyn_any_from_type_code(TypeCode _0) throws InconsistentTypeCode { - throw new MARSHAL(NOT_APPLICABLE); + MARSHAL m = new MARSHAL(NOT_APPLICABLE); + m.minor = Minor.Inappropriate; + throw m; } static String NOT_APPLICABLE = |
