diff options
Diffstat (limited to 'libjava/classpath/org')
184 files changed, 533 insertions, 602 deletions
diff --git a/libjava/classpath/org/omg/CORBA/AnyHolder.java b/libjava/classpath/org/omg/CORBA/AnyHolder.java index 10f828aabe5..c24855480c7 100644 --- a/libjava/classpath/org/omg/CORBA/AnyHolder.java +++ b/libjava/classpath/org/omg/CORBA/AnyHolder.java @@ -1,5 +1,5 @@ /* AnyHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,7 +83,7 @@ public final class AnyHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For {@link Any}, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_any}. @@ -105,7 +105,7 @@ public final class AnyHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For {@link Any} the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_any(Any) }. diff --git a/libjava/classpath/org/omg/CORBA/AnySeqHelper.java b/libjava/classpath/org/omg/CORBA/AnySeqHelper.java index 8ebae7a193f..d06e5b8545e 100644 --- a/libjava/classpath/org/omg/CORBA/AnySeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/AnySeqHelper.java @@ -1,5 +1,5 @@ /* AnySeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/AnySeqHolder.java b/libjava/classpath/org/omg/CORBA/AnySeqHolder.java index b18a1457b15..0d21ed3bba9 100644 --- a/libjava/classpath/org/omg/CORBA/AnySeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/AnySeqHolder.java @@ -1,5 +1,5 @@ /* AnySeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,7 +83,7 @@ public final class AnySeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>and then all Any's. * @@ -109,7 +109,7 @@ public final class AnySeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code> and then all Any's. * diff --git a/libjava/classpath/org/omg/CORBA/BooleanHolder.java b/libjava/classpath/org/omg/CORBA/BooleanHolder.java index 73cfeb29613..a5b7bd8bc9e 100644 --- a/libjava/classpath/org/omg/CORBA/BooleanHolder.java +++ b/libjava/classpath/org/omg/CORBA/BooleanHolder.java @@ -1,5 +1,5 @@ /* BooleanHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class BooleanHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>boolean</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_boolean}. @@ -113,7 +113,7 @@ public final class BooleanHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>boolean</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_boolean(boolean) }. diff --git a/libjava/classpath/org/omg/CORBA/BooleanSeqHelper.java b/libjava/classpath/org/omg/CORBA/BooleanSeqHelper.java index 41f93d10d73..3cb2538c3fe 100644 --- a/libjava/classpath/org/omg/CORBA/BooleanSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/BooleanSeqHelper.java @@ -1,5 +1,5 @@ /* BooleanSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/BooleanSeqHolder.java b/libjava/classpath/org/omg/CORBA/BooleanSeqHolder.java index bdec3b79273..6144a17d6d8 100644 --- a/libjava/classpath/org/omg/CORBA/BooleanSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/BooleanSeqHolder.java @@ -1,5 +1,5 @@ /* BooleanSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class BooleanSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_boolean_array }. @@ -111,7 +111,7 @@ public final class BooleanSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_boolean_array }. diff --git a/libjava/classpath/org/omg/CORBA/ByteHolder.java b/libjava/classpath/org/omg/CORBA/ByteHolder.java index c440822e58c..c590a433e19 100644 --- a/libjava/classpath/org/omg/CORBA/ByteHolder.java +++ b/libjava/classpath/org/omg/CORBA/ByteHolder.java @@ -1,5 +1,5 @@ /* ByteHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class ByteHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>octet</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_octet}. @@ -113,7 +113,7 @@ public final class ByteHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>octet</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_octet(byte) }. diff --git a/libjava/classpath/org/omg/CORBA/CharHolder.java b/libjava/classpath/org/omg/CORBA/CharHolder.java index b8d0a3d6a31..6ef5210a33d 100644 --- a/libjava/classpath/org/omg/CORBA/CharHolder.java +++ b/libjava/classpath/org/omg/CORBA/CharHolder.java @@ -1,5 +1,5 @@ /* CharHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -90,7 +90,7 @@ public final class CharHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>char</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_char}. @@ -112,7 +112,7 @@ public final class CharHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>char</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_char(char) }. diff --git a/libjava/classpath/org/omg/CORBA/CharSeqHelper.java b/libjava/classpath/org/omg/CORBA/CharSeqHelper.java index 08406058ca8..4853f3d1609 100644 --- a/libjava/classpath/org/omg/CORBA/CharSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/CharSeqHelper.java @@ -1,5 +1,5 @@ /* CharSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/CharSeqHolder.java b/libjava/classpath/org/omg/CORBA/CharSeqHolder.java index a60483b5f0f..3fa5475a0f1 100644 --- a/libjava/classpath/org/omg/CORBA/CharSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/CharSeqHolder.java @@ -1,5 +1,5 @@ /* CharSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class CharSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_char_array }. @@ -111,7 +111,7 @@ public final class CharSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_char_array }. diff --git a/libjava/classpath/org/omg/CORBA/Context.java b/libjava/classpath/org/omg/CORBA/Context.java index e3f7363f4cf..01a7e9944b7 100644 --- a/libjava/classpath/org/omg/CORBA/Context.java +++ b/libjava/classpath/org/omg/CORBA/Context.java @@ -1,5 +1,5 @@ /* Context.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,7 @@ package org.omg.CORBA; * used to represent information about various circumstances of the * invocation. A Context if first created by * {@link org.omg.CORBA.ORB#get_default_context() } and then invoking - * {@link create_child(String)} of the default context. + * {@link #create_child(String)} of the default context. * * The contexts are named. * @@ -66,7 +66,7 @@ public abstract class Context /** * Create a child of this Context, giving it a name. - * @param name a name of the child context. + * @param child a name of the child context. * * @return the newly created context. */ diff --git a/libjava/classpath/org/omg/CORBA/CurrentHelper.java b/libjava/classpath/org/omg/CORBA/CurrentHelper.java index f292449ecd1..36c5f186329 100644 --- a/libjava/classpath/org/omg/CORBA/CurrentHelper.java +++ b/libjava/classpath/org/omg/CORBA/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,9 +42,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.StructMember; -import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.Delegate; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CORBA/CustomValue.java b/libjava/classpath/org/omg/CORBA/CustomValue.java index 0e5809fd6ea..6814ab3c59d 100644 --- a/libjava/classpath/org/omg/CORBA/CustomValue.java +++ b/libjava/classpath/org/omg/CORBA/CustomValue.java @@ -1,5 +1,5 @@ /* CustomValue.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,7 @@ exception statement from your version. */ package org.omg.CORBA; +import org.omg.CORBA.portable.StreamableValue; import org.omg.CORBA.portable.ValueBase; /** @@ -50,7 +51,7 @@ import org.omg.CORBA.portable.ValueBase; * in the receiving context. * * If the value base does not implement this interface, it normally implements - * {@link org.omg.CORBA.portable.StremableValue} instead. + * {@link StreamableValue} instead. * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ diff --git a/libjava/classpath/org/omg/CORBA/DataOutputStream.java b/libjava/classpath/org/omg/CORBA/DataOutputStream.java index 5e0f021fe80..20f1afbe21f 100644 --- a/libjava/classpath/org/omg/CORBA/DataOutputStream.java +++ b/libjava/classpath/org/omg/CORBA/DataOutputStream.java @@ -1,5 +1,5 @@ /* DataOutputStream.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -190,63 +190,63 @@ public interface DataOutputStream /** * Write array of Any's to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_any_array(Any[] seq, int offset, int length); /** * Write array of boolean's to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_boolean_array(boolean[] seq, int offset, int length); /** * Write array of narrow chars to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_char_array(char[] seq, int offset, int length); /** * Write array of wide chars to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_wchar_array(char[] seq, int offset, int length); /** * Write array of octets (bytes) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_octet_array(byte[] seq, int offset, int length); /** * Write array of shorts (16 bit integers) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_short_array(short[] seq, int offset, int length); /** * Write array of unsigned shorts (16 bit integers) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_ushort_array(short[] seq, int offset, int length); /** * Write array of CORBA longs (java ints) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_long_array(int[] seq, int offset, int length); /** * Write array of unsigned CORBA longs (java ints) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_ulong_array(int[] seq, int offset, int length); @@ -254,28 +254,28 @@ public interface DataOutputStream * Write array of unsigned CORBA long longs (java longs) * to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_ulonglong_array(long[] seq, int offset, int length); /** * Write arrayo fo CORBA long longs (java ints) to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_longlong_array(long[] seq, int offset, int length); /** * Write array of floats to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_float_array(float[] seq, int offset, int length); /** * Write array of doubles to the output stream. * - * @param value a value to write. + * @param seq a value to write. */ void write_double_array(double[] seq, int offset, int length); }
\ No newline at end of file diff --git a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java index ef7e26725b3..05fe992872f 100644 --- a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java +++ b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java @@ -1,5 +1,5 @@ /* DefinitionKindHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,10 +40,7 @@ package org.omg.CORBA; import gnu.CORBA.DefinitionKindHolder; import gnu.CORBA.OrbRestricted; -import gnu.CORBA.gnuAny; -import gnu.CORBA.typecodes.PrimitiveTypeCode; -import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/CORBA/DomainManagerOperations.java b/libjava/classpath/org/omg/CORBA/DomainManagerOperations.java index 7dc0526a4db..6bda64d76a9 100644 --- a/libjava/classpath/org/omg/CORBA/DomainManagerOperations.java +++ b/libjava/classpath/org/omg/CORBA/DomainManagerOperations.java @@ -1,5 +1,5 @@ /* DomainManagerOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,7 @@ package org.omg.CORBA; /** * Provides the means to access the policies of the domain, with that - * the implementing {@link DomainManage} is associated. + * the implementing {@link DomainManager} is associated. * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ diff --git a/libjava/classpath/org/omg/CORBA/DoubleHolder.java b/libjava/classpath/org/omg/CORBA/DoubleHolder.java index 65c8ebaf5e0..23ec513f975 100644 --- a/libjava/classpath/org/omg/CORBA/DoubleHolder.java +++ b/libjava/classpath/org/omg/CORBA/DoubleHolder.java @@ -1,5 +1,5 @@ /* DoubleHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class DoubleHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>double</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_double}. @@ -113,7 +113,7 @@ public final class DoubleHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>double</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_double(double) }. diff --git a/libjava/classpath/org/omg/CORBA/DoubleSeqHelper.java b/libjava/classpath/org/omg/CORBA/DoubleSeqHelper.java index 2d9423fd095..6c971b7bea2 100644 --- a/libjava/classpath/org/omg/CORBA/DoubleSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/DoubleSeqHelper.java @@ -1,5 +1,5 @@ /* DoubleSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/DoubleSeqHolder.java b/libjava/classpath/org/omg/CORBA/DoubleSeqHolder.java index 619e9215bb9..5d7fb1aedaa 100644 --- a/libjava/classpath/org/omg/CORBA/DoubleSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/DoubleSeqHolder.java @@ -1,5 +1,5 @@ /* DoubleSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class DoubleSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_double_array }. @@ -111,7 +111,7 @@ public final class DoubleSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_double_array }. diff --git a/libjava/classpath/org/omg/CORBA/DynAny.java b/libjava/classpath/org/omg/CORBA/DynAny.java index 42b93341971..edafe435a7f 100644 --- a/libjava/classpath/org/omg/CORBA/DynAny.java +++ b/libjava/classpath/org/omg/CORBA/DynAny.java @@ -1,5 +1,5 @@ /* DynAny.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -280,7 +280,7 @@ public interface DynAny * Insert the {@link Any} value into the enclosed * {@link Any} inside this DynAny. * - * @param a_x the value being inserted. + * @param an_any the value being inserted. * @throws InvalidValue if the value type does not match the * typecode of the enclosed {@link Any}. */ @@ -458,7 +458,7 @@ public interface DynAny throws InvalidValue; /** - * Advances the internal pointer, described in the {@link current_component}, + * Advances the internal pointer, described in the {@link #current_component}, * one position forward. * * @return true if the pointer now points to the new component, @@ -468,13 +468,13 @@ public interface DynAny boolean next(); /** - * Moves the internal pointer, described in the {@link current_component}, + * Moves the internal pointer, described in the {@link #current_component}, * to the first component. */ void rewind(); /** - * Moves the internal pointer, described in the {@link current_component}, + * Moves the internal pointer, described in the {@link #current_component}, * to the given position. * * @param p the number of the internal component on that the internal diff --git a/libjava/classpath/org/omg/CORBA/DynSequence.java b/libjava/classpath/org/omg/CORBA/DynSequence.java index be7556705bb..6a5c77c0ba9 100644 --- a/libjava/classpath/org/omg/CORBA/DynSequence.java +++ b/libjava/classpath/org/omg/CORBA/DynSequence.java @@ -1,5 +1,5 @@ /* DynSequence.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,7 +56,7 @@ public interface DynSequence /** * Returns the number of elements, stored in the sequence. - * @return + * @return the length of the sequence */ int length(); diff --git a/libjava/classpath/org/omg/CORBA/DynValue.java b/libjava/classpath/org/omg/CORBA/DynValue.java index 24d28124651..5c67ffbbe41 100644 --- a/libjava/classpath/org/omg/CORBA/DynValue.java +++ b/libjava/classpath/org/omg/CORBA/DynValue.java @@ -1,5 +1,5 @@ /* DynValue.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ public interface DynValue /** * Get all members of the enclosed value type object. - * @return + * @return members, as an array of the name - value pairs. */ NameValuePair[] get_members(); diff --git a/libjava/classpath/org/omg/CORBA/DynamicImplementation.java b/libjava/classpath/org/omg/CORBA/DynamicImplementation.java index 3b1b4431905..24e6319fec5 100644 --- a/libjava/classpath/org/omg/CORBA/DynamicImplementation.java +++ b/libjava/classpath/org/omg/CORBA/DynamicImplementation.java @@ -1,5 +1,5 @@ /* DynamicImplementation.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -61,7 +61,7 @@ public class DynamicImplementation { /** * Invoke the method of the CORBA object. After converting the parameters, - * this method delegates call to the {@link ObjectImpl#invoke}. + * this method delegates call to the {@link ObjectImpl#_invoke}. * * @deprecated since 1.4. * diff --git a/libjava/classpath/org/omg/CORBA/FieldNameHelper.java b/libjava/classpath/org/omg/CORBA/FieldNameHelper.java index 6d6de43da67..1f884d72821 100644 --- a/libjava/classpath/org/omg/CORBA/FieldNameHelper.java +++ b/libjava/classpath/org/omg/CORBA/FieldNameHelper.java @@ -1,5 +1,5 @@ /* FieldNameHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class FieldNameHelper { /** - * Insert the FieldName into Any (uses {@link Any.insert_string}). + * Insert the FieldName into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -66,7 +66,7 @@ public abstract class FieldNameHelper } /** - * Extract the FieldName from Any ((uses {@link Any.extract_string}). + * Extract the FieldName from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -104,7 +104,7 @@ public abstract class FieldNameHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (FieldName) value to write. diff --git a/libjava/classpath/org/omg/CORBA/FixedHolder.java b/libjava/classpath/org/omg/CORBA/FixedHolder.java index 8913acc1755..a44cde52dbf 100644 --- a/libjava/classpath/org/omg/CORBA/FixedHolder.java +++ b/libjava/classpath/org/omg/CORBA/FixedHolder.java @@ -1,5 +1,5 @@ /* FixedHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,6 @@ exception statement from your version. */ package org.omg.CORBA; import gnu.CORBA.typecodes.FixedTypeCode; -import gnu.CORBA.typecodes.PrimitiveTypeCode; import java.math.BigDecimal; @@ -88,7 +87,7 @@ public final class FixedHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>fixed</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_fixed}. @@ -112,7 +111,7 @@ public final class FixedHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>fixed</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_fixed(BigDecimal) }. diff --git a/libjava/classpath/org/omg/CORBA/FloatHolder.java b/libjava/classpath/org/omg/CORBA/FloatHolder.java index 1d6de16a192..8d765ced374 100644 --- a/libjava/classpath/org/omg/CORBA/FloatHolder.java +++ b/libjava/classpath/org/omg/CORBA/FloatHolder.java @@ -1,5 +1,5 @@ /* FloatHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class FloatHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>float</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_float}. @@ -113,7 +113,7 @@ public final class FloatHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>float</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_float(float) }. diff --git a/libjava/classpath/org/omg/CORBA/FloatSeqHelper.java b/libjava/classpath/org/omg/CORBA/FloatSeqHelper.java index 1656dae440a..10850e022b4 100644 --- a/libjava/classpath/org/omg/CORBA/FloatSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/FloatSeqHelper.java @@ -1,5 +1,5 @@ /* FloatSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/FloatSeqHolder.java b/libjava/classpath/org/omg/CORBA/FloatSeqHolder.java index dbab1ec08ba..b7e8efcc0d2 100644 --- a/libjava/classpath/org/omg/CORBA/FloatSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/FloatSeqHolder.java @@ -1,5 +1,5 @@ /* FloatSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class FloatSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_float_array }. @@ -111,7 +111,7 @@ public final class FloatSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_float_array }. diff --git a/libjava/classpath/org/omg/CORBA/IdentifierHelper.java b/libjava/classpath/org/omg/CORBA/IdentifierHelper.java index 5c055f81290..deff909690e 100644 --- a/libjava/classpath/org/omg/CORBA/IdentifierHelper.java +++ b/libjava/classpath/org/omg/CORBA/IdentifierHelper.java @@ -1,5 +1,5 @@ /* IdentifierHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class IdentifierHelper { /** - * Insert the Identifier into Any (uses {@link Any.insert_string}). + * Insert the Identifier into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -66,7 +66,7 @@ public abstract class IdentifierHelper } /** - * Extract the Identifier from Any ((uses {@link Any.extract_string}). + * Extract the Identifier from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -104,7 +104,7 @@ public abstract class IdentifierHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (Identifier) value to write. diff --git a/libjava/classpath/org/omg/CORBA/IntHolder.java b/libjava/classpath/org/omg/CORBA/IntHolder.java index 4729535a7ec..a27cf435ce3 100644 --- a/libjava/classpath/org/omg/CORBA/IntHolder.java +++ b/libjava/classpath/org/omg/CORBA/IntHolder.java @@ -1,5 +1,5 @@ /* IntHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -90,7 +90,7 @@ public final class IntHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>long</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_long}. @@ -112,7 +112,7 @@ public final class IntHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>long</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_long(int) }. diff --git a/libjava/classpath/org/omg/CORBA/LocalObject.java b/libjava/classpath/org/omg/CORBA/LocalObject.java index 7c06e18249d..a3fd131caf6 100644 --- a/libjava/classpath/org/omg/CORBA/LocalObject.java +++ b/libjava/classpath/org/omg/CORBA/LocalObject.java @@ -1,5 +1,5 @@ /* LocalObject.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -253,12 +253,12 @@ public class LocalObject /** * This method is called from <code>rmic</code> generated stubs if the - * {@link Util#isLocal()}, called passing <code>this</code> as parameter, + * {@link Util#isLocal}, called passing <code>this</code> as parameter, * returns true. If the method returns null, the requested method is then * invoked on <code>this</code>. Else it is invoked on the returned object, * casting it into the interface that the local object implements. In this * case, the generated stub also later calls - * {@link _servant_postinvoke(ServantObject)}, passing that returned target + * {@link #_servant_postinvoke(ServantObject)}, passing that returned target * as parameter. * * @param operation the name of the method being invoked. @@ -275,7 +275,7 @@ public class LocalObject /** * This method is called from <code>rmic</code> generated stubs if the - * {@link Util#isLocal()}, called passing <code>this</code> as parameter, + * {@link Util#isLocal}, called passing <code>this</code> as parameter, * returns true, and the {@link #_servant_preinvoke} return non-null object. * The stub then invokes the requrested method on that returned object and * later calls _servant_postinvoke, passing that returned target as parameter. @@ -289,7 +289,7 @@ public class LocalObject /** * Invokes the operation. This method takes the OutputStream that was previously - * returned by a {@link _request()} and returns an InputStream which + * returned by a {@link #_request(String)} and returns an InputStream which * contains the reply. Up till jdk 1.5 inclusive this method is marked as * unimplemented. * @@ -304,7 +304,7 @@ public class LocalObject /** * While it may look that this should return true, the jdk 1.5 API states * that it must throw NO_IMPLEMENT instead. The rmi stubs do not call this - * method to check if the object is local; they call {@link Util#isLocal()} + * method to check if the object is local; they call {@link Util#isLocal} * instead (passing <code>this</code> as parameter). * * @return never. diff --git a/libjava/classpath/org/omg/CORBA/LongHolder.java b/libjava/classpath/org/omg/CORBA/LongHolder.java index ac249fed3c6..db412d96966 100644 --- a/libjava/classpath/org/omg/CORBA/LongHolder.java +++ b/libjava/classpath/org/omg/CORBA/LongHolder.java @@ -1,5 +1,5 @@ /* LongHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class LongHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>long long</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_longlong}. @@ -113,7 +113,7 @@ public final class LongHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>long long</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_longlong(long) }. diff --git a/libjava/classpath/org/omg/CORBA/LongLongSeqHelper.java b/libjava/classpath/org/omg/CORBA/LongLongSeqHelper.java index 0e31c713647..1ba58d5d362 100644 --- a/libjava/classpath/org/omg/CORBA/LongLongSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/LongLongSeqHelper.java @@ -1,5 +1,5 @@ /* LongLongSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/LongLongSeqHolder.java b/libjava/classpath/org/omg/CORBA/LongLongSeqHolder.java index e56acd4ad78..ebb83cfd012 100644 --- a/libjava/classpath/org/omg/CORBA/LongLongSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/LongLongSeqHolder.java @@ -1,5 +1,5 @@ /* LongLongSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class LongLongSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_longlong_array }. @@ -111,7 +111,7 @@ public final class LongLongSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_longlong_array }. diff --git a/libjava/classpath/org/omg/CORBA/LongSeqHelper.java b/libjava/classpath/org/omg/CORBA/LongSeqHelper.java index 26b4e91c2a5..c33611da8e3 100644 --- a/libjava/classpath/org/omg/CORBA/LongSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/LongSeqHelper.java @@ -1,5 +1,5 @@ /* LongSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/LongSeqHolder.java b/libjava/classpath/org/omg/CORBA/LongSeqHolder.java index 2359eb0b2f6..79e94382d3d 100644 --- a/libjava/classpath/org/omg/CORBA/LongSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/LongSeqHolder.java @@ -1,5 +1,5 @@ /* LongSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,10 +87,10 @@ public final class LongSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>and then calls the - * {@link org.omg.CORBA.portable.InputStream#input.read_long_array }. + * {@link org.omg.CORBA.portable.InputStream#read_long_array }. * * @param input the input stream to read from. */ @@ -102,10 +102,10 @@ public final class LongSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>and then calls the - * {@link org.omg.CORBA.portable.OutputStream#input.write_long_array }. + * {@link org.omg.CORBA.portable.OutputStream#write_long_array }. * * @param output the output stream to write into. */ diff --git a/libjava/classpath/org/omg/CORBA/ORB.java b/libjava/classpath/org/omg/CORBA/ORB.java index af05488280f..89bc5376402 100644 --- a/libjava/classpath/org/omg/CORBA/ORB.java +++ b/libjava/classpath/org/omg/CORBA/ORB.java @@ -1,5 +1,5 @@ /* ORB.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,10 +41,8 @@ package org.omg.CORBA; import gnu.CORBA.OrbFocused; import gnu.CORBA.ObjectCreator; import gnu.CORBA.OrbRestricted; -import gnu.CORBA.gnuContext; import gnu.CORBA.typecodes.FixedTypeCode; import gnu.CORBA.typecodes.GeneralTypeCode; -import gnu.CORBA.typecodes.PrimitiveTypeCode; import gnu.CORBA.typecodes.RecordTypeCode; import gnu.CORBA.typecodes.RecursiveTypeCode; @@ -144,7 +142,7 @@ public abstract class ORB { /** * By default, {@link #init(String[], Properties)} and - * {@link #iinit(Applet, Properties)} return + * {@link #init(Applet, Properties)} return * the built-in fully functional ORB is returned. If the * <code>props</code> contains the property org.omg.CORBA.ORBClass, * the value of this property is used as a class name to instantiate @@ -210,6 +208,34 @@ public abstract class ORB } /** + * Create a typecode, representing a tree-like structure. + * This structure contains a member that is a sequence of the same type, + * as the structure itself. You can imagine as if the folder definition + * contains a variable-length array of the enclosed (nested) folder + * definitions. In this way, it is possible to have a tree like + * structure that can be transferred via CORBA CDR stream. + * + * @deprecated It is easier and clearler to use a combination of + * create_recursive_tc and create_sequence_tc instead. + * + * @param bound the maximal expected number of the nested components + * on each node; 0 if not limited. + * + * @param offset the position of the field in the returned structure + * that contains the sequence of the structures of the same field. + * The members before this field are intialised using parameterless + * StructMember constructor. + * + * @return a typecode, defining a stucture, where a member at the + * <code>offset</code> position defines an array of the identical + * structures. + * + * @see #create_recursive_tc(String) + * @see #create_sequence_tc(int, TypeCode) + */ + public abstract TypeCode create_recursive_sequence_tc(int bound, int offset); + + /** * Create alias typecode for the given typecode. */ public abstract TypeCode create_alias_tc(String id, String name, @@ -496,7 +522,7 @@ public abstract class ORB */ public abstract Request get_next_response() throws WrongTransaction; - + /** * Create a new CDR output stream, where the parameter values can be written * during the method invocation. @@ -647,33 +673,6 @@ public abstract class ORB return t; } - /** - * Create a typecode, representing a tree-like structure. - * This structure contains a member that is a sequence of the same type, - * as the structure itself. You can imagine as if the folder definition - * contains a variable-length array of the enclosed (nested) folder - * definitions. In this way, it is possible to have a tree like - * structure that can be transferred via CORBA CDR stream. - * - * @deprecated It is easier and clearler to use a combination of - * create_recursive_tc and create_sequence_tc instead. - * - * @param bound the maximal expected number of the nested components - * on each node; 0 if not limited. - * - * @param offset the position of the field in the returned structure - * that contains the sequence of the structures of the same field. - * The members before this field are intialised using parameterless - * StructMember constructor. - * - * @return a typecode, defining a stucture, where a member at the - * <code>offset</code> position defines an array of the identical - * structures. - * - * @see #create_recursive_tc(String) - * @see #create_sequence_tc(int, TypeCode) - */ - public abstract TypeCode create_recursive_sequence_tc(int bound, int offset); /** * Create a typecode which serves as a placeholder for typcode, containing @@ -1238,4 +1237,4 @@ public abstract class ORB why ); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/CORBA/ObjectHelper.java b/libjava/classpath/org/omg/CORBA/ObjectHelper.java index f662a78880c..dbf43308029 100644 --- a/libjava/classpath/org/omg/CORBA/ObjectHelper.java +++ b/libjava/classpath/org/omg/CORBA/ObjectHelper.java @@ -1,5 +1,5 @@ /* ObjectHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,7 +40,6 @@ package org.omg.CORBA; import gnu.CORBA.Minor; import gnu.CORBA.OrbRestricted; -import gnu.CORBA.typecodes.PrimitiveTypeCode; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/CORBA/ObjectHolder.java b/libjava/classpath/org/omg/CORBA/ObjectHolder.java index f79a89bef0d..235f1e66fcd 100644 --- a/libjava/classpath/org/omg/CORBA/ObjectHolder.java +++ b/libjava/classpath/org/omg/CORBA/ObjectHolder.java @@ -1,5 +1,5 @@ /* ObjectHolder.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,6 @@ exception statement from your version. */ package org.omg.CORBA; -import gnu.CORBA.typecodes.PrimitiveTypeCode; import gnu.CORBA.typecodes.RecordTypeCode; import org.omg.CORBA.portable.InputStream; @@ -98,10 +97,10 @@ public final class ObjectHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>org.omg.CORBA.Object</code>, the * functionality is delegated to - * {@link org.omg.CORBA.portable.InputStream#read_Object}. + * {@link org.omg.CORBA.portable.InputStream#read_Object()}. * * @param input the input stream to read from. */ @@ -120,7 +119,7 @@ public final class ObjectHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>Object</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_Object(Object) }. diff --git a/libjava/classpath/org/omg/CORBA/OctetSeqHelper.java b/libjava/classpath/org/omg/CORBA/OctetSeqHelper.java index df7b22ff52f..e03dba07346 100644 --- a/libjava/classpath/org/omg/CORBA/OctetSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/OctetSeqHelper.java @@ -1,5 +1,5 @@ /* OctetSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/OctetSeqHolder.java b/libjava/classpath/org/omg/CORBA/OctetSeqHolder.java index 62ea7381920..8c3e9cb6ddb 100644 --- a/libjava/classpath/org/omg/CORBA/OctetSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/OctetSeqHolder.java @@ -1,5 +1,5 @@ /* OctetSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class OctetSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_octet_array }. @@ -111,7 +111,7 @@ public final class OctetSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_octet_array }. diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java index 6feabdcfdb9..ecb9821dc35 100644 --- a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java +++ b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java @@ -1,5 +1,5 @@ /* PolicyErrorCodeHelper.java -- -Copyright (C) 2005 Free Software Foundation, Inc. +Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ public abstract class PolicyErrorCodeHelper { /** - * Delegates call to {@link Any.extract_short()}. + * Delegates call to {@link Any#extract_short()}. */ public static short extract(Any a) { @@ -75,7 +75,7 @@ public abstract class PolicyErrorCodeHelper } /** - * Delegates call to {@link Any.insert_short(short)}. + * Delegates call to {@link Any#insert_short(short)}. */ public static void insert(Any a, short that) { @@ -83,7 +83,7 @@ public abstract class PolicyErrorCodeHelper } /** - * Delegates call to {@link InputStream.read_short()}. + * Delegates call to {@link InputStream#read_short()}. */ public static short read(InputStream istream) { @@ -106,7 +106,7 @@ public abstract class PolicyErrorCodeHelper } /** - * Delegates call to {@link OutputStream#write_short()}. + * Delegates call to {@link OutputStream#write_short(short)}. */ public static void write(OutputStream ostream, short value) { diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java index 27b5b465e53..213acafc7e5 100644 --- a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java +++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java @@ -1,5 +1,5 @@ /* PolicyErrorHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,8 +59,8 @@ public abstract class PolicyErrorHelper { /** * Create the PolicyError typecode. The typecode defines a structure, named - * "PolicyError", containing the {@link PolicyErrorCode} (alias int) field, - * named "reason". + * "PolicyError", containing the PolicyErrorCode (alias int, see + * {@link PolicyErrorCodeHelper}) field, named "reason". */ public static TypeCode type() { diff --git a/libjava/classpath/org/omg/CORBA/PolicyHelper.java b/libjava/classpath/org/omg/CORBA/PolicyHelper.java index 53b56244eb2..4f88cd78396 100644 --- a/libjava/classpath/org/omg/CORBA/PolicyHelper.java +++ b/libjava/classpath/org/omg/CORBA/PolicyHelper.java @@ -1,5 +1,5 @@ /* PolicyHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,9 +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.StructMember; -import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.Delegate; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java index da0135c0222..54f2036759a 100644 --- a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java +++ b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java @@ -1,5 +1,5 @@ /* PolicyListHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,27 +41,19 @@ package org.omg.CORBA; import gnu.CORBA.Minor; import gnu.CORBA.OrbRestricted; -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.Delegate; import org.omg.CORBA.portable.InputStream; -import org.omg.CORBA.portable.ObjectImpl; import org.omg.CORBA.portable.OutputStream; /** * The helper operations for the -* CORBA object {@link Policy[]}. +* CORBA object {@link Policy}[]. * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public abstract class PolicyListHelper { /** - * Get the type code of the {@link Policy[]}. + * Get the type code of the {@link Policy}[]. */ public static TypeCode type() { diff --git a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java index 7d5f9bf7656..575fe4aa309 100644 --- a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java +++ b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java @@ -1,5 +1,5 @@ /* PolicyTypeHelper.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.StructMember; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CORBA/PrincipalHolder.java b/libjava/classpath/org/omg/CORBA/PrincipalHolder.java index 270427f3fdd..56cd565aa76 100644 --- a/libjava/classpath/org/omg/CORBA/PrincipalHolder.java +++ b/libjava/classpath/org/omg/CORBA/PrincipalHolder.java @@ -1,5 +1,5 @@ /* PrincipalHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ public final class PrincipalHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For {@link Principal}, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_Principal}. @@ -108,7 +108,7 @@ public final class PrincipalHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For {@link Principal} the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_Principal(Principal)} diff --git a/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java b/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java index a392002fd23..033a96819d3 100644 --- a/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java +++ b/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java @@ -1,5 +1,5 @@ /* RepositoryIdHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class RepositoryIdHelper { /** - * Insert the Repository Id into Any (uses {@link Any.insert_string}). + * Insert the Repository Id into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -66,7 +66,7 @@ public abstract class RepositoryIdHelper } /** - * Extract the Repository Id from Any ((uses {@link Any.extract_string}). + * Extract the Repository Id from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -104,7 +104,7 @@ public abstract class RepositoryIdHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (Repository Id) value to write. diff --git a/libjava/classpath/org/omg/CORBA/Request.java b/libjava/classpath/org/omg/CORBA/Request.java index f299d426b8a..beec7869185 100644 --- a/libjava/classpath/org/omg/CORBA/Request.java +++ b/libjava/classpath/org/omg/CORBA/Request.java @@ -1,5 +1,5 @@ /* Request.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -137,7 +137,7 @@ public abstract class Request public abstract ContextList contexts(); /** - * Get the context, previously set using {@link #cts(Context)}. + * Get the context, previously set using {@link #ctx(Context)}. * The context contains the details about this request. */ public abstract Context ctx(); @@ -168,7 +168,7 @@ public abstract class Request /** * Allow to access the response that has been previously sent using - * {@link send_deferred()}. + * {@link #send_deferred()}. * * @throws WrongTransaction if the transaction scope mismatches. */ @@ -190,7 +190,7 @@ public abstract class Request /** * Check if the response is received to the request that was - * previously send using {@link send_deferred()}. + * previously send using {@link #send_deferred()}. * * @return true if the response has been already received, false otherwise. */ diff --git a/libjava/classpath/org/omg/CORBA/ShortHolder.java b/libjava/classpath/org/omg/CORBA/ShortHolder.java index dfc4721f3f9..59bd4cf333d 100644 --- a/libjava/classpath/org/omg/CORBA/ShortHolder.java +++ b/libjava/classpath/org/omg/CORBA/ShortHolder.java @@ -1,5 +1,5 @@ /* ShortHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class ShortHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. For <code>short</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.InputStream#read_short}. @@ -113,7 +113,7 @@ public final class ShortHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * For <code>short</code>, the functionality * is delegated to * {@link org.omg.CORBA.portable.OutputStream#write_short(short) }. diff --git a/libjava/classpath/org/omg/CORBA/ShortSeqHelper.java b/libjava/classpath/org/omg/CORBA/ShortSeqHelper.java index 40124f216e9..5140bb96661 100644 --- a/libjava/classpath/org/omg/CORBA/ShortSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/ShortSeqHelper.java @@ -1,5 +1,5 @@ /* ShortSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/ShortSeqHolder.java b/libjava/classpath/org/omg/CORBA/ShortSeqHolder.java index 246d1ecf47e..b25024e9891 100644 --- a/libjava/classpath/org/omg/CORBA/ShortSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/ShortSeqHolder.java @@ -1,5 +1,5 @@ /* ShortSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class ShortSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_short_array }. @@ -111,7 +111,7 @@ public final class ShortSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_short_array }. diff --git a/libjava/classpath/org/omg/CORBA/StringSeqHelper.java b/libjava/classpath/org/omg/CORBA/StringSeqHelper.java index 4225c0bd12b..19f27292c0c 100644 --- a/libjava/classpath/org/omg/CORBA/StringSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/StringSeqHelper.java @@ -1,5 +1,5 @@ /* StringSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/StringSeqHolder.java b/libjava/classpath/org/omg/CORBA/StringSeqHolder.java index 71ac887e27b..1bc3281d353 100755 --- a/libjava/classpath/org/omg/CORBA/StringSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/StringSeqHolder.java @@ -1,5 +1,5 @@ /* StringSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class StringSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>and then all strings. * @@ -113,7 +113,7 @@ public final class StringSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code> and then all strings. * diff --git a/libjava/classpath/org/omg/CORBA/ULongLongSeqHelper.java b/libjava/classpath/org/omg/CORBA/ULongLongSeqHelper.java index 1148cb40865..b13f33cdf25 100644 --- a/libjava/classpath/org/omg/CORBA/ULongLongSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/ULongLongSeqHelper.java @@ -1,5 +1,5 @@ /* ULongLongSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/ULongLongSeqHolder.java b/libjava/classpath/org/omg/CORBA/ULongLongSeqHolder.java index 70b43bf7f45..cd9c023104b 100644 --- a/libjava/classpath/org/omg/CORBA/ULongLongSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/ULongLongSeqHolder.java @@ -1,5 +1,5 @@ /* ULongLongSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class ULongLongSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_ulonglong_array }. @@ -111,7 +111,7 @@ public final class ULongLongSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_ulonglong_array }. diff --git a/libjava/classpath/org/omg/CORBA/ULongSeqHelper.java b/libjava/classpath/org/omg/CORBA/ULongSeqHelper.java index dddc1323d7e..186350b2ce2 100644 --- a/libjava/classpath/org/omg/CORBA/ULongSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/ULongSeqHelper.java @@ -1,5 +1,5 @@ /* ULongSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/ULongSeqHolder.java b/libjava/classpath/org/omg/CORBA/ULongSeqHolder.java index 64d9db6ceee..35d9a4384ac 100644 --- a/libjava/classpath/org/omg/CORBA/ULongSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/ULongSeqHolder.java @@ -1,5 +1,5 @@ /* ULongSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class ULongSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_ulong_array }. @@ -111,7 +111,7 @@ public final class ULongSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_ulong_array }. diff --git a/libjava/classpath/org/omg/CORBA/UShortSeqHelper.java b/libjava/classpath/org/omg/CORBA/UShortSeqHelper.java index d1fc440a90d..0fcd4739fb7 100644 --- a/libjava/classpath/org/omg/CORBA/UShortSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/UShortSeqHelper.java @@ -1,5 +1,5 @@ /* UShortSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/UShortSeqHolder.java b/libjava/classpath/org/omg/CORBA/UShortSeqHolder.java index 47e33b9be02..3eb83c5242a 100644 --- a/libjava/classpath/org/omg/CORBA/UShortSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/UShortSeqHolder.java @@ -1,5 +1,5 @@ /* UShortSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class UShortSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.InputStream#read_ushort_array }. @@ -111,7 +111,7 @@ public final class UShortSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the * {@link org.omg.CORBA.portable.OutputStream#write_ushort_array }. diff --git a/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java b/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java index 1699d912d61..644666971ac 100644 --- a/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java +++ b/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java @@ -1,5 +1,5 @@ /* ValueBaseHelper.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,9 @@ import gnu.CORBA.typecodes.RecordTypeCode; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.ValueBase; +import java.io.ObjectOutputStream; import java.io.Serializable; /** @@ -105,7 +107,7 @@ public abstract class ValueBaseHelper /** * Get the typecode of the value type. - * @return + * @return the typecode of the value type */ public static TypeCode type() { diff --git a/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java b/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java index 6f57d17c3f1..58f48536ff2 100644 --- a/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java +++ b/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java @@ -1,5 +1,5 @@ /* ValueBaseHolder.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.CORBA; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; import org.omg.CORBA.portable.Streamable; +import org.omg.CORBA.portable.ValueBase; import java.io.Serializable; diff --git a/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java b/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java index 9845702985a..74bdb7b7a16 100644 --- a/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java +++ b/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java @@ -1,5 +1,5 @@ /* VersionSpecHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class VersionSpecHelper { /** - * Insert the VersionSpec into Any (uses {@link Any.insert_string}). + * Insert the VersionSpec into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -66,7 +66,7 @@ public abstract class VersionSpecHelper } /** - * Extract the VersionSpec from Any ((uses {@link Any.extract_string}). + * Extract the VersionSpec from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -104,7 +104,7 @@ public abstract class VersionSpecHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (VersionSpec) value to write. diff --git a/libjava/classpath/org/omg/CORBA/WCharSeqHelper.java b/libjava/classpath/org/omg/CORBA/WCharSeqHelper.java index 4bb92989d05..fe4d41650a7 100644 --- a/libjava/classpath/org/omg/CORBA/WCharSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/WCharSeqHelper.java @@ -1,5 +1,5 @@ /* WCharSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/WCharSeqHolder.java b/libjava/classpath/org/omg/CORBA/WCharSeqHolder.java index 72a9cc8c1e3..a1b04d1efe4 100644 --- a/libjava/classpath/org/omg/CORBA/WCharSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/WCharSeqHolder.java @@ -1,5 +1,5 @@ /* WCharSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,10 +87,10 @@ public final class WCharSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>) and then calls the - * {@link org.omg.CORBA.portable.InputStream#input.read_wchar_array }. + * {@link org.omg.CORBA.portable.InputStream#read_wchar_array }. * * @param input the input stream to read from. */ @@ -111,10 +111,10 @@ public final class WCharSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code>) and then calls the - * {@link org.omg.CORBA.portable.OutputStream#input.write_wchar_array }. + * {@link org.omg.CORBA.portable.OutputStream#write_wchar_array }. * * @param output the output stream to write into. */ diff --git a/libjava/classpath/org/omg/CORBA/WStringSeqHelper.java b/libjava/classpath/org/omg/CORBA/WStringSeqHelper.java index 356cf0dd21c..ea8eac62742 100644 --- a/libjava/classpath/org/omg/CORBA/WStringSeqHelper.java +++ b/libjava/classpath/org/omg/CORBA/WStringSeqHelper.java @@ -1,5 +1,5 @@ /* WStringSeqHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.ArrayTypeCode; import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.Streamable; /** * Provides static helper methods for working with diff --git a/libjava/classpath/org/omg/CORBA/WStringSeqHolder.java b/libjava/classpath/org/omg/CORBA/WStringSeqHolder.java index 68b77ff6a3a..b909210f3e8 100755 --- a/libjava/classpath/org/omg/CORBA/WStringSeqHolder.java +++ b/libjava/classpath/org/omg/CORBA/WStringSeqHolder.java @@ -1,5 +1,5 @@ /* WStringSeqHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,7 +87,7 @@ public final class WStringSeqHolder } /** - * Fill in the {@link value } field by reading the required data + * Fill in the {@link #value } field by reading the required data * from the given stream. This method first reads the array size * (as CORBA <code>long</code>and then all strings. * @@ -113,7 +113,7 @@ public final class WStringSeqHolder } /** - * Write the {@link value } field to the given stream. + * Write the {@link #value } field to the given stream. * This method first writes the array size * (as CORBA <code>long</code> and then all strings. * diff --git a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java index 27368a4c03a..96673fd5792 100644 --- a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java +++ b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java @@ -1,5 +1,5 @@ /* WrongTransactionHelper.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/CORBA/_IDLTypeStub.java b/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java index 6661b0c4702..de09b89a7b0 100644 --- a/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java +++ b/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java @@ -1,5 +1,5 @@ /* _IDLTypeStub.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/CORBA/_PolicyStub.java b/libjava/classpath/org/omg/CORBA/_PolicyStub.java index 50481fe17a0..f633ccbaf65 100644 --- a/libjava/classpath/org/omg/CORBA/_PolicyStub.java +++ b/libjava/classpath/org/omg/CORBA/_PolicyStub.java @@ -1,5 +1,5 @@ /* _PolicyStub.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,8 +39,6 @@ exception statement from your version. */ package org.omg.CORBA; 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; diff --git a/libjava/classpath/org/omg/CORBA/portable/BoxedValueHelper.java b/libjava/classpath/org/omg/CORBA/portable/BoxedValueHelper.java index d869bdc1851..47c2b910680 100644 --- a/libjava/classpath/org/omg/CORBA/portable/BoxedValueHelper.java +++ b/libjava/classpath/org/omg/CORBA/portable/BoxedValueHelper.java @@ -1,5 +1,5 @@ /* BoxedValueHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,7 +63,7 @@ public interface BoxedValueHelper /** * Read this value type from the CDR stream. * - * @param is a stream to read from. + * @param istream is a stream to read from. * * @return a loaded value type. */ @@ -72,8 +72,8 @@ public interface BoxedValueHelper /** * Write this value type to the CDR stream. * - * @param os a stream to write to. + * @param ostream a stream to write to. * @param value a value to write. */ void write_value(OutputStream ostream, Serializable value); -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/CORBA/portable/Delegate.java b/libjava/classpath/org/omg/CORBA/portable/Delegate.java index fce04887e91..2f056ac3177 100644 --- a/libjava/classpath/org/omg/CORBA/portable/Delegate.java +++ b/libjava/classpath/org/omg/CORBA/portable/Delegate.java @@ -1,5 +1,5 @@ /* Delegate.java -- -Copyright (C) 2005 Free Software Foundation, Inc. +Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -242,7 +242,7 @@ public abstract class Delegate /** * Return the hashcode for this CORBA object. The default implementation - * delegates call to {@link #hash(int)}, passing Integer.MAX_VALUE as an + * delegates call to {@link #hash(org.omg.CORBA.Object, int)}, passing Integer.MAX_VALUE as an * argument. * * @param target the object, for that the hash code must be computed. @@ -408,7 +408,7 @@ public abstract class Delegate * * @param self the CORBA object, to that the string representation must be * returned. By default, the call is delegated to - * {@link java.lang.Object.toString()}. + * {@link java.lang.Object#toString()}. * * @return the string representation. */ diff --git a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java index f2f21a79e17..f1e348e5304 100644 --- a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java +++ b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java @@ -1,5 +1,5 @@ /* ObjectImpl.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,7 @@ exception statement from your version. */ package org.omg.CORBA.portable; +import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.Context; import org.omg.CORBA.ContextList; import org.omg.CORBA.DomainManager; @@ -156,9 +157,9 @@ public abstract class ObjectImpl * @throws BAD_PARAM if the policy of the given type is not * associated with this object, or if it is not supported by this ORB. */ - public Policy _get_policy(int type) + public Policy _get_policy(int a_policy_type) { - return delegate.get_policy(this, type); + return delegate.get_policy(this, a_policy_type); } /** @@ -173,7 +174,7 @@ public abstract class ObjectImpl * object. The returned value must not change during the object * lifetime. * - * @param maximum the maximal value to return. + * @param max the maximal value to return. * * @return the hashcode. */ @@ -204,7 +205,7 @@ public abstract class ObjectImpl /** * Check if this object can be referenced by the given repository id. * - * @param repositoryIdentifer the repository id. + * @param idl_id the repository id. * * @return true if the passed parameter is a repository id of this * CORBA object. @@ -233,8 +234,6 @@ public abstract class ObjectImpl /** * Returns true if the object is local. * - * @param self the object to check. - * * @return false, always (following 1.4 specs). Override to get * functionality. */ @@ -278,10 +277,8 @@ public abstract class ObjectImpl * Release the reply stream back to ORB after finishing reading the data * from it. * - * @param input the stream, normally returned by {@link #invoke} or + * @param stream the stream, normally returned by {@link #_invoke} or * {@link ApplicationException#getInputStream()}, can be null. - * - * @throws NO_IMPLEMENT, always (following the 1.4 specification). */ public void _releaseReply(InputStream stream) { @@ -292,7 +289,7 @@ public abstract class ObjectImpl /** * Create a request to invoke the method of this CORBA object. * - * @param operation the name of the method to invoke. + * @param method the name of the method to invoke. * * @return the request. */ @@ -304,7 +301,7 @@ public abstract class ObjectImpl /** * Create a request to invoke the method of this CORBA object. * - * @param operation the name of the method to invoke. + * @param method the name of the method to invoke. * @param response_expected specifies if this is one way message or the * response to the message is expected. * @@ -323,7 +320,6 @@ public abstract class ObjectImpl * * The default method returns without action. * - * @param self the object. * @param servant the servant. */ public void _servant_postinvoke(ServantObject servant) @@ -336,9 +332,8 @@ public abstract class ObjectImpl * The servant can also be casted to the expected type, calling the * required method directly. * - * @param self the object - * @param operation the operation - * @param expectedType the expected type of the servant. + * @param method the operation + * @param expected_type the expected type of the servant. * * This implementation always returns null; override for different * behavior. @@ -372,10 +367,10 @@ public abstract class ObjectImpl * them. */ public org.omg.CORBA.Object _set_policy_override(Policy[] policies, - SetOverrideType set_add + SetOverrideType how ) { - return delegate.set_policy_override(this, policies, set_add); + return delegate.set_policy_override(this, policies, how); } /** diff --git a/libjava/classpath/org/omg/CORBA/portable/ServantObject.java b/libjava/classpath/org/omg/CORBA/portable/ServantObject.java index b35dedc3529..253defc0a92 100644 --- a/libjava/classpath/org/omg/CORBA/portable/ServantObject.java +++ b/libjava/classpath/org/omg/CORBA/portable/ServantObject.java @@ -1,5 +1,5 @@ /* ServantObject.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 @@ package org.omg.CORBA.portable; * * @see ObjectImpl#_servant_preinvoke(String, Class) * @see ObjectImpl#_servant_postinvoke(ServantObject) - * @see Delegate#servant_preinvoke(org.omg.CORBA.Object, String operation, Class) + * @see Delegate#servant_preinvoke(org.omg.CORBA.Object, String, Class) * @see Delegate#servant_postinvoke(org.omg.CORBA.Object, ServantObject) * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) diff --git a/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java b/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java index ce9b2ca2840..7ab61a6d470 100644 --- a/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java +++ b/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java @@ -1,5 +1,5 @@ /* StreamableValue.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,7 @@ import java.io.Serializable; * If the value type does not provide the user defined methods for reading * and writing its content, it must implement this interface for reading * and writing the content in a default way. This is done by implementing - * the {@link Streamable#read} and {@link Streamable#write}. IDL compiler + * the {@link Streamable#_read} and {@link Streamable#_write}. IDL compiler * should generate the implementation of this interface automatically. * * @see CustomValue for specifying the user-defined io methods. diff --git a/libjava/classpath/org/omg/CORBA/portable/ValueFactory.java b/libjava/classpath/org/omg/CORBA/portable/ValueFactory.java index 339bcddb3f5..aaffe8684d9 100644 --- a/libjava/classpath/org/omg/CORBA/portable/ValueFactory.java +++ b/libjava/classpath/org/omg/CORBA/portable/ValueFactory.java @@ -59,4 +59,4 @@ public interface ValueFactory * the stream. */ Serializable read_value(org.omg.CORBA_2_3.portable.InputStream from_stream); -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/CORBA_2_3/ORB.java b/libjava/classpath/org/omg/CORBA_2_3/ORB.java index 82660fea705..0895b803788 100644 --- a/libjava/classpath/org/omg/CORBA_2_3/ORB.java +++ b/libjava/classpath/org/omg/CORBA_2_3/ORB.java @@ -1,5 +1,5 @@ /* ORB.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,12 +38,14 @@ exception statement from your version. */ package org.omg.CORBA_2_3; +import javax.rmi.CORBA.Tie; + import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.NO_IMPLEMENT; import org.omg.CORBA.portable.ValueFactory; /** - * This class should provide the {@link org.omg.CORBA.ORB) ORB extensions, + * This class should provide the {@link org.omg.CORBA.ORB}) ORB extensions, * defined in the OMG CORBA version 2.3 specification. However in the * Sun's API specification is written that this functionality is not * implemented at least at least till 1.4 inclusive. @@ -93,10 +95,9 @@ public abstract class ORB * * @param repository_id a repository id * - * @return never * @throws NO_IMPLEMENT, always. */ - public void unregister_value_factory(String id) + public void unregister_value_factory(String repository_id) { throw new NO_IMPLEMENT(); } @@ -117,7 +118,7 @@ public abstract class ORB } /** - * This method is called by RMI-IIOP {@link javax.rmi.Tie#orb(ORB)}, + * This method is called by RMI-IIOP {@link Tie#orb(ORB)}, * passing <code>this</code> as parameter. The ORB will try to connect * that tie as one of its objects. */ diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java index 23055ef2d4d..349590eed2e 100644 --- a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java +++ b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java @@ -1,5 +1,5 @@ /* InputStream.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ public abstract class InputStream * * As specified in OMG specification, this reads a single * boolean and then delegates either to {@link #read_Object()} (for false) - * or to {@link #read_Value()} (for true). + * or to {@link #read_value()} (for true). * * @return an abstract interface, unmarshaled from the stream. */ @@ -93,7 +93,7 @@ public abstract class InputStream * * As specified in OMG specification, this reads a single * boolean and then delegates either to {@link #read_Object(Class)} (for false) - * or to {@link #read_Value(Class)} (for true). + * or to {@link #read_value(Class)} (for true). * * @param clz a base class for the abstract interface. * @@ -125,8 +125,6 @@ public abstract class InputStream * {@link #read_value(Class)} or {@link #read_value(Serializable)} * instead. * - * @param repository_id a repository id of the value type. - * * @return an value type structure, unmarshaled from the stream */ public Serializable read_value() diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java index 70f9a4913ba..f1369f78246 100644 --- a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java +++ b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java @@ -1,5 +1,5 @@ /* OutputStream.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.CORBA_2_3.portable; import gnu.CORBA.CDR.Vio; import org.omg.CORBA.portable.BoxedValueHelper; +import org.omg.CORBA.portable.CustomValue; +import org.omg.CORBA.portable.StreamableValue; import org.omg.CORBA.portable.ValueBase; import java.io.Serializable; @@ -92,7 +94,7 @@ public abstract class OutputStream * Writes a value type into the output stream. * * The value type must implement either {@link CustomValue} (for user-defined - * writing method) or {@link StramableValue} (for standard writing using code, + * writing method) or {@link StreamableValue} (for standard writing using code, * generated by IDL compiler). * * The written record will have a repository id, matching the class of the @@ -109,7 +111,7 @@ public abstract class OutputStream * Write value to the stream using the boxed value helper. * * The value type must implement either {@link CustomValue} - * (for user-defined writing method) or {@link StramableValue} + * (for user-defined writing method) or {@link StreamableValue} * (for standard writing using code, generated by IDL compiler). * * @param value a value to write. @@ -129,7 +131,7 @@ public abstract class OutputStream * writing two Id inheritance hierarchy. * * The value type must implement either {@link CustomValue} - * (for user-defined writing method) or {@link StramableValue} + * (for user-defined writing method) or {@link StreamableValue} * (for standard writing using code, generated by IDL compiler). * * @param value a value type object to write. @@ -144,7 +146,7 @@ public abstract class OutputStream * repository id. * * The value type must implement either {@link CustomValue} (for user-defined - * writing method) or {@link StramableValue} (for standard writing using code, + * writing method) or {@link StreamableValue} (for standard writing using code, * generated by IDL compiler). * * @param repository_id a repository id of the value type. diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java index cb17d5748b3..5430905e5a0 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java @@ -1,5 +1,5 @@ /* BindingIteratorHelper.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; @@ -126,15 +125,13 @@ public abstract class BindingIteratorHelper * performed to verify that the object actually supports the requested type. * The {@link BAD_OPERATION} will be thrown if unsupported operations are * invoked on the new returned reference, but no failure is expected at the - * time of the unchecked_narrow. + * time of the unchecked_narrow. See OMG issue 4158. * * @param obj the object to cast. * * @return the casted binding iterator. * * @since 1.5 - * - * @see OMG issue 4158. */ public static BindingIterator unchecked_narrow(org.omg.CORBA.Object obj) { diff --git a/libjava/classpath/org/omg/CosNaming/BindingType.java b/libjava/classpath/org/omg/CosNaming/BindingType.java index d78990349c0..480e7bb33ed 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingType.java +++ b/libjava/classpath/org/omg/CosNaming/BindingType.java @@ -1,5 +1,5 @@ /* BindingType.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,7 +62,7 @@ public class BindingType /** * This constant means that the binding has been created by the - * means, different from the listed in {@link _ncontext} description. + * means, different from the listed in {@link #_ncontext} description. */ public static final int _nobject = 0; @@ -75,7 +75,7 @@ public class BindingType /** * This constant means that the binding has been created by the - * means, different from the listed in {@link _ncontext} description. + * means, different from the listed in {@link #_ncontext} description. */ public static final BindingType nobject = new BindingType(_nobject); @@ -101,7 +101,7 @@ public class BindingType * @param value the binding type code. * @return the matching binding type instance. * - * @throws BAD_KIND if there is no matching binding type for + * @throws BAD_PARAM if there is no matching binding type for * the passed value. */ public static BindingType from_int(int value) diff --git a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java index 8f456ee70da..542f3e0e97b 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java @@ -1,5 +1,5 @@ /* BindingTypeHelper.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.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/CosNaming/IstringHelper.java b/libjava/classpath/org/omg/CosNaming/IstringHelper.java index b90b452e69f..df680f43627 100644 --- a/libjava/classpath/org/omg/CosNaming/IstringHelper.java +++ b/libjava/classpath/org/omg/CosNaming/IstringHelper.java @@ -1,5 +1,5 @@ /* IstringHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class IstringHelper { /** - * Insert the IString into Any (uses {@link Any.insert_string}). + * Insert the IString into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -70,7 +70,7 @@ public abstract class IstringHelper } /** - * Extract the IString from Any ((uses {@link Any.extract_string}). + * Extract the IString from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -100,7 +100,7 @@ public abstract class IstringHelper /** * Calls {@link InputStream#read_string()}. * - * @param instream the stream to read from. + * @param istream the stream to read from. */ public static String read(InputStream istream) { @@ -108,7 +108,7 @@ public abstract class IstringHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (IString) value to write. diff --git a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java index 8127aa01d9c..0f7e73b45bd 100644 --- a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java @@ -1,5 +1,5 @@ /* NameComponentHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,7 +81,7 @@ public abstract class NameComponentHelper /** * Get the repository Id of the {@link NameComponent}. - * @return + * @return "IDL:omg.org/CosNaming/NameComponent:1.0" */ public static String id() { diff --git a/libjava/classpath/org/omg/CosNaming/NameHelper.java b/libjava/classpath/org/omg/CosNaming/NameHelper.java index f66fa4f099d..d1dafb96064 100644 --- a/libjava/classpath/org/omg/CosNaming/NameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameHelper.java @@ -1,5 +1,5 @@ /* NameHelper.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.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java index aca0e9dfd23..98d0b4a8c42 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java @@ -1,5 +1,5 @@ /* NamingContextExtHelper.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; @@ -127,15 +126,13 @@ public abstract class NamingContextExtHelper * performed to verify that the object actually supports the requested type. * The {@link BAD_OPERATION} will be thrown if unsupported operations are * invoked on the new returned reference, but no failure is expected at the - * time of the unchecked_narrow. + * time of the unchecked_narrow. See OMG issue 4158. * * @param obj the object to cast. * * @return the casted NamingContextExt * * @since 1.5 - * - * @see OMG issue 4158. */ public static NamingContextExt unchecked_narrow(org.omg.CORBA.Object obj) { diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java index 81046074416..8333ff82633 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java @@ -1,5 +1,5 @@ /* AddressHelper.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.ORB; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; -import org.omg.CORBA.portable.Streamable; /** * Helper operations for address. Address is directly mapped into diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java index c7f3849a0c1..ea17473e30c 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java @@ -1,5 +1,5 @@ /* InvalidAddressHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,6 @@ package org.omg.CosNaming.NamingContextExtPackage; import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; -import org.omg.CORBA.ORB; import org.omg.CORBA.StructMember; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java index 1149194624c..5ded186a65a 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java @@ -1,5 +1,5 @@ /* InvalidAddressHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,6 +42,7 @@ import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; import org.omg.CORBA.portable.Streamable; +import org.omg.CosNaming.NamingContextPackage.NotEmpty; /** * The holder for the exception {@link InvalidAddress}. diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java index 06faa2ff940..f020cef8244 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java @@ -1,5 +1,5 @@ /* StringNameHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,11 +41,9 @@ package org.omg.CosNaming.NamingContextExtPackage; import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; -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.CORBA.portable.Streamable; /** * Helper operations for the string name. diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java index 173bb989eb7..b565530e553 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java @@ -1,5 +1,5 @@ /* URLStringHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,6 @@ package org.omg.CosNaming.NamingContextExtPackage; import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; -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/CosNaming/NamingContextHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java index 48b90c25ab0..6bbd0729f7e 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java @@ -1,5 +1,5 @@ /* NamingContextHelper.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; @@ -135,15 +134,11 @@ public abstract class NamingContextHelper * to verify that the object actually supports the requested type. The * {@link BAD_OPERATION} will be thrown if unsupported operations are invoked * on the new returned reference, but no failure is expected at the time of - * the unchecked_narrow. + * the unchecked_narrow. See OMG issue 4158. * * @param obj the object to cast. * * @return the casted NamingContext. - * - * @since 1.5 - * - * @see OMG issue 4158. */ public static NamingContext unchecked_narrow(org.omg.CORBA.Object obj) { diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java index f43111cb20b..1eaf50d1269 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java @@ -1,5 +1,5 @@ /* AlreadyBoundHelper.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.StructMember; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java index 90ca3a5c5b3..59784ea1b86 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/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. @@ -40,7 +40,6 @@ package org.omg.CosNaming.NamingContextPackage; import org.omg.CORBA.UserException; import org.omg.CORBA.portable.IDLEntity; -import org.omg.CosNaming.NameComponent; /** * The exception is thrown if the name has the zero length or is otherwise diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java index 5893332b804..b5a428cac2e 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/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. @@ -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.StructMember; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmpty.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmpty.java index 3fe98d56400..c80cfcc7acc 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmpty.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmpty.java @@ -71,4 +71,4 @@ public final class NotEmpty { super(why); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java index a9b802f9549..c4e06c39c16 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java @@ -1,5 +1,5 @@ /* NotEmptyHelper.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.StructMember; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java index 9d44dcbf383..ddc7701a58b 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java @@ -1,5 +1,5 @@ /* NotFoundReasonHelper.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.portable.InputStream; import org.omg.CORBA.portable.OutputStream; diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java index fc41b183392..a18801c66cb 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java @@ -1,5 +1,5 @@ /* NotFoundReasonHolder.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,7 +81,9 @@ public final class NotFoundReasonHolder /** * Get the type code of {@link NotFoundReason}. - * @return + * + * @return the typecode of enumeration, allowed value names being + * "missing_node", "not_context" and "not_object" */ public TypeCode _type() { diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java b/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java index 03630f8d674..617f7aec4ab 100644 --- a/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java +++ b/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java @@ -66,7 +66,7 @@ public abstract class _NamingContextExtImplBase extends _NamingContextImplBase implements NamingContextExt, InvokeHandler { - static Hashtable _methods = new Hashtable(); + static Hashtable<String,Integer> _methods = new Hashtable<String,Integer>(); static { @@ -234,4 +234,4 @@ public abstract class _NamingContextExtImplBase } gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java index 33bddef5d74..1c2a56be60a 100644 --- a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java +++ b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java @@ -82,7 +82,7 @@ public abstract class _NamingContextImplBase * As there are quite many methods, it may be sensible to use the hashtable. * This field is also reused in NamingContextPOA. */ - static Hashtable methods = new Hashtable(); + static Hashtable<String,Integer> methods = new Hashtable<String,Integer>(); /** * Put all methods into the table. @@ -412,4 +412,4 @@ public abstract class _NamingContextImplBase gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java b/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java index ddf1422ff17..31ed2ba0253 100644 --- a/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java @@ -1,5 +1,5 @@ /* AnySeqHelper.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.DynamicAny; import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; +import org.omg.CORBA.AnySeqHolder; import org.omg.CORBA.ORB; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java index 97b54873fbd..612ba71c3f8 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java @@ -1,5 +1,5 @@ /* DynAnyFactoryHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,9 +42,9 @@ package org.omg.DynamicAny; 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; @@ -88,15 +88,13 @@ public abstract class DynAnyFactoryHelper * Narrow the given object to the DynAnyFactory. 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 DynAnyFactory. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynAnyFactory unchecked_narrow(org.omg.CORBA.Object obj) { @@ -163,7 +161,7 @@ public abstract class DynAnyFactoryHelper * This should read DynAnyFactory from the CDR input stream, but (following * the JDK 1.5 API) it does not. * - * @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/DynamicAny/DynAnyFactoryOperations.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryOperations.java index 058e369580d..c3cd919ade1 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryOperations.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryOperations.java @@ -1,5 +1,5 @@ /* DynAnyFactoryOperations.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.DynamicAny; import org.omg.CORBA.Any; +import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode; @@ -83,7 +84,7 @@ public interface DynAnyFactoryOperations * </tr> * <tr> * <td>{@link Any}</td> - * <td>{@link Any} with no value and typecode of kind {@link TCKind.tk_null}</td> + * <td>{@link Any} with no value and typecode of kind {@link TCKind#tk_null}</td> * <td>{@link DynAny}</td> * </tr> * <tr> diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java index 96dbb5fb63d..0184172265d 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java @@ -1,5 +1,5 @@ /* InconsistentTypeCodeHelper.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/DynamicAny/DynAnyHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java index a238bf48baa..315cddbd2dc 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java @@ -1,5 +1,5 @@ /* DynAnyHelper.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.DynamicAny; 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; @@ -86,15 +86,13 @@ public abstract class DynAnyHelper * Narrow the given object to the DynAny. 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 DynAny. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynAny unchecked_narrow(org.omg.CORBA.Object obj) { @@ -160,7 +158,7 @@ public abstract class DynAnyHelper * This should read DynAny from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/DynAnyOperations.java b/libjava/classpath/org/omg/DynamicAny/DynAnyOperations.java index 0e743136d38..a009f4c8805 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyOperations.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyOperations.java @@ -1,5 +1,5 @@ /* DynAnyOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -263,7 +263,7 @@ public interface DynAnyOperations * Insert the {@link Any} value into the enclosed {@link Any} inside this * DynAny. * - * @param a_x the value being inserted. + * @param an_any the value being inserted. * @throws InvalidValue if the value type does not match the typecode of the * enclosed {@link Any}. */ @@ -452,7 +452,7 @@ public interface DynAnyOperations throws InvalidValue, TypeMismatch; /** - * Advances the internal pointer, described in the {@link current_component}, + * Advances the internal pointer, described in the {@link #current_component}, * one position forward. * * @return true if the pointer now points to the new component, false if there @@ -462,13 +462,13 @@ public interface DynAnyOperations boolean next(); /** - * Moves the internal pointer, described in the {@link current_component}, to + * Moves the internal pointer, described in the {@link #current_component}, to * the first component. */ void rewind(); /** - * Moves the internal pointer, described in the {@link current_component}, to + * Moves the internal pointer, described in the {@link #current_component}, to * the given position. * * @param p the number of the internal component on that the internal pointer @@ -537,4 +537,4 @@ public interface DynAnyOperations */ DynAny get_dyn_any() throws TypeMismatch, InvalidValue; -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java index 0258d358919..d27ad6a6b8b 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java @@ -1,5 +1,5 @@ /* InvalidValueHelper.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/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java index 244a98aa0b8..7d4fc878938 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java @@ -1,5 +1,5 @@ /* TypeMismatchHelper.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/DynamicAny/DynAnySeqHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java index 66208ea19ee..f7550fd7969 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java @@ -1,5 +1,5 @@ /* DynAnySeq.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; /** - * A helper operations for the array of {@link DynAny} ({@link DynAnySeq}). + * A helper operations for the array of {@link DynAny} (DynAny[]). * Following the 1.5 JDK specifications, DynAny (and hence an sequence of * DynAny's) is always a local object, so the two methods of this helper * ({@link #read} and {@link #write} are not in use, always throwing @@ -133,7 +133,7 @@ public abstract class DynAnySeqHelper * The method should write this object to the CDR input stream, but * (following the JDK 1.5 API) it does not. * - * @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/DynamicAny/DynArrayHelper.java b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java index 26824d747ae..4cd3e3a52cf 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java @@ -1,5 +1,5 @@ /* DynArrayHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,9 @@ package org.omg.DynamicAny; 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; @@ -85,16 +85,14 @@ public abstract class DynArrayHelper * Narrow the given object to the DynArray. 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 DynArray. * * @since 1.5 - * - * @see OMG issue 4158. - */ + */ public static DynArray unchecked_narrow(org.omg.CORBA.Object obj) { return narrow(obj); @@ -159,7 +157,7 @@ public abstract class DynArrayHelper * This should read DynArray from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/DynEnumHelper.java b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java index 9af2e11948e..da63e844f91 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java @@ -1,5 +1,5 @@ /* DynEnumHelper.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.DynamicAny; 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; @@ -86,15 +86,13 @@ public abstract class DynEnumHelper * Narrow the given object to the DynEnum. 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 DynEnum. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynEnum unchecked_narrow(org.omg.CORBA.Object obj) { @@ -160,7 +158,7 @@ public abstract class DynEnumHelper * This should read DynEnum from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/DynFixedHelper.java b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java index 4471bb26b03..e730d43bb85 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java @@ -1,5 +1,5 @@ /* DynFixedHelper.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.DynamicAny; 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; @@ -86,15 +86,13 @@ public abstract class DynFixedHelper * Narrow the given object to the DynFixed. 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 DynFixed. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynFixed unchecked_narrow(org.omg.CORBA.Object obj) { @@ -160,7 +158,7 @@ public abstract class DynFixedHelper * This should read DynFixed from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/DynSequenceHelper.java b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java index 0aa7cdd2ab9..f330108b0eb 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java @@ -1,5 +1,5 @@ /* DynSequenceHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,9 @@ package org.omg.DynamicAny; 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; @@ -85,15 +85,13 @@ public abstract class DynSequenceHelper * Narrow the given object to the DynSequence. 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 DynSequence. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynSequence unchecked_narrow(org.omg.CORBA.Object obj) { @@ -159,7 +157,7 @@ public abstract class DynSequenceHelper * This should read DynSequence from the CDR input stream, but (following the * JDK 1.5 API) it does not. * - * @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/DynamicAny/DynStructHelper.java b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java index c683260f67d..077b7d09824 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java @@ -1,5 +1,5 @@ /* DynStructHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,9 @@ package org.omg.DynamicAny; 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; @@ -85,15 +85,13 @@ public abstract class DynStructHelper * Narrow the given object to the DynStruct. 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 DynStruct. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynStruct unchecked_narrow(org.omg.CORBA.Object obj) { @@ -159,7 +157,7 @@ public abstract class DynStructHelper * This should read DynStruct from the CDR input stream, but (following the * JDK 1.5 API) it does not. * - * @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/DynamicAny/DynStructOperations.java b/libjava/classpath/org/omg/DynamicAny/DynStructOperations.java index 3b5af171044..03524b2f9ab 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynStructOperations.java +++ b/libjava/classpath/org/omg/DynamicAny/DynStructOperations.java @@ -1,5 +1,5 @@ /* DynStructOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -101,7 +101,7 @@ public interface DynStructOperations * @specnote The name-based value assignment is not supported by Sun's jdk * 1.4. * - * @param an array of NameDynValuePair's, each defining a single field in the + * @param value an array of NameDynValuePair's, each defining a single field in the * structure. * * @throws TypeMismatch if the member of the passed array has a different type @@ -125,7 +125,7 @@ public interface DynStructOperations * @specnote The name-based value assignment is not supported by Sun's jdk * 1.4. * - * @param an array of NameValuePair's, each defining a single field in the + * @param value an array of NameValuePair's, each defining a single field in the * structure. * * @throws TypeMismatch if the member of the passed array has a different type diff --git a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java index e868ea41260..f1016d078af 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java @@ -1,5 +1,5 @@ /* DynUnionHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,9 @@ package org.omg.DynamicAny; 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; @@ -85,15 +85,13 @@ public abstract class DynUnionHelper * Narrow the given object to the DynUnion. 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 DynUnion. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynUnion unchecked_narrow(org.omg.CORBA.Object obj) { @@ -159,7 +157,7 @@ public abstract class DynUnionHelper * This should read DynUnion from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/DynUnionOperations.java b/libjava/classpath/org/omg/DynamicAny/DynUnionOperations.java index c046e69e70e..30b891a2de9 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynUnionOperations.java +++ b/libjava/classpath/org/omg/DynamicAny/DynUnionOperations.java @@ -146,4 +146,4 @@ public interface DynUnionOperations */ void set_to_no_active_member() throws TypeMismatch; -}
\ No newline at end of file +} diff --git a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java index ad75bc31fe3..17d9bbc5a8b 100644 --- a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java @@ -1,5 +1,5 @@ /* DynValueHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,9 @@ package org.omg.DynamicAny; 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; @@ -85,15 +85,13 @@ public abstract class DynValueHelper * Narrow the given object to the DynValue. 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 DynValue. * * @since 1.5 - * - * @see OMG issue 4158. */ public static DynValue unchecked_narrow(org.omg.CORBA.Object obj) { @@ -159,7 +157,7 @@ public abstract class DynValueHelper * This should read DynValue from the CDR input stream, but (following the JDK * 1.5 API) it does not. * - * @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/DynamicAny/FieldNameHelper.java b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java index f15b8adfa4f..fb5ea1c7fc7 100644 --- a/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java @@ -59,7 +59,7 @@ import org.omg.CORBA.portable.OutputStream; public abstract class FieldNameHelper { /** - * Insert the FieldName into Any (uses {@link Any.insert_string}). + * Insert the FieldName into Any (uses {@link Any#insert_string}). * * @param a the Any to insert into. * @param that the string to insert. @@ -70,7 +70,7 @@ public abstract class FieldNameHelper } /** - * Extract the FieldName from Any ((uses {@link Any.extract_string}). + * Extract the FieldName from Any ((uses {@link Any#extract_string}). * * @param a the Any to extract from. */ @@ -100,7 +100,7 @@ public abstract class FieldNameHelper /** * Calls {@link InputStream#read_string()}. * - * @param instream the stream to read from. + * @param istream the stream to read from. */ public static String read(InputStream istream) { @@ -108,7 +108,7 @@ public abstract class FieldNameHelper } /** - * Calls {@link OutputStream#write_string()}. + * Calls {@link OutputStream#write_string(String)}. * * @param ostream the stream to write into. * @param value the string (FieldName) value to write. diff --git a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java index a9d9edba71a..4e133a51344 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java @@ -1,5 +1,5 @@ /* NameDynAnyPairHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -151,7 +151,7 @@ public abstract class NameDynAnyPairHelper * The method should write this object to the CDR input stream, but * (following the JDK 1.5 API) it does not. * - * @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/DynamicAny/NameDynAnyPairSeqHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java index 56e6104eca3..817ed8a70cc 100644 --- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java +++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java @@ -1,5 +1,5 @@ /* NameDynAnyPairSeq.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 org.omg.CORBA.portable.OutputStream; /** * A helper operations for the array of {@link NameDynAnyPair} - * ({@link NameDynAnyPairSeq}). + * (NameDynAnyPair[]). * * Following the 1.5 JDK specifications, DynAny (and hence the sequence * of structures, containing DynAny) is always a local object. @@ -132,7 +132,7 @@ public abstract class NameDynAnyPairSeqHelper * The method should write this object to the CDR input stream, but * (following the JDK 1.5 API) it does not. * - * @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/IOP/CodecFactoryHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java index 89404f7d584..d3dc40935ae 100644 --- a/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java @@ -1,5 +1,5 @@ /* CodecFactoryHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,10 +41,10 @@ package org.omg.IOP; 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.CompletionStatus; 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; @@ -120,15 +120,13 @@ public abstract class CodecFactoryHelper * Narrow the given object to the CodecFactory. 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 CodecFactory. * * @since 1.5 - * - * @see OMG issue 4158. */ public static CodecFactory unchecked_narrow(org.omg.CORBA.Object obj) { @@ -141,7 +139,7 @@ public abstract class CodecFactoryHelper * * @specnote Suns implementation (1.4) throws this exception either. * - * @throws {@link MARSHAL}, minor code 0 and incomplete, always. + * @throws MARSHAL, minor code 0 and incomplete, always. */ public static CodecFactory read(InputStream input) { @@ -154,7 +152,7 @@ public abstract class CodecFactoryHelper * * @specnote Suns implementation (1.4) throws this exception either. * - * @throws {@link MARSHAL}, minor code 0 and incomplete, always. + * @throws MARSHAL, minor code 0 and incomplete, always. */ public static void write(OutputStream output, CodecFactory value) { diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java index 8861e43da5f..2110f0d5b86 100644 --- a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java @@ -1,5 +1,5 @@ /* UnknownEncodingHelper.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 gnu.CORBA.OrbRestricted; import org.omg.CORBA.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; -import org.omg.CORBA.TCKind; import org.omg.CORBA.StructMember; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/IOP/CodecOperations.java b/libjava/classpath/org/omg/IOP/CodecOperations.java index 3dfae1207a7..873f546072a 100644 --- a/libjava/classpath/org/omg/IOP/CodecOperations.java +++ b/libjava/classpath/org/omg/IOP/CodecOperations.java @@ -1,5 +1,5 @@ /* CodecOperations.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,7 +66,7 @@ public interface CodecOperations * by this {@link Codec} (wide char and wide string are not supported * by ENCODING_CDR_ENCAPS v 1.0). * - * @see decode(byte[]) + * @see #decode(byte[]) */ byte[] encode(Any that) throws InvalidTypeForEncoding; @@ -83,7 +83,7 @@ public interface CodecOperations * * @throws FormatMismatch on the invalid structure of the byte array. * - * @see encode(Any) + * @see #encode(Any) */ Any decode(byte[] them) throws FormatMismatch; @@ -96,7 +96,7 @@ public interface CodecOperations * @return the array, containing the encoded value alone (no preceeding * typecode). * - * @see decode_value(byte[], TypeCode) + * @see #decode_value(byte[], TypeCode) */ byte[] encode_value(Any that_value) throws InvalidTypeForEncoding; @@ -119,7 +119,7 @@ public interface CodecOperations * @throws TypeMismatch if discovered that the the byte array defines a * different structure. * - * @see encode_value(Any) + * @see #encode_value(Any) */ Any decode_value(byte[] them, TypeCode type) throws FormatMismatch, TypeMismatch; diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java index 2a9295ae877..02097561747 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java @@ -1,5 +1,5 @@ /* FormatMismatchHelper.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/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java index e2a8c905793..246a1b93ff0 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java @@ -1,5 +1,5 @@ /* InvalidTypeForEncodingHelper.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/IOP/CodecPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java index 432e84d24cb..88e00a243cb 100644 --- a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java +++ b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java @@ -1,5 +1,5 @@ /* TypeMismatchHelper.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/IOP/ComponentIdHelper.java b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java index 35ffd9a69e4..f94187698a4 100644 --- a/libjava/classpath/org/omg/IOP/ComponentIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java @@ -1,5 +1,5 @@ /* ComponentIdHelper.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.StructMember; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/IOP/ExceptionDetailMessage.java b/libjava/classpath/org/omg/IOP/ExceptionDetailMessage.java index 167ab1ac7e9..92a068cbaf5 100644 --- a/libjava/classpath/org/omg/IOP/ExceptionDetailMessage.java +++ b/libjava/classpath/org/omg/IOP/ExceptionDetailMessage.java @@ -1,5 +1,5 @@ /* ExceptionDetailMessage.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,7 @@ package org.omg.IOP; * USER_EXCEPTION reply status, as the alternative to the stack trace * that might contain sensitive or unwanted information. The service * context contains the CDR-encapsulated wide string, usually - * returned by {@link Exception#getMessage}. + * returned by {@link Exception#getMessage()}. * </p><p> * The applications may also send the more comprehensive UnknownExceptionInfo * ( = 9 ) service context that contains the thrown exception, written diff --git a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java index 1c04ec54f9c..6a941dee6ad 100644 --- a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java +++ b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java @@ -1,5 +1,5 @@ /* MultipleComponentProfileHelper.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.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; -import org.omg.CORBA.TCKind; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.portable.OutputStream; @@ -52,7 +51,7 @@ import org.omg.CORBA.portable.InputStream; /** * A helper operations for the array of {@link TaggedComponent} - * ({@link MultipleComponentProfile}). + * (MultipleComponentProfile). * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ diff --git a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java index 340fa27d550..362b2dff35b 100644 --- a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java @@ -1,5 +1,5 @@ /* ProfileIdHelper.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.StructMember; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java index 7875db29e1d..9de0b6ffd0d 100644 --- a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java +++ b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java @@ -1,5 +1,5 @@ /* ServiceContextListHelper.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,21 +43,20 @@ 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.portable.InputStream; import org.omg.CORBA.portable.OutputStream; /** * The helper operations for the -* CORBA object {@link ServiceContext[]}. +* CORBA object {@link ServiceContext}[]. * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public abstract class ServiceContextListHelper { /** - * Get the type code of the {@link ServiceContext[]}. + * Get the type code of the {@link ServiceContext}[]. */ public static TypeCode type() { diff --git a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java index 084dbd06d97..9c4cbbe4a3d 100644 --- a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java +++ b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java @@ -1,5 +1,5 @@ /* ServiceIdHelper.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.StructMember; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; import org.omg.CORBA.portable.InputStream; diff --git a/libjava/classpath/org/omg/IOP/TAG_CODE_SETS.java b/libjava/classpath/org/omg/IOP/TAG_CODE_SETS.java index cc775248379..07c5c9c3200 100644 --- a/libjava/classpath/org/omg/IOP/TAG_CODE_SETS.java +++ b/libjava/classpath/org/omg/IOP/TAG_CODE_SETS.java @@ -1,5 +1,5 @@ /* TAG_CODE_SETS.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,7 @@ package org.omg.IOP; * profile provides information about the native and supported encodings * for the "narrow" (usually 8 bit) and "wide" (usually 16 bit) characters. * In Gnu Classpath implementation the class, responsible for providing - * this information is {@link gnu.CORBA.CharSets_OSF}. + * this information is {@link gnu.CORBA.GIOP.CharSets_OSF}. * </p> * <p> * If this profile is missing, it is assumed, that the "narrow" characters 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; 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); diff --git a/libjava/classpath/org/omg/stub/java/rmi/_Remote_Stub.java b/libjava/classpath/org/omg/stub/java/rmi/_Remote_Stub.java index da597e9173f..0d0bac661dd 100644 --- a/libjava/classpath/org/omg/stub/java/rmi/_Remote_Stub.java +++ b/libjava/classpath/org/omg/stub/java/rmi/_Remote_Stub.java @@ -75,4 +75,4 @@ public final class _Remote_Stub return new String[] { "" }; } -}
\ No newline at end of file +} |
