Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt	Thu Mar 06 13:56:47 2008 -0800
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/corba/orb_config_design.txt	Tue Mar 25 14:42:28 2008 -0700
     1.3 @@ -318,7 +318,7 @@
     1.4  
     1.5  11. RequestHandler and ORB
     1.6  
     1.7 -    The RH interface is currently implemented in the ORB class, but migūt better be a separate
     1.8 +    The RH interface is currently implemented in the ORB class, but might better be a separate
     1.9      class.  The API is currently almost the same as a ServerSubcontract.  Should we regularize
    1.10      this?  Also, the API would need to be extended to handle shutdown properly.
    1.11  

     2.1 --- a/src/share/classes/org/omg/CORBA/ir.idl	Thu Mar 06 13:56:47 2008 -0800
     2.2 +++ b/src/share/classes/org/omg/CORBA/ir.idl	Tue Mar 25 14:42:28 2008 -0700
     2.3 @@ -774,18 +774,18 @@
     2.4      
     2.5      // orbos 98-01-18: Objects By Value -- end
     2.6  
     2.7 -    enum TCKind {
     2.8 -        tk_null, tk_void,
     2.9 +    enum TCKind {
    2.10 +        tk_null, tk_void,
    2.11          tk_short, tk_long, tk_ushort, tk_ulong,
    2.12 -        tk_float, tk_double, tk_boolean, tk_char,
    2.13 -        tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
    2.14 -        tk_struct, tk_union, tk_enum, tk_string,
    2.15 -        tk_sequence, tk_array, tk_alias, tk_except,
    2.16 -        tk_longlong, tk_ulonglong, tk_longdouble,
    2.17 -        tk_wchar, tk_wstring, tk_fixed,
    2.18 -        tk_value, tk_value_box,
    2.19 -        tk_native,
    2.20 -        tk_abstract_interface
    2.21 +        tk_float, tk_double, tk_boolean, tk_char,
    2.22 +        tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
    2.23 +        tk_struct, tk_union, tk_enum, tk_string,
    2.24 +        tk_sequence, tk_array, tk_alias, tk_except,
    2.25 +        tk_longlong, tk_ulonglong, tk_longdouble,
    2.26 +        tk_wchar, tk_wstring, tk_fixed,
    2.27 +        tk_value, tk_value_box,
    2.28 +        tk_native,
    2.29 +        tk_abstract_interface
    2.30      };
    2.31  
    2.32      interface NativeDef : TypedefDef {

     3.1 --- a/src/share/classes/org/omg/DynamicAny/DynamicAny.idl	Thu Mar 06 13:56:47 2008 -0800
     3.2 +++ b/src/share/classes/org/omg/DynamicAny/DynamicAny.idl	Tue Mar 25 14:42:28 2008 -0700
     3.3 @@ -1042,24 +1042,24 @@
     3.4      /**
     3.5      * DynValueCommon provides operations supported by both the DynValue and DynValueBox interfaces.
     3.6      */
     3.7 -    interface DynValueCommon : DynAny {
     3.8 +    interface DynValueCommon : DynAny {
     3.9          /**
    3.10          * Returns true if the DynValueCommon represents a null value type.
    3.11          */
    3.12 -        boolean is_null();
    3.13 +        boolean is_null();
    3.14  
    3.15          /**
    3.16          * Changes the representation of a DynValueCommon to a null value type.
    3.17          */
    3.18 -        void set_to_null();
    3.19 +        void set_to_null();
    3.20  
    3.21          /**
    3.22          * Replaces a null value type with a newly constructed value. Its components are initialized
    3.23          * to default values as in DynAnyFactory.create_dyn_any_from_type_code.
    3.24          * If the DynValueCommon represents a non-null value type, then this operation has no effect. 
    3.25          */
    3.26 -        void set_to_value();
    3.27 -    }; 
    3.28 +        void set_to_value();
    3.29 +    }; 
    3.30  
    3.31      /**
    3.32      * DynValue objects support the manipulation of IDL non-boxed value types.
    3.33 @@ -1164,14 +1164,14 @@
    3.34      * of the boxed type. A DynValueBox representing a null value type has no components
    3.35      * and a current position of -1.
    3.36      */
    3.37 -    interface DynValueBox : DynValueCommon {
    3.38 +    interface DynValueBox : DynValueCommon {
    3.39  
    3.40          /**
    3.41          * Returns the boxed value as an Any.
    3.42          *
    3.43          * @exception InvalidValue if this object represents a null value box type
    3.44          */
    3.45 -        any get_boxed_value()
    3.46 +        any get_boxed_value()
    3.47              raises(InvalidValue);
    3.48  
    3.49          /**
    3.50 @@ -1189,7 +1189,7 @@
    3.51          *
    3.52          * @exception InvalidValue if this object represents a null value box type
    3.53          */
    3.54 -        DynAny get_boxed_value_as_dyn_any()
    3.55 +        DynAny get_boxed_value_as_dyn_any()
    3.56              raises(InvalidValue);
    3.57  
    3.58          /**
    3.59 @@ -1199,7 +1199,7 @@
    3.60          * @exception TypeMismatch if this object represents a non-null value box type and the type
    3.61          *            of the parameter is not matching the current boxed value type.
    3.62          */
    3.63 -        void set_boxed_value_as_dyn_any(in DynAny boxed)
    3.64 +        void set_boxed_value_as_dyn_any(in DynAny boxed)
    3.65              raises(TypeMismatch);
    3.66      };
    3.67