Merged gcj-eclipse branch to trunk.

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

21 files changed, 67 insertions, 86 deletions

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.
    *