summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/org/omg/PortableInterceptor
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-05-18 17:29:21 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-05-18 17:29:21 +0000
commit64089cc9f030d8ef7972adb5d117e0b23f47d62b (patch)
tree9f9c470de62ee62fba1331a396450d728d2b1fad /libjava/classpath/org/omg/PortableInterceptor
parent96034e28360d660d7a7708807fcbc4b519574d8e (diff)
downloadppe42-gcc-64089cc9f030d8ef7972adb5d117e0b23f47d62b.tar.gz
ppe42-gcc-64089cc9f030d8ef7972adb5d117e0b23f47d62b.zip
Imported GNU Classpath 0.90
* scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/org/omg/PortableInterceptor')
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java4
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java6
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java4
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java4
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java4
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java10
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java26
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java6
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java69
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java6
-rw-r--r--libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java6
11 files changed, 47 insertions, 98 deletions
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
index 7e7d7a3f4b3..7202f23440a 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
@@ -1,5 +1,5 @@
/* ForwardRequest.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ import java.io.Serializable;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class ForwardRequest extends UserException implements IDLEntity,
+public final class ForwardRequest extends UserException implements IDLEntity,
Serializable
{
/**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
index dc7ecf23faa..f4830a2e1c6 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
@@ -1,5 +1,5 @@
/* IORInterceptor_3_0Holder.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.Streamable;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class IORInterceptor_3_0Holder
+public final class IORInterceptor_3_0Holder
implements Streamable
{
/**
@@ -77,7 +77,7 @@ public class IORInterceptor_3_0Holder
}
/**
- * Fill in the {@link value} by data from the CDR stream.
+ * Fill in the {@link #value} by data from the CDR stream.
*
* @param input the org.omg.CORBA.portable stream to read.
*/
diff --git a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
index 72805cf72cf..30cb1a1dc49 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
@@ -1,5 +1,5 @@
/* InvalidSlot.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,7 +49,7 @@ import java.io.Serializable;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class InvalidSlot extends UserException implements IDLEntity,
+public final class InvalidSlot extends UserException implements IDLEntity,
Serializable
{
/**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
index 187273725e9..610cec1d020 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
@@ -1,5 +1,5 @@
/* DuplicateName.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -54,7 +54,7 @@ import java.io.Serializable;
*
* @author Audrius Meskauskas, Lithiania (AudriusA@Bioinformatics.org)
*/
-public class DuplicateName extends UserException implements IDLEntity,
+public final class DuplicateName extends UserException implements IDLEntity,
Serializable
{
/**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
index 17c6c6bc27e..ff940dafc7e 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
@@ -1,5 +1,5 @@
/* InvalidName.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import java.io.Serializable;
*
* @author Audrius Meskauskas, Lithiania (AudriusA@Bioinformatics.org)
*/
-public class InvalidName extends UserException implements IDLEntity,
+public final class InvalidName extends UserException implements IDLEntity,
Serializable
{
/**
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
index c22d14a11fd..5d9812d9f2b 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
@@ -1,5 +1,5 @@
/* ObjectIdHelper.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class ObjectIdHelper
+public abstract class ObjectIdHelper
{
/**
- * Insert the Object Id into Any (uses {@link Any.insert_string}).
+ * Insert the Object Id into Any (uses {@link Any#insert_string(String)}).
*
* @param a the Any to insert into.
* @param that the string to insert.
@@ -67,7 +67,7 @@ public class ObjectIdHelper
}
/**
- * Extract the Object Id from Any ((uses {@link Any.extract_string}).
+ * Extract the Object Id from Any (uses {@link Any#extract_string()}).
*
* @param a the Any to extract from.
*/
@@ -105,7 +105,7 @@ public class ObjectIdHelper
}
/**
- * Calls {@link OutputStream#write_string()}.
+ * Calls {@link OutputStream#write_string(String)}.
*
* @param output the stream to write into.
* @param value the string (Object Id) value to write.
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
index 55cde585c5e..83f3da652c0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
@@ -1,5 +1,5 @@
/* ObjectReferenceFactory.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,20 +38,38 @@ exception statement from your version. */
package org.omg.PortableInterceptor;
+import org.omg.CORBA.Object;
import org.omg.CORBA.portable.IDLEntity;
+import org.omg.CORBA.portable.ValueBase;
/**
* Provides the possibility to create the CORBA object reference.
* The reference is created from repository id (defining the type of the
* object) and the object id (defining the identity of the object).
- * The operation for creating reference is defined separately in
- * {@link ObjectReferenceFactoryOperations}.
*
* @since 1.5
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
public interface ObjectReferenceFactory
- extends ObjectReferenceFactoryOperations, IDLEntity
+ extends ValueBase, IDLEntity
{
+ /**
+ * Create an object with the given repository and object ids. This interface
+ * does not specify where and how the returned object must be connected and
+ * activated. The derived {@link ObjectReferenceTemplate} interface assumes
+ * the object must be connected to the POA that is specific to that
+ * template (name can be obtained).
+ *
+ * If the object with this objectId already exists in the given context, it
+ * is found and returned; a new object is <i>not</i> created.
+ *
+ * @param repositoryId the repository id of the object being created, defines
+ * the type of the object.
+ *
+ * @param objectId the byte array, defining the identity of the object.
+ *
+ * @return The created corba object.
+ */
+ Object make_object(String repositoryId, byte[] objectId);
} \ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
index fc68ec5c148..c662977a2de 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
@@ -1,5 +1,5 @@
/* ObjectReferenceFactoryHolder.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.Streamable;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class ObjectReferenceFactoryHolder
+public final class ObjectReferenceFactoryHolder
implements Streamable
{
/**
@@ -76,7 +76,7 @@ public class ObjectReferenceFactoryHolder
}
/**
- * Fill in the {@link value} by data from the CDR stream.
+ * Fill in the {@link #value} by data from the CDR stream.
*
* @param input the org.omg.CORBA.portable stream to read.
*/
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java
deleted file mode 100644
index b5d912d12be..00000000000
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryOperations.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ObjectReferenceFactoryOperations.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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.PortableInterceptor;
-
-import org.omg.CORBA.portable.ValueBase;
-
-/**
- * Defines the operations, applicable to the ObjectReferenceFactory.
- *
- * @since 1.5
- *
- * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
- */
-public interface ObjectReferenceFactoryOperations
- extends ValueBase
-{
- /**
- * Create an object with the given repository and object ids. This interface
- * does not specify where and how the returned object must be connected and
- * activated. The derived {@link ObjectReferenceTemplate} interface assumes
- * the the object must be connected to the POA that is specific to that
- * template (name can be obtained).
- *
- * If the object with this objectId already exists in the given context, it is
- * found and returned; the new object is <i>not</i> created.
- *
- * @param repositoryId the repository id of the object being created, defines
- * the type of the object.
- *
- * @param objectId the byte array, defining the identity of the object.
- */
- org.omg.CORBA.Object make_object(String repositoryId, byte[] objectId);
-} \ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
index 9658e1fa718..d76ef43f1e0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
@@ -1,5 +1,5 @@
/* ObjectReferenceTemplateHolder.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ import org.omg.CORBA.portable.OutputStream;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class ObjectReferenceTemplateHolder
+public final class ObjectReferenceTemplateHolder
implements Streamable
{
/**
@@ -74,7 +74,7 @@ public class ObjectReferenceTemplateHolder
}
/**
- * Fill in the {@link value} by data from the CDR stream.
+ * Fill in the {@link #value} by data from the CDR stream.
*
* @param input the org.omg.CORBA.portable stream to read.
*/
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
index d16f5cedd9f..3fdc2bfe8c0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
@@ -1,5 +1,5 @@
/* ObjectReferenceTemplateSeqHolder.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ import org.omg.CORBA.portable.OutputStream;
*
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class ObjectReferenceTemplateSeqHolder
+public final class ObjectReferenceTemplateSeqHolder
implements Streamable
{
/**
@@ -75,7 +75,7 @@ public class ObjectReferenceTemplateSeqHolder
}
/**
- * Fill in the {@link value} by data from the CDR stream.
+ * Fill in the {@link #value} by data from the CDR stream.
*
* @param input the org.omg.CORBA.portable stream to read.
*/
OpenPOWER on IntegriCloud