diff options
Diffstat (limited to 'libjava/classpath/org/omg/PortableServer')
33 files changed, 80 insertions, 89 deletions
diff --git a/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java b/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java index dcf7edd0463..d1091852e7a 100644 --- a/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java +++ b/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java @@ -1,5 +1,5 @@ /* AdapterActivatorOperations.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.PortableServer; +import org.omg.CORBA.OBJECT_NOT_EXIST; + /** * Defines the operations, applicable to the AdapterActivator. diff --git a/libjava/classpath/org/omg/PortableServer/CurrentHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentHelper.java index 3afbf669b4b..f201e38bc1b 100644 --- a/libjava/classpath/org/omg/PortableServer/CurrentHelper.java +++ b/libjava/classpath/org/omg/PortableServer/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. @@ -41,9 +41,9 @@ package org.omg.PortableServer; 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.NO_IMPLEMENT; -import org.omg.CORBA.ORB; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java index 02c74c535c5..4a2a9a6a096 100644 --- a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java +++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java @@ -1,5 +1,5 @@ /* NoContextHelper.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/PortableServer/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java index b30a2abebbb..d5d5751b9e7 100644 --- a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java +++ b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java @@ -1,5 +1,5 @@ /* ForwardRequestHelper.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.PortableServer; import gnu.CORBA.Minor; +import gnu.CORBA.ObjectCreator; import gnu.CORBA.OrbRestricted; import gnu.CORBA.Poa.ForwardRequestHolder; diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java index ac81d389cdd..cc6f3962a08 100644 --- a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java @@ -1,5 +1,5 @@ /* IdAssignmentPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java index c0f281249b0..0294ee20997 100644 --- a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java @@ -1,5 +1,5 @@ /* IdUniquenessPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java index 9d81d5fab81..6631424c47d 100644 --- a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java @@ -1,5 +1,5 @@ /* ImplicitActivationPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java index 117eb5a3c9e..e1ab856b031 100644 --- a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java @@ -1,5 +1,5 @@ /* LifespanPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/POA.java b/libjava/classpath/org/omg/PortableServer/POA.java index 863a12bf821..624d658da74 100644 --- a/libjava/classpath/org/omg/PortableServer/POA.java +++ b/libjava/classpath/org/omg/PortableServer/POA.java @@ -1,5 +1,5 @@ /* POA.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,8 +55,8 @@ import org.omg.CORBA.portable.IDLEntity; * strategies are possible. * </p> * - * @see org.omg.CORBA.ORB.resolve_initial_references - * @see POAOperations.servant_to_reference + * @see org.omg.CORBA.ORB#resolve_initial_references + * @see POAOperations#servant_to_reference * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ diff --git a/libjava/classpath/org/omg/PortableServer/POAHelper.java b/libjava/classpath/org/omg/PortableServer/POAHelper.java index d6a951be52b..122cfb304c0 100644 --- a/libjava/classpath/org/omg/PortableServer/POAHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAHelper.java @@ -1,5 +1,5 @@ /* POAHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,9 +41,9 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import gnu.CORBA.OrbRestricted; +import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.TypeCode; -import org.omg.CORBA.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.MARSHAL; @@ -139,7 +139,7 @@ public abstract class POAHelper * it doesnot. The jdk 1.5 API specification defines that POA cannot be * exported. * - * @param input a org.omg.CORBA.portable stream to read from. + * @param output a org.omg.CORBA.portable stream to write into. * * @specenote Sun throws the same exception. * diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java index e23d11997b4..e6a3068af0a 100644 --- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java @@ -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/PortableServer/POAManagerPackage/State.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java index 9e856098b0b..b32d420a85c 100644 --- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java +++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java @@ -1,5 +1,5 @@ /* State.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,8 @@ package org.omg.PortableServer.POAManagerPackage; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; +import org.omg.CORBA.TRANSIENT; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; @@ -54,7 +56,7 @@ import java.io.Serializable; * receive and process requests.</li> * <li>DISCARDING When the manager is in the discarding state, * the associated POAs discard all incoming requests. The sending clients - * receive the {@link org.omg.TRANSIENT} system exception, with standard + * receive the {@link TRANSIENT} system exception, with standard * minor code 1. This mode is needed for flow control, when the system is * flooded with requests. * </li> diff --git a/libjava/classpath/org/omg/PortableServer/POAOperations.java b/libjava/classpath/org/omg/PortableServer/POAOperations.java index 1c22ceed2e4..58d062d2bc6 100644 --- a/libjava/classpath/org/omg/PortableServer/POAOperations.java +++ b/libjava/classpath/org/omg/PortableServer/POAOperations.java @@ -1,5 +1,5 @@ /* POAOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,11 @@ exception statement from your version. */ package org.omg.PortableServer; +import org.omg.CORBA.BAD_INV_ORDER; +import org.omg.CORBA.BAD_PARAM; +import org.omg.CORBA.OBJ_ADAPTER; import org.omg.CORBA.Policy; +import org.omg.CORBA.TRANSIENT; import org.omg.PortableServer.POAPackage.AdapterAlreadyExists; import org.omg.PortableServer.POAPackage.AdapterNonExistent; import org.omg.PortableServer.POAPackage.InvalidPolicy; @@ -107,7 +111,7 @@ public interface POAOperations * the Active Object Map using this Id a a key. If the servant * activator is set, its incarnate method will be called. In this case, * the passed servant in this method can be null; in this case, the servant, - * returned by {@link ServantLocatorOperations#incarnate} will + * returned by {@link ServantActivatorOperations#incarnate} will * be used. * * @param a_servant a servant that would serve the object with the @@ -129,7 +133,7 @@ public interface POAOperations * object with the provided Object Id. If the servant activator is * set, its incarnate method will be called. In this case, * the passed servant in this method can be null; in this case, the servant, - * returned by {@link ServantLocatorOperations#incarnate} will + * returned by {@link ServantActivatorOperations#incarnate} will * be used. * * @param an_Object_Id an object id for the given object. @@ -241,7 +245,7 @@ public interface POAOperations /** * Set a servant manager for this POA. * - * @param a servant manager being set. If the RETAIN policy applies, the + * @param a_manager servant manager being set. If the RETAIN policy applies, the * manager must implement a {@link ServantActivator}. If the NON_RETAIN * policy applies, the manager must implement a {@link ServantLocator}. * @@ -298,7 +302,7 @@ public interface POAOperations * @param the_Object_Id the object id. * * @throws ObjectNotActive if there is no active object with such Id. - * @throws WrongPolicy. This method requires either RETAIN or + * @throws WrongPolicy This method requires either RETAIN or * USE_DEFAULT_SERVANT policies and reaises the WrongPolicy if none of them * apply to this POA. */ @@ -328,7 +332,7 @@ public interface POAOperations * * @throws ObjectNotActive if none of the conditions above are satisfied. * @throws WrongAdapter if the object reference was not created with this POA. - * @throws WrongPolicy. This method requires either RETAIN or + * @throws WrongPolicy This method requires either RETAIN or * USE_DEFAULT_SERVANT policies and reaises the WrongPolicy if none of them * apply to this POA. */ @@ -408,7 +412,7 @@ public interface POAOperations /** * Set the adapter activator for this POA. * - * @param the activator being set. + * @param activator the activator being set. */ void the_activator(AdapterActivator activator); @@ -437,7 +441,7 @@ public interface POAOperations * <p> Destroy this POA and all descendant POAs. The destroyed POAs can be * later re-created via {@link AdapterActivator} or by invoking * {@link #create_POA}. - * This differs from {@link PoaManagerOperations#deactivate} that does + * This differs from {@link POAManagerOperations#deactivate} that does * not allow recreation of the deactivated POAs. After deactivation, * recreation is only possible if the POAs were later destroyed. * </p><p> @@ -462,7 +466,7 @@ public interface POAOperations /** * Create the IdUniquenessPolicy policy. * - * @param value states which one Id uniqueness policy will apply. + * @param a_value states which one Id uniqueness policy will apply. * * @return the created policy. */ @@ -471,7 +475,7 @@ public interface POAOperations /** * Create the ImplicitActivationPolicy policy. * - * @param value states which one activation policy will apply. + * @param a_value states which one activation policy will apply. * * @return the created policy. */ @@ -480,7 +484,7 @@ public interface POAOperations /** * Create the LifespanPolicy policy. * - * @param value states which one object lifespan policy will apply. + * @param a_value states which one object lifespan policy will apply. * * @return the created policy. */ @@ -489,7 +493,7 @@ public interface POAOperations /** * Create the RequestProcessingPolicy policy. * - * @param value states which one request processing policy will apply. + * @param a_value states which one request processing policy will apply. * * @return the created policy. */ @@ -498,7 +502,7 @@ public interface POAOperations /** * Create the ServantRetentionPolicy policy. * - * @param value states which one servant retention policy will apply. + * @param a_value states which one servant retention policy will apply. * * @return the created policy. */ @@ -507,7 +511,7 @@ public interface POAOperations /** * Create the ThreadPolicy policy. * - * @param value states which one thread policy will apply. + * @param a_value states which one thread policy will apply. * * @return the created policy. */ diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java index f616637ae26..6476eeaa5ac 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java @@ -1,5 +1,5 @@ /* AdapterAlreadyExistsHelper.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/PortableServer/POAPackage/AdapterNonExistentHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java index bad920a5a4e..1c007fb43b9 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java @@ -1,5 +1,5 @@ /* AdapterNonExistentHelper.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/PortableServer/POAPackage/InvalidPolicy.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java index 51ef615fbc2..470d9af4a0c 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java @@ -69,7 +69,7 @@ public final class InvalidPolicy /** * Create InvalidPolicy with no explaining - * message and leaving {@link index} with default 0 value. + * message and leaving {@link #index} with default 0 value. */ public InvalidPolicy() { @@ -77,7 +77,7 @@ public final class InvalidPolicy /** * Create the InvalidPolicy with explaining - * message and initialisintg {@link index} to the passed value. + * message and initialisintg {@link #index} to the passed value. * * @param why a string, explaining, why this exception has been thrown. * @param a_index a value for index. @@ -90,7 +90,7 @@ public final class InvalidPolicy /** * Create the InvalidPolicy without explaining - * message and initialisintg {@link index} to the passed value. + * message and initialisintg {@link #index} to the passed value. * * @param a_index a value for index. */ diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java index b9afb8ed79e..56e8c4d16d9 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java @@ -1,5 +1,5 @@ /* NoServantHelper.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/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java index bf5e9cd9ef2..7f2e1484c08 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java @@ -1,5 +1,5 @@ /* ObjectAlreadyActiveHelper.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/PortableServer/POAPackage/ObjectNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java index 2f5867cbdb5..4cdf80891cd 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java @@ -1,5 +1,5 @@ /* ObjectNotActiveHelper.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/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java index 33ca0667482..30b0b52d021 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java @@ -1,5 +1,5 @@ /* ServantAlreadyActiveHelper.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/PortableServer/POAPackage/ServantNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java index e86f4e948f7..f77ecfc50a6 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java @@ -1,5 +1,5 @@ /* ServantNotActiveHelper.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/PortableServer/POAPackage/WrongAdapterHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java index 7650014c1f5..f1181fe61e5 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java @@ -1,5 +1,5 @@ /* WrongAdapterHelper.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/PortableServer/POAPackage/WrongPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java index a9e7fc594d5..bd09c2e9643 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java @@ -1,5 +1,5 @@ /* WrongPolicyHelper.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/PortableServer/RequestProcessingPolicyValue.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java index 0b1ce4d0bfa..2f22e309082 100644 --- a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java @@ -1,5 +1,5 @@ /* RequestProcessingPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/Servant.java b/libjava/classpath/org/omg/PortableServer/Servant.java index 5c99ee1a0e3..24eb715a98d 100644 --- a/libjava/classpath/org/omg/PortableServer/Servant.java +++ b/libjava/classpath/org/omg/PortableServer/Servant.java @@ -80,7 +80,7 @@ import gnu.CORBA.Poa.gnuPOA; * The Servant type is a CORBA <code>native</code> type. * </p> * - * @see POA.servant_to_reference(Servant) + * @see POA#servant_to_reference(Servant) * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ @@ -128,8 +128,7 @@ public abstract class Servant * Checks if the passed servant is an instance of the given CORBA IDL type. * By default, forwards the requet to the delegate. * - * @param a_servant a servant to check. - * @param an_id a repository ID, representing an IDL type for that the + * @param repository_id a repository ID, representing an IDL type for that the * servant must be checked. * * @return true if the servant is an instance of the given type, false @@ -166,7 +165,7 @@ public abstract class Servant * reference "RootPOA" for that orb. By default, forwards request to the * delegate. * - * @see ORB.resolve_initial_references + * @see ORB#resolve_initial_references */ public POA _default_POA() { @@ -214,7 +213,7 @@ public abstract class Servant * the given servant. This is important when the same servant serves * multiple objects. If the servant is not yet connected to the passed * orb, the method will try to connect it to that orb on POA, returned - * by the method {@link _default_POA}. That method can be overridden to + * by the method {@link #_default_POA}. That method can be overridden to * get poa where the object must be automatically connected when * calling this method. * diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java index e1c4f09c869..48598aa20e0 100644 --- a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java +++ b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java @@ -1,5 +1,5 @@ /* ServantActivatorHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,6 @@ 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; @@ -121,15 +120,13 @@ public abstract class ServantActivatorHelper * Narrow the given object to the ServantActivator. 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 OMG issue 4158. * * @param obj the object to cast. * * @return the casted ServantActivator. * * @since 1.5 - * - * @see OMG issue 4158. */ public static ServantActivator unchecked_narrow(org.omg.CORBA.Object obj) { diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java index 7bb933f7b9f..467464791da 100644 --- a/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java +++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java @@ -1,5 +1,5 @@ /* ServantLocatorHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,8 +43,8 @@ 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; @@ -121,15 +121,13 @@ public abstract class ServantLocatorHelper * Narrow the given object to the ServantLocator. 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 OMG issue 4158. * * @param obj the object to cast. * * @return the casted ServantLocator. * * @since 1.5 - * - * @see OMG issue 4158. */ public static ServantLocator unchecked_narrow(org.omg.CORBA.Object obj) { diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java index 6ed214e2f27..58448c1af03 100644 --- a/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java +++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java @@ -1,5 +1,5 @@ /* ServantLocatorOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,7 +60,7 @@ public interface ServantLocatorOperations * @param operation the name of the method or operation being invoked. * @param cookie_holder the holder where the servant manager can store * an arbitrary java.lang.Object. This object will be later passed as a - * <code>cookie</code> parameter for {@link postinvoke}, to create tie + * <code>cookie</code> parameter for {@link #postinvoke}, to create tie * between preinvoke and postinvoke. The application should <i>not</i> * suppose that each call of preinvoke is followed by the subsequent * postinvoke for the same invocation; under multi threaded policy these diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java index 0b6ecf62fe1..607df1293a1 100644 --- a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java @@ -1,5 +1,5 @@ /* ServantRetentionPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java index 5c771a7d624..2ba1b8e821d 100644 --- a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java +++ b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java @@ -1,5 +1,5 @@ /* ThreadPolicyValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,6 +41,7 @@ package org.omg.PortableServer; import gnu.CORBA.Minor; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.portable.IDLEntity; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java index 6f907159380..f323f6d381c 100644 --- a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java +++ b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java @@ -1,5 +1,5 @@ /* _ServantActivatorStub.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,18 +38,10 @@ exception statement from your version. */ package org.omg.PortableServer; -import org.omg.CORBA.MARSHAL; -import org.omg.CORBA.ORB; -import org.omg.CORBA.ObjectHelper; -import org.omg.CORBA.portable.ApplicationException; -import org.omg.CORBA.portable.Delegate; -import org.omg.CORBA.portable.InputStream; -import org.omg.CORBA.portable.ObjectImpl; -import org.omg.CORBA.portable.OutputStream; -import org.omg.CORBA.portable.RemarshalException; - import java.io.Serializable; +import org.omg.CORBA.portable.ObjectImpl; + /** * <p>This ServantActivator stub is an optional base for the * servant activators. This stub cannot accept remote invocations, as diff --git a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java index 8234ba2c79e..9f142e1e839 100644 --- a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java +++ b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java @@ -1,5 +1,5 @@ /* _ServantLocatorStub.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/org/omg/PortableServer/portable/Delegate.java b/libjava/classpath/org/omg/PortableServer/portable/Delegate.java index 70e05e7bf05..3c61122b70c 100644 --- a/libjava/classpath/org/omg/PortableServer/portable/Delegate.java +++ b/libjava/classpath/org/omg/PortableServer/portable/Delegate.java @@ -1,5 +1,5 @@ /* DelegateOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,11 +55,11 @@ public interface Delegate /** * Returns the root POA of the ORB instance, associated with this servant. * It is the same POA that would be returned by resolving the initial - * reference "RootPOA" for that orb. The default {@link Servant#default_POA} + * reference "RootPOA" for that orb. The default {@link Servant#_default_POA()} * method forwards call to the delegate can be overridden to * obtain the alternative default POA. * - * @see ORB.resolve_initial_references + * @see ORB#resolve_initial_references */ POA default_POA(Servant a_servant); |
