Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

15 files changed, 47 insertions, 47 deletions

diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
index 73efa122f2e..e4d70211a13 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* ClientRequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.Policy;
@@ -285,8 +286,6 @@ public interface ClientRequestInfoOperations extends RequestInfoOperations
    * @param type the type of the policy being requested.
    *
    * @return should return the policy that applies to this operation.
-   *
-   * @throws NO_IMPLEMENT always.
    */
   Policy get_request_policy(int type) throws INV_POLICY;
 
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
index 4a60b77f5d1..efd98707bd6 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
@@ -1,5 +1,5 @@
 /* ClientRequestInterceptorOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.SystemException;
+
 
 /**
  * Defines operations, applicable to the client side request interceptor. The
diff --git a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
index e453f601021..88ab0e2708d 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
@@ -1,5 +1,5 @@
 /* CurrentHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,13 +42,12 @@ import gnu.CORBA.Minor;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
-import org.omg.PortableServer.ServantActivator;
 
 /**
  * The helper operations for the CORBA object {@link Current}.
@@ -123,15 +122,13 @@ public abstract class CurrentHelper
    * Narrow the given object to the Current. 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).
+   * different). See also OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted Current.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static Current unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java b/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
index 9495d79ecec..ec7235102c8 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
@@ -1,5 +1,5 @@
 /* IORInfo.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,7 @@ import java.io.Serializable;
  * Provides the server-side ORB service possibility to add components to the new
  * IOR being created. Also, provides access to policies, applicable to the
  * object, referenced by that IOR. The ORB passes an instance of IORInfo as a
- * parameter to {@link IORInterceptor#establish_components}.
+ * parameter to {@link IORInterceptorOperations#establish_components}.
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
index 926974f1ab8..71fb928f791 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
@@ -1,5 +1,5 @@
 /* IORInterceptor_3_0Helper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
index 8332845a662..6b73b115133 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
@@ -1,5 +1,5 @@
 /* ORBIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,7 +58,7 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ORBIdHelper
 {
   /**
-   * Insert the ORB Id into Any (uses {@link Any.insert_string}).
+   * Insert the ORB Id into Any (uses {@link Any#insert_string}).
    *
    * @param a the Any to insert into.
    * @param that the string to insert.
@@ -69,7 +69,7 @@ public abstract class ORBIdHelper
   }
 
   /**
-   * Extract the ORB Id from Any ((uses {@link Any.extract_string}).
+   * Extract the ORB Id from Any ((uses {@link Any#extract_string}).
    *
    * @param a the Any to extract from.
    */
@@ -107,7 +107,7 @@ public abstract class ORBIdHelper
   }
 
   /**
-   * Calls {@link OutputStream#write_string()}.
+   * Calls {@link OutputStream#write_string(String)}.
    *
    * @param output the stream to write into.
    * @param value the string (ORB Id) value to write.
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
index 7b545ff8168..16710a08ab0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
@@ -1,5 +1,5 @@
 /* ORBInitInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.ORB;
 import org.omg.IOP.CodecFactory;
 import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
@@ -90,7 +92,7 @@ public interface ORBInitInfoOperations
     throws DuplicateName;
 
   /**
-   * Allocate a slot on a {@link PortableInterceptor.Current}. While slots can
+   * Allocate a slot on a {@link Current} of this interceptor. While slots can
    * be allocated by this method, they cannot be initialized.
    * {@link CurrentOperations#get_slot} and {@link CurrentOperations#set_slot}
    * throw {@link org.omg.CORBA.BAD_INV_ORDER} while called from the interceptor
@@ -103,8 +105,8 @@ public interface ORBInitInfoOperations
   /**
    * Returns the arguments passed to the ORB.init.
    *
-   * @return the first parameter, passed to the method
-   * {@link org.omg.CORBA.ORB#init}.
+   * @return the first parameter, passed to the methods from the group
+   * org.omg.CORBA.ORB#init(String[], ...).
    */
   String[] arguments();
 
