summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/org/omg/CORBA
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-09 19:58:05 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-09 19:58:05 +0000
commit65bf3316cf384588453604be6b4f0ed3751a8b0f (patch)
tree996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/org/omg/CORBA
parent8fc56618a84446beccd45b80381cdfe0e94050df (diff)
downloadppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.tar.gz
ppe42-gcc-65bf3316cf384588453604be6b4f0ed3751a8b0f.zip
Merged gcj-eclipse branch to trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/org/omg/CORBA')
-rw-r--r--libjava/classpath/org/omg/CORBA/AnyHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/AnySeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/AnySeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/BooleanHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/BooleanSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/BooleanSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ByteHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/CharHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/CharSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/CharSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/Context.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/CurrentHelper.java5
-rw-r--r--libjava/classpath/org/omg/CORBA/CustomValue.java5
-rw-r--r--libjava/classpath/org/omg/CORBA/DataOutputStream.java28
-rw-r--r--libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java5
-rw-r--r--libjava/classpath/org/omg/CORBA/DomainManagerOperations.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/DoubleHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/DoubleSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/DoubleSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/DynAny.java10
-rw-r--r--libjava/classpath/org/omg/CORBA/DynSequence.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/DynValue.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/DynamicImplementation.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/FieldNameHelper.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/FixedHolder.java7
-rw-r--r--libjava/classpath/org/omg/CORBA/FloatHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/FloatSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/FloatSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/IdentifierHelper.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/IntHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/LocalObject.java12
-rw-r--r--libjava/classpath/org/omg/CORBA/LongHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/LongLongSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/LongLongSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/LongSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/LongSeqHolder.java10
-rw-r--r--libjava/classpath/org/omg/CORBA/ORB.java65
-rw-r--r--libjava/classpath/org/omg/CORBA/ObjectHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/ObjectHolder.java9
-rw-r--r--libjava/classpath/org/omg/CORBA/OctetSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/OctetSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java10
-rw-r--r--libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/PolicyHelper.java5
-rw-r--r--libjava/classpath/org/omg/CORBA/PolicyListHelper.java14
-rw-r--r--libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/PrincipalHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/Request.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/ShortHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ShortSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/ShortSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/StringSeqHelper.java3
-rwxr-xr-xlibjava/classpath/org/omg/CORBA/StringSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ULongLongSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/ULongLongSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ULongSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/ULongSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/UShortSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/UShortSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ValueBaseHelper.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/ValueBaseHolder.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/VersionSpecHelper.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/WCharSeqHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/WCharSeqHolder.java10
-rw-r--r--libjava/classpath/org/omg/CORBA/WStringSeqHelper.java3
-rwxr-xr-xlibjava/classpath/org/omg/CORBA/WStringSeqHolder.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java3
-rw-r--r--libjava/classpath/org/omg/CORBA/_IDLTypeStub.java2
-rw-r--r--libjava/classpath/org/omg/CORBA/_PolicyStub.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/BoxedValueHelper.java8
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/Delegate.java6
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java31
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/ServantObject.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/StreamableValue.java4
-rw-r--r--libjava/classpath/org/omg/CORBA/portable/ValueFactory.java2
76 files changed, 257 insertions, 268 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
+}
OpenPOWER on IntegriCloud