Index: org/omg/CORBA/ParameterMode.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ParameterMode.java,v retrieving revision 1.1 diff -u -r1.1 ParameterMode.java --- org/omg/CORBA/ParameterMode.java 4 Jun 2005 18:05:41 -0000 1.1 +++ org/omg/CORBA/ParameterMode.java 5 Jun 2005 17:23:54 -0000 @@ -34,46 +34,12 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -/* ParameterMode.java -- - Copyright (C) 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - package org.omg.CORBA; +import org.omg.CORBA.portable.IDLEntity; + +import java.io.Serializable; /** * Defines the parameter modes (the ways in that a method parameter @@ -87,21 +53,27 @@ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class ParameterMode + implements Serializable, IDLEntity { /** + * Use serialVersionUID (v1.4) for interoperability. + */ + private static final long serialVersionUID = 1521598391932998229L; + + /** * This value means that the parameter is an IN parameter. */ - public static int _PARAM_IN = 0; + public static final int _PARAM_IN = 0; /** * This value means that the parameter is an OUT parameter. */ - public static int _PARAM_OUT = 1; + public static final int _PARAM_OUT = 1; /** * This value means that the parameter is an INOUT parameter. */ - public static int _PARAM_INOUT = 2; + public static final int _PARAM_INOUT = 2; /** * This value means that the parameter is an IN parameter. Index: org/omg/CORBA/portable/BoxedValueHelper.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/portable/BoxedValueHelper.java,v retrieving revision 1.1 diff -u -r1.1 BoxedValueHelper.java --- org/omg/CORBA/portable/BoxedValueHelper.java 3 Jun 2005 17:20:58 -0000 1.1 +++ org/omg/CORBA/portable/BoxedValueHelper.java 5 Jun 2005 17:22:50 -0000 @@ -47,8 +47,8 @@ * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ -public interface BoxedValueHelper { - +public interface BoxedValueHelper +{ /** * Get the repository id of this value type. * @@ -72,5 +72,4 @@ * @param value a value to write. */ void write_value(OutputStream ostream, Serializable value); - } \ No newline at end of file Index: org/omg/CORBA/portable/ValueFactory.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/portable/ValueFactory.java,v retrieving revision 1.1 diff -u -r1.1 ValueFactory.java --- org/omg/CORBA/portable/ValueFactory.java 1 Jun 2005 07:28:38 -0000 1.1 +++ org/omg/CORBA/portable/ValueFactory.java 5 Jun 2005 17:15:40 -0000 @@ -58,5 +58,5 @@ * @return a created value type, intialised with the data from * the stream. */ - Serializable read_value(InputStream from_stream); + Serializable read_value(org.omg.CORBA_2_3.portable.InputStream from_stream); } \ No newline at end of file Index: org/omg/CORBA_2_3/portable/InputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CORBA_2_3/portable/InputStream.java,v retrieving revision 1.2 diff -u -r1.2 InputStream.java --- org/omg/CORBA_2_3/portable/InputStream.java 3 Jun 2005 12:35:12 -0000 1.2 +++ org/omg/CORBA_2_3/portable/InputStream.java 5 Jun 2005 17:17:02 -0000 @@ -40,6 +40,7 @@ import org.omg.CORBA.MARSHAL; import org.omg.CORBA.ValueBaseHelper; +import org.omg.CORBA.portable.BoxedValueHelper; import java.io.Serializable; @@ -186,4 +187,9 @@ return ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id) .read_value(this); } + + public Serializable read_value(BoxedValueHelper helper) + { + return helper.read_value(this); + } } \ No newline at end of file Index: org/omg/CORBA_2_3/portable/OutputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CORBA_2_3/portable/OutputStream.java,v retrieving revision 1.1 diff -u -r1.1 OutputStream.java --- org/omg/CORBA_2_3/portable/OutputStream.java 3 Jun 2005 17:20:58 -0000 1.1 +++ org/omg/CORBA_2_3/portable/OutputStream.java 5 Jun 2005 17:20:40 -0000 @@ -73,20 +73,23 @@ * the boolean discriminator (false for objects, true for value types). * * The object from value is separated by fact that all values implement - * the {@link ValueBase} interface. + * the {@link ValueBase} interface. Also, the passed parameter is treated + * as value it it does not implement CORBA Object. * * @param an_interface an abstract interface to write. */ - public void write_abstract_interface(org.omg.CORBA.Object an_interface) + public void write_abstract_interface(java.lang.Object an_interface) { - boolean isValue = an_interface instanceof ValueBase; + boolean isValue = + an_interface instanceof ValueBase || + (!(an_interface instanceof org.omg.CORBA.Object)); write_boolean(isValue); if (isValue) write_value((ValueBase) an_interface); else - write_Object(an_interface); + write_Object((org.omg.CORBA.Object) an_interface); } /** Index: org/omg/CosNaming/_BindingIteratorStub.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/_BindingIteratorStub.java,v retrieving revision 1.2 diff -u -r1.2 _BindingIteratorStub.java --- org/omg/CosNaming/_BindingIteratorStub.java 1 Jun 2005 13:26:43 -0000 1.2 +++ org/omg/CosNaming/_BindingIteratorStub.java 5 Jun 2005 17:25:52 -0000 @@ -59,7 +59,7 @@ /** * Use serialVersionUID (v1.4) for interoperability. */ - private static final long serialVersionUID = 359397876031922059L; + private static final long serialVersionUID = 8969257760771186704L; /** * The object can be destroyed only once. Index: org/omg/CosNaming/_NamingContextStub.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/CosNaming/_NamingContextStub.java,v retrieving revision 1.2 diff -u -r1.2 _NamingContextStub.java --- org/omg/CosNaming/_NamingContextStub.java 1 Jun 2005 13:26:43 -0000 1.2 +++ org/omg/CosNaming/_NamingContextStub.java 5 Jun 2005 17:30:08 -0000 @@ -72,7 +72,7 @@ /** * Use serialVersionUID (v1.4) for interoperability. */ - private static final long serialVersionUID = -389233044945385889L; + private static final long serialVersionUID = 6835430958405349379L; /** * Create the naming context stub. Index: org/omg/Messaging/SyncScopeHelper.java =================================================================== RCS file: /cvsroot/classpath/classpath/org/omg/Messaging/SyncScopeHelper.java,v retrieving revision 1.1 diff -u -r1.1 SyncScopeHelper.java --- org/omg/Messaging/SyncScopeHelper.java 4 Jun 2005 08:03:43 -0000 1.1 +++ org/omg/Messaging/SyncScopeHelper.java 5 Jun 2005 17:11:12 -0000 @@ -65,7 +65,7 @@ /** * Delegates call to {@link Any.extract_short()}. */ - static short extract(Any a) + public static short extract(Any a) { return a.extract_short(); } @@ -75,7 +75,7 @@ * * @return "IDL:omg.org/Messaging/SyncScope:1.0", always. */ - static String id() + public static String id() { return "IDL:omg.org/Messaging/SyncScope:1.0"; } @@ -83,7 +83,7 @@ /** * Delegates call to {@link Any.insert_short(short)}. */ - static void insert(Any a, short that) + public static void insert(Any a, short that) { a.insert_short(that); } @@ -91,7 +91,7 @@ /** * Delegates call to {@link InputStream.read_short()}. */ - static short read(InputStream istream) + public static short read(InputStream istream) { return istream.read_short(); } @@ -102,7 +102,7 @@ * * @return a typecode of synchronization scope. */ - static TypeCode type() + public static TypeCode type() { recordTypeCode r = new recordTypeCode(TCKind.tk_alias); r.setName("SyncScope");