@@ -127,7 +129,7 @@ public interface ORBInitInfoOperations
 
   /**
    * Register the initial reference. The registered object will be accessible by
-   * the {@link ORB.resolve_initial_references} under the object_name.
+   * the {@link ORB#resolve_initial_references} under the object_name.
    *
    * @param object_name the name of the object to register.
    * @param object the object to register.
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index a87a3b747fd..329fcf56462 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -1,5 +1,5 @@
 /* InvalidNameHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.StructMember;
-import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
index 90c2325f22b..d5dd771fd98 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
@@ -1,5 +1,5 @@
 /* ORBInitializerOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,7 +67,7 @@ public interface ORBInitializerOperations
    * @param info the object describing ORB being created and containing methods
    * to register the interceptor.
    *
-   * @see ORBInitInfoOperations#register_initial_references
+   * @see ORBInitInfoOperations#register_initial_reference
    */
   void post_init(ORBInitInfo info);
 }
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
index 72c864811f7..b9a237dce77 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
@@ -1,5 +1,5 @@
 /* ObjectReferenceFactoryHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ValueMember;
 import org.omg.CORBA.portable.InputStream;
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
index 014c11308c2..0ea54ea5f30 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
@@ -1,5 +1,5 @@
 /* ObjectReferenceTemplateHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.VM_ABSTRACT;
 import org.omg.CORBA.ValueMember;
diff --git a/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
index f865a14d258..10b9662a634 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* RequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.NO_RESOURCES;
 import org.omg.CORBA.TypeCode;
 import org.omg.Dynamic.Parameter;
 import org.omg.IOP.ServiceContext;
@@ -182,7 +183,7 @@ public interface RequestInfoOperations
    * the client. However up till JDK 1.5 inclusive this method always returns
    * SYNC_WITH_TRANSPORT.
    *
-   * @return {@link org.omg.Messaging.SYNC_WITH_TRANSPORT.value (1), always.
+   * @return {@link org.omg.Messaging.SYNC_WITH_TRANSPORT#value} (1), always.
    *
    * @specnote as defined in the Suns 1.5 JDK API.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
index e4f8fe9c28f..84ffdfa8e66 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
@@ -1,5 +1,5 @@
 /* ServerIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,7 +58,7 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ServerIdHelper
 {
   /**
-   * Insert the Server Id into Any (uses {@link Any.insert_string}).
+   * Insert the Server Id into Any (uses {@link Any#insert_string}).
    *
    * @param a the Any to insert into.
    * @param that the string to insert.
@@ -69,7 +69,7 @@ public abstract class ServerIdHelper
   }
 
   /**
-   * Extract the Server Id from Any ((uses {@link Any.extract_string}).
+   * Extract the Server Id from Any ((uses {@link Any#extract_string}).
    *
    * @param a the Any to extract from.
    */
@@ -107,7 +107,7 @@ public abstract class ServerIdHelper
   }
 
   /**
-   * Calls {@link OutputStream#write_string()}.
+   * Calls {@link OutputStream#write_string(String)}.
    *
    * @param output the stream to write into.
    * @param value the string (Server Id) value to write.
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
index a9ee7d92032..52de9d824c0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* ServerRequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.Policy;
 import org.omg.IOP.ServiceContext;
@@ -287,7 +288,7 @@ public interface ServerRequestInfoOperations
   /**
    * Checks if the servant is the given repository id.
    *
-   * @param the repository id to compare.
+   * @param id the repository id to compare.
    *
    * @return true if the servant repository id matches the parameter, false
    * otherwise.
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
index b57ca28f7ac..ccba1a76efa 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.SystemException;
+
 
 /**
  * Defines operations, applicable to the server side request interceptor. The
@@ -50,16 +52,16 @@ public interface ServerRequestInterceptorOperations
 {
   /**
    * ORB calls this method before invoking the servant manager. Operation
-       * parameters are not available at this point. The interceptor has possibility
+   * parameters are not available at this point. The interceptor has possibility
    * to forward the request by throwing {@link ForwardRequest}.
-   *
-       * @throws SystemException if it does, the receive_request_service_contexts is
-       * not called for the subsequent interceptors, calling send_exception instead.
-   * The completion status of such exception must be COMPLETED_NO.
-   *
+   * 
+   * @throws SystemException if it does, the receive_request_service_contexts is
+   *           not called for the subsequent interceptors, calling
+   *           send_exception instead. The completion status of such exception
+   *           must be COMPLETED_NO.
    * @throws ForwardRequest to forward the invocation to another target. The
-   * receive_request_service_contexts is not called for the subsequent
-   * interceptors, calling send_other instead.
+   *           receive_request_service_contexts is not called for the subsequent
+   *           interceptors, calling send_other instead.
    */
   void receive_request_service_contexts(ServerRequestInfo info)
     throws ForwardRequest;