2003-10-11 Michael Koch <konqueror@gmx.de>

	* gnu/java/rmi/server/ProtocolConstants.java,
	gnu/java/security/der/DER.java:
	Removing redundant modifiers.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7bb5902..ac33250 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 2003-10-11  Michael Koch  <konqueror@gmx.de>
 
+       * gnu/java/rmi/server/ProtocolConstants.java,
+       gnu/java/security/der/DER.java:
+       Removing redundant modifiers.
+
+2003-10-11  Michael Koch  <konqueror@gmx.de>
+
        * java/util/Map.java,
        java/util/Observer.java,
        java/util/zip/Checksum.java,

diff --git a/libjava/gnu/java/rmi/server/ProtocolConstants.java b/libjava/gnu/java/rmi/server/ProtocolConstants.java
index 735ca3d..7837a8e 100644 (file)
--- a/libjava/gnu/java/rmi/server/ProtocolConstants.java
+++ b/libjava/gnu/java/rmi/server/ProtocolConstants.java
@@ -37,27 +37,26 @@ exception statement from your version. */
 
 package gnu.java.rmi.server;
 
-public interface ProtocolConstants {
+public interface ProtocolConstants
+{
+  int PROTOCOL_HEADER = 0x4a524d49; // JRMI
+  int PROTOCOL_VERSION = 2;
 
-final public static int PROTOCOL_HEADER = 0x4a524d49; // JRMI
-final public static int PROTOCOL_VERSION = 2;
+  int STREAM_PROTOCOL = 0x4b;
+  int SINGLE_OP_PROTOCOL = 0x4c;
+  int MULTIPLEX_PROTOCOL = 0x4d;
 
-final public static int STREAM_PROTOCOL = 0x4b;
-final public static int SINGLE_OP_PROTOCOL = 0x4c;
-final public static int MULTIPLEX_PROTOCOL = 0x4d;
+  int PROTOCOL_ACK = 0x4e;
+  int PROTOCOL_NACK = 0x4f;
 
-final public static int PROTOCOL_ACK = 0x4e;
-final public static int PROTOCOL_NACK = 0x4f;
+  int MESSAGE_CALL = 0x50;
+  int MESSAGE_CALL_ACK = 0x51;
+  int MESSAGE_PING = 0x52;
+  int MESSAGE_PING_ACK = 0x53;
+  int MESSAGE_DGCACK = 0x54;
 
-final public static int MESSAGE_CALL = 0x50;
-final public static int MESSAGE_CALL_ACK = 0x51;
-final public static int MESSAGE_PING = 0x52;
-final public static int MESSAGE_PING_ACK = 0x53;
-final public static int MESSAGE_DGCACK = 0x54;
+  int RETURN_ACK = 0x01;
+  int RETURN_NACK = 0x02;
 
-final public static int RETURN_ACK = 0x01;
-final public static int RETURN_NACK = 0x02;
-
-final public static int DEFAULT_PROTOCOL = STREAM_PROTOCOL;
-
-};
+  int DEFAULT_PROTOCOL = STREAM_PROTOCOL;
+}

diff --git a/libjava/gnu/java/security/der/DER.java b/libjava/gnu/java/security/der/DER.java
index 9435366..9c39888 100644 (file)
--- a/libjava/gnu/java/security/der/DER.java
+++ b/libjava/gnu/java/security/der/DER.java
@@ -45,46 +45,42 @@ package gnu.java.security.der;
  */
 public interface DER
 {
-
-  // Constants.
-  // ------------------------------------------------------------------------
-
-  public static final int UNIVERSAL   = 0x00;
-  public static final int APPLICATION = 0x40;
-  public static final int CONTEXT     = 0x80;
-  public static final int PRIVATE     = 0xC0;
-
-  public static final int CONSTRUCTED = 0x20;
-
-  public static final int ANY               = 0x00;
-  public static final int BOOLEAN           = 0x01;
-  public static final int INTEGER           = 0x02;
-  public static final int BIT_STRING        = 0x03;
-  public static final int OCTET_STRING      = 0x04;
-  public static final int NULL              = 0x05;
-  public static final int OBJECT_IDENTIFIER = 0x06;
-  public static final int REAL              = 0x09;
-  public static final int ENUMERATED        = 0x0a;
-  public static final int RELATIVE_OID      = 0x0d;
-
-  public static final int SEQUENCE = 0x10;
-  public static final int SET      = 0x11;
-
-  public static final Object CONSTRUCTED_VALUE = new Object();
-
-  public static final int NUMERIC_STRING   = 0x12;
-  public static final int PRINTABLE_STRING = 0x13;
-  public static final int T61_STRING       = 0x14;
-  public static final int VIDEOTEX_STRING  = 0x15;
-  public static final int IA5_STRING       = 0x16;
-  public static final int GRAPHIC_STRING   = 0x19;
-  public static final int ISO646_STRING    = 0x1A;
-  public static final int GENERAL_STRING   = 0x1B;
-
-  public static final int UTF8_STRING      = 0x0C;
-  public static final int UNIVERSAL_STRING = 0x1C;
-  public static final int BMP_STRING       = 0x1E;
-
-  public static final int UTC_TIME         = 0x17;
-  public static final int GENERALIZED_TIME = 0x18;
+  int UNIVERSAL   = 0x00;
+  int APPLICATION = 0x40;
+  int CONTEXT     = 0x80;
+  int PRIVATE     = 0xC0;
+
+  int CONSTRUCTED = 0x20;
+
+  int ANY               = 0x00;
+  int BOOLEAN           = 0x01;
+  int INTEGER           = 0x02;
+  int BIT_STRING        = 0x03;
+  int OCTET_STRING      = 0x04;
+  int NULL              = 0x05;
+  int OBJECT_IDENTIFIER = 0x06;
+  int REAL              = 0x09;
+  int ENUMERATED        = 0x0a;
+  int RELATIVE_OID      = 0x0d;
+
+  int SEQUENCE = 0x10;
+  int SET      = 0x11;
+
+  Object CONSTRUCTED_VALUE = new Object();
+
+  int NUMERIC_STRING   = 0x12;
+  int PRINTABLE_STRING = 0x13;
+  int T61_STRING       = 0x14;
+  int VIDEOTEX_STRING  = 0x15;
+  int IA5_STRING       = 0x16;
+  int GRAPHIC_STRING   = 0x19;
+  int ISO646_STRING    = 0x1A;
+  int GENERAL_STRING   = 0x1B;
+
+  int UTF8_STRING      = 0x0C;
+  int UNIVERSAL_STRING = 0x1C;
+  int BMP_STRING       = 0x1E;
+
+  int UTC_TIME         = 0x17;
+  int GENERALIZED_TIME = 0x18;
 }