Hi list,
I commited the attached patch to do some code style changes found by
checkstyle.
Michael
2005-03-13 Michael Koch <[EMAIL PROTECTED]>
* org/omg/CORBA/ARG_IN.java: Removed redundant modifiers.
* org/omg/CORBA/ARG_INOUT.java: Likewise.
* org/omg/CORBA/ARG_OUT.java: Likewise.
* org/omg/CORBA/Any.java: Fixed HTML tags.
* org/omg/CORBA/Principal.java: Likewise.
* org/omg/CORBA/BAD_PARAM.java: Reordered modifiers.
* org/omg/CORBA/FixedHolder.java: Reworked imports.
* org/omg/CORBA/StringSeqHolder.java: Likewise.
* org/omg/CORBA/TypeCode.java: Likewise.
* org/omg/CORBA/TypeCodePackage/BadKind.java: Likewise.
* org/omg/CORBA/TypeCodePackage/Bounds.java: Likewise.
* org/omg/CORBA/WStringSeqHolder.java: Likewise.
* org/omg/CORBA/portable/OutputStream.java: Likewise.
Index: org/omg/CORBA/ARG_IN.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_IN.java,v
retrieving revision 1.2
diff -u -r1.2 ARG_IN.java
--- org/omg/CORBA/ARG_IN.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/ARG_IN.java 13 Mar 2005 11:19:57 -0000
@@ -51,5 +51,5 @@
* The flag, specifying that the parameter is used to pass and not to
* return the data.
*/
- static final int value = 1;
+ int value = 1;
}
Index: org/omg/CORBA/ARG_INOUT.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_INOUT.java,v
retrieving revision 1.2
diff -u -r1.2 ARG_INOUT.java
--- org/omg/CORBA/ARG_INOUT.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/ARG_INOUT.java 13 Mar 2005 11:19:57 -0000
@@ -53,5 +53,5 @@
* The constant, specifying that the parameter is used both
* to pass and to return the data.
*/
- static final int value = 3;
+ int value = 3;
}
Index: org/omg/CORBA/ARG_OUT.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_OUT.java,v
retrieving revision 1.2
diff -u -r1.2 ARG_OUT.java
--- org/omg/CORBA/ARG_OUT.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/ARG_OUT.java 13 Mar 2005 11:19:57 -0000
@@ -51,5 +51,5 @@
* The flag, indicating that the parameter is used to return, and
* not to pass the data.
*/
- static final int value = 2;
+ int value = 2;
}
Index: org/omg/CORBA/Any.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/Any.java,v
retrieving revision 1.2
diff -u -r1.2 Any.java
--- org/omg/CORBA/Any.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/Any.java 13 Mar 2005 11:19:57 -0000
@@ -125,7 +125,7 @@
throws BAD_OPERATION;
/**
- * Extract another code>Any</code> from this <code>Any</code>.
+ * Extract another <code>Any</code> from this <code>Any</code>.
*
* @throws BAD_OPERATION if this instance contains value other
* than <code>any</code> or the value has not been set.
@@ -435,7 +435,7 @@
/**
* Writes out the value (without the typecode of the value), stored in
- * this <coe>Any</code>.
+ * this <code>Any</code>.
*
* @param output the CORBA stream to write into.
*
Index: org/omg/CORBA/BAD_PARAM.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/BAD_PARAM.java,v
retrieving revision 1.2
diff -u -r1.2 BAD_PARAM.java
--- org/omg/CORBA/BAD_PARAM.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/BAD_PARAM.java 13 Mar 2005 11:19:57 -0000
@@ -62,7 +62,7 @@
/**
* Use serialVersionUID for interoperability.
*/
- private final static long serialVersionUID = 1917109334939470379L;
+ private static final long serialVersionUID = 1917109334939470379L;
/**
* Creates BAD_PARAM with the default minor code of 0 and a
Index: org/omg/CORBA/FixedHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/FixedHolder.java,v
retrieving revision 1.4
diff -u -r1.4 FixedHolder.java
--- org/omg/CORBA/FixedHolder.java 9 Mar 2005 09:56:54 -0000 1.4
+++ org/omg/CORBA/FixedHolder.java 13 Mar 2005 11:19:57 -0000
@@ -40,12 +40,12 @@
import gnu.CORBA.primitiveTypeCode;
+import java.math.BigDecimal;
+
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
import org.omg.CORBA.portable.Streamable;
-import java.math.BigDecimal;
-
/**
* A holder for CORBA <code>fixed</code> that is mapped into
* java <code>BigDecimal</code>.
Index: org/omg/CORBA/Principal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/Principal.java,v
retrieving revision 1.2
diff -u -r1.2 Principal.java
--- org/omg/CORBA/Principal.java 9 Mar 2005 09:56:54 -0000 1.2
+++ org/omg/CORBA/Principal.java 13 Mar 2005 11:19:57 -0000
@@ -40,7 +40,7 @@
/**
* This class was used to store the client identity in the past.
- * The client identity is stored in the form of the <code>byte</byte>
+ * The client identity is stored in the form of the <code>byte</code>
* array.
*
* @deprecated by CORBA 2.2.
Index: org/omg/CORBA/StringSeqHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/StringSeqHolder.java,v
retrieving revision 1.1
diff -u -r1.1 StringSeqHolder.java
--- org/omg/CORBA/StringSeqHolder.java 12 Mar 2005 23:32:04 -0000 1.1
+++ org/omg/CORBA/StringSeqHolder.java 13 Mar 2005 11:19:57 -0000
@@ -38,7 +38,7 @@
package org.omg.CORBA;
-import gnu.CORBA.*;
+import gnu.CORBA.primitiveArrayTypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
Index: org/omg/CORBA/TypeCode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/TypeCode.java,v
retrieving revision 1.7
diff -u -r1.7 TypeCode.java
--- org/omg/CORBA/TypeCode.java 9 Mar 2005 09:56:54 -0000 1.7
+++ org/omg/CORBA/TypeCode.java 13 Mar 2005 11:19:57 -0000
@@ -38,15 +38,15 @@
package org.omg.CORBA;
-import org.omg.CORBA.portable.IDLEntity;
+import java.io.Serializable;
+
import org.omg.CORBA.TypeCodePackage.BadKind;
+import org.omg.CORBA.portable.IDLEntity;
/**
* An information about a CORBA data type.
* @author Audrius Meskauskas ([EMAIL PROTECTED])
*/
-import java.io.Serializable;
-
public abstract class TypeCode
implements IDLEntity, Serializable
{
Index: org/omg/CORBA/WStringSeqHolder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/WStringSeqHolder.java,v
retrieving revision 1.1
diff -u -r1.1 WStringSeqHolder.java
--- org/omg/CORBA/WStringSeqHolder.java 12 Mar 2005 23:32:04 -0000 1.1
+++ org/omg/CORBA/WStringSeqHolder.java 13 Mar 2005 11:19:57 -0000
@@ -38,7 +38,7 @@
package org.omg.CORBA;
-import gnu.CORBA.*;
+import gnu.CORBA.primitiveArrayTypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
Index: org/omg/CORBA/TypeCodePackage/BadKind.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java,v
retrieving revision 1.3
diff -u -r1.3 BadKind.java
--- org/omg/CORBA/TypeCodePackage/BadKind.java 9 Mar 2005 09:56:54 -0000
1.3
+++ org/omg/CORBA/TypeCodePackage/BadKind.java 13 Mar 2005 11:19:57 -0000
@@ -38,11 +38,11 @@
package org.omg.CORBA.TypeCodePackage;
+import java.io.Serializable;
+
import org.omg.CORBA.IDLEntity;
import org.omg.CORBA.UserException;
-import java.io.Serializable;
-
/**
* This exception is thrown when an inappropriate operation is invoked on
* a [EMAIL PROTECTED] org.omg.CORBA.TypeCode} object.
Index: org/omg/CORBA/TypeCodePackage/Bounds.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java,v
retrieving revision 1.2
diff -u -r1.2 Bounds.java
--- org/omg/CORBA/TypeCodePackage/Bounds.java 9 Mar 2005 09:56:54 -0000
1.2
+++ org/omg/CORBA/TypeCodePackage/Bounds.java 13 Mar 2005 11:19:57 -0000
@@ -38,11 +38,11 @@
package org.omg.CORBA.TypeCodePackage;
+import java.io.Serializable;
+
import org.omg.CORBA.IDLEntity;
import org.omg.CORBA.UserException;
-import java.io.Serializable;
-
/**
* The [EMAIL PROTECTED] org.omg.CORBA.TypeCode#member_name(int) },
* [EMAIL PROTECTED] org.omg.CORBA.TypeCode#member_type(int) } and
Index: org/omg/CORBA/portable/OutputStream.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CORBA/portable/OutputStream.java,v
retrieving revision 1.2
diff -u -r1.2 OutputStream.java
--- org/omg/CORBA/portable/OutputStream.java 9 Mar 2005 09:56:55 -0000
1.2
+++ org/omg/CORBA/portable/OutputStream.java 13 Mar 2005 11:19:57 -0000
@@ -38,6 +38,8 @@
package org.omg.CORBA.portable;
+import java.math.BigDecimal;
+
import org.omg.CORBA.Any;
import org.omg.CORBA.Context;
import org.omg.CORBA.ContextList;
@@ -46,8 +48,6 @@
import org.omg.CORBA.Principal;
import org.omg.CORBA.TypeCode;
-import java.math.BigDecimal;
-
/**
* This class is used to write CORBA IDL data types.
*
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
