2003-03-21 Michael Koch <konqueror@gmx.de>

	* java/rmi/activation/Activatable.java
	(serialVersionUID): New member variable.
	* java/rmi/activation/ActivationGroup.java
	(serialVersionUID): New member variable.
	* java/rmi/activation/ActivationGroupDesc.java
	(serialVersionUID): New member variable.
	* java/rmi/registry/Registry.java:
	Reformated.
	(Registry): Deprecated.
	* java/rmi/server/LoaderHandler.java
	Reformated.
	(LoaderHandler): Deprecated.
	* java/rmi/server/LogStream.java
	Reformated.
	(LogStream): Deprecated.
	* java/rmi/server/Operation.java
	(Operation): Deprecated.
	* java/rmi/server/RMIFailureHandler.java:
	Reformated.
	* java/rmi/server/RMISocketFactory.java:
	Reformated.
	* java/rmi/server/RemoteCall.java
	(RemoteCall): Deprecated.
	* java/rmi/server/RemoteStub.java:
	Reformated.
	* java/rmi/server/Skeleton.java
	Reformated.
	(Skeleton): Deprecated.


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

15 files changed, 239 insertions, 138 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0cfabb50853..941f46b52f1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,36 @@
 2003-03-21  Michael Koch  <konqueror@gmx.de>
 
+	* java/rmi/activation/Activatable.java
+	(serialVersionUID): New member variable.
+	* java/rmi/activation/ActivationGroup.java
+	(serialVersionUID): New member variable.
+	* java/rmi/activation/ActivationGroupDesc.java
+	(serialVersionUID): New member variable.
+	* java/rmi/registry/Registry.java:
+	Reformated.
+	(Registry): Deprecated.
+	* java/rmi/server/LoaderHandler.java
+	Reformated.
+	(LoaderHandler): Deprecated.
+	* java/rmi/server/LogStream.java
+	Reformated.
+	(LogStream): Deprecated.
+	* java/rmi/server/Operation.java
+	(Operation): Deprecated.
+	* java/rmi/server/RMIFailureHandler.java:
+	Reformated.
+	* java/rmi/server/RMISocketFactory.java:
+	Reformated.
+	* java/rmi/server/RemoteCall.java
+	(RemoteCall): Deprecated.
+	* java/rmi/server/RemoteStub.java:
+	Reformated.
+	* java/rmi/server/Skeleton.java
+	Reformated.
+	(Skeleton): Deprecated.
+
+2003-03-21  Michael Koch  <konqueror@gmx.de>
+
 	* java/io/LineNumberReader.java
 	(LineNumberReader): Merged documentation with classpath.
 	(getLineNumber): Likewise.
diff --git a/libjava/java/rmi/activation/Activatable.java b/libjava/java/rmi/activation/Activatable.java
index 5985cc3ff00..95913199f09 100644
--- a/libjava/java/rmi/activation/Activatable.java
+++ b/libjava/java/rmi/activation/Activatable.java
@@ -48,6 +48,8 @@ import java.rmi.MarshalledObject;
 public abstract class Activatable
 	extends RemoteServer {
 
+static final long serialVersionUID = -3120617863591563455L;
+
 protected Activatable(String location, MarshalledObject data, boolean restart, int port) throws ActivationException, RemoteException {
 	throw new Error("Not implemented");
 }
diff --git a/libjava/java/rmi/activation/ActivationGroup.java b/libjava/java/rmi/activation/ActivationGroup.java
index b19686d0e1e..e9cd472113b 100644
--- a/libjava/java/rmi/activation/ActivationGroup.java
+++ b/libjava/java/rmi/activation/ActivationGroup.java
@@ -46,6 +46,8 @@ public abstract class ActivationGroup
 	extends UnicastRemoteObject
 	implements ActivationInstantiator {
 
+static final long serialVersionUID = -7696947875314805420L;
+
 protected ActivationGroup(ActivationGroupID groupID) throws RemoteException {
 	throw new Error("Not implemented");
 }
diff --git a/libjava/java/rmi/activation/ActivationGroupDesc.java b/libjava/java/rmi/activation/ActivationGroupDesc.java
index 1c627e4d7b0..2afb8440b0b 100644
--- a/libjava/java/rmi/activation/ActivationGroupDesc.java
+++ b/libjava/java/rmi/activation/ActivationGroupDesc.java
@@ -48,6 +48,8 @@ public final class ActivationGroupDesc implements Serializable
 public static class CommandEnvironment
 	implements Serializable {
 
+static final long serialVersionUID = 6165754737887770191L;
+  
 private String cmdpath;
 private String[] argv;
 
diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java
index b69bceaef72..203da118c53 100644
--- a/libjava/java/rmi/registry/Registry.java
+++ b/libjava/java/rmi/registry/Registry.java
@@ -43,19 +43,22 @@ import java.rmi.AccessException;
 import java.rmi.AlreadyBoundException;
 import java.rmi.Remote;
 
-public interface Registry
-	extends Remote {
+public interface Registry extends Remote
+{
+  public static final int REGISTRY_PORT = 1099;
 
-public static int REGISTRY_PORT = 1099;
+  public Remote lookup(String name)
+    throws RemoteException, NotBoundException, AccessException;
 
-public Remote lookup(String name) throws RemoteException, NotBoundException, AccessException;
+  public void bind(String name, Remote obj)
+    throws RemoteException, AlreadyBoundException, AccessException;
 
-public void bind(String name, Remote obj) throws RemoteException, AlreadyBoundException, AccessException;
+  public void unbind(String name)
+    throws RemoteException, NotBoundException, AccessException;
 
-public void unbind(String name) throws RemoteException, NotBoundException, AccessException;
-
-public void rebind(String name, Remote obj) throws RemoteException, AccessException;
-
-public String[] list() throws RemoteException, AccessException;
+  public void rebind(String name, Remote obj)
+    throws RemoteException, AccessException;
 
+  public String[] list()
+    throws RemoteException, AccessException;
 }
diff --git a/libjava/java/rmi/server/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java
index 105ef5b798a..f6003069b4c 100644
--- a/libjava/java/rmi/server/LoaderHandler.java
+++ b/libjava/java/rmi/server/LoaderHandler.java
@@ -40,15 +40,18 @@ package java.rmi.server;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+/**
+ * @deprecated
+ */
+public interface LoaderHandler
+{
+  public static final String packagePrefix = "";
 
-public interface LoaderHandler {
+  public Class loadClass(String name)
+    throws MalformedURLException, ClassNotFoundException;
 
-public static final String packagePrefix = "";
-
-public Class loadClass(String name) throws MalformedURLException, ClassNotFoundException;
-
-public Class loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException;
-
-public Object getSecurityContext(ClassLoader loader);
+  public Class loadClass(URL codebase, String name)
+    throws MalformedURLException, ClassNotFoundException;
 
+  public Object getSecurityContext(ClassLoader loader);
 }
diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java
index ffbd3f67e71..b7e8fea70dd 100644
--- a/libjava/java/rmi/server/LogStream.java
+++ b/libjava/java/rmi/server/LogStream.java
@@ -41,62 +41,80 @@ import java.io.PrintStream;
 import java.io.OutputStream;
 import java.io.IOException;
 
+/**
+ * @deprecated
+ */
 public class LogStream
-	extends PrintStream {
-
-public static final int SILENT = 0;
-public static final int BRIEF = 10;
-public static final int VERBOSE = 20;
-
-private static PrintStream defStream;
-
-private LogStream(OutputStream s) {
-	super(s);
-}
-
-public static LogStream log(String name) {
-	throw new Error("Not implemented");
-}
-
-public static PrintStream getDefaultStream() {
-	return (defStream);
-}
-
-public static void setDefaultStream(PrintStream s) {
-	defStream = s;
-}
-
-public OutputStream getOutputStream() {
-	return (out);
-}
-
-public void setOutputStream(OutputStream s) {
-	out = s;
-}
-
-public void write(int b) {
-	super.write(b);
-}
-
-public void write(byte[] b, int off, int len) {
-	super.write(b, off, len);
-}
-
-public String toString() {
-	throw new Error("Not implemented");
-}
-
-public static int parseLevel(String s) {
-	if (s.equalsIgnoreCase("silent")) {
-		return (SILENT);
-	}
-	if (s.equalsIgnoreCase("brief")) {
-		return (BRIEF);
-	}
-	if (s.equalsIgnoreCase("verbose")) {
-		return (VERBOSE);
-	}
-	return (SILENT);
+	extends PrintStream
+{
+  public static final int SILENT = 0;
+  public static final int BRIEF = 10;
+  public static final int VERBOSE = 20;
+
+  private static PrintStream defStream;
+
+  private LogStream(OutputStream s)
+  {
+    super(s);
+  }
+
+  public static LogStream log(String name)
+  {
+    throw new Error("Not implemented");
+  }
+
+  public static PrintStream getDefaultStream()
+  {
+    return (defStream);
+  }
+  
+  public static void setDefaultStream(PrintStream s)
+  {
+    defStream = s;
+  }
+
+  public OutputStream getOutputStream()
+  {
+    return (out);
+  }
+
+  public void setOutputStream(OutputStream s)
+  {
+    out = s;
+  }
+
+  public void write(int b)
+  {
+    super.write(b);
+  }
+
+  public void write(byte[] b, int off, int len)
+  {
+    super.write(b, off, len);
+  }
+
+  public String toString()
+  {
+    throw new Error("Not implemented");
+  }
+
+  public static int parseLevel(String s) {
+    if (s.equalsIgnoreCase("silent"))
+      {
+        return (SILENT);
+      }
+    
+    if (s.equalsIgnoreCase("brief"))
+      {
+        return (BRIEF);
+      }
+    
+    if (s.equalsIgnoreCase("verbose"))
+      {
+        return (VERBOSE);
+      }
+    
+    return (SILENT);
 }
 
 }
diff --git a/libjava/java/rmi/server/Operation.java b/libjava/java/rmi/server/Operation.java
index ab1a8d2721f..9b1e7c218c8 100644
--- a/libjava/java/rmi/server/Operation.java
+++ b/libjava/java/rmi/server/Operation.java
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 package java.rmi.server;
 
+/**
+ * @deprecated
+ */
 public class Operation {
 
 private String operation;
diff --git a/libjava/java/rmi/server/RMIFailureHandler.java b/libjava/java/rmi/server/RMIFailureHandler.java
index 4447c1f317d..dace6fa1b09 100644
--- a/libjava/java/rmi/server/RMIFailureHandler.java
+++ b/libjava/java/rmi/server/RMIFailureHandler.java
@@ -37,8 +37,10 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-public interface RMIFailureHandler {
-
-public boolean failure(Exception ex);
-
+public interface RMIFailureHandler
+{
+  /**
+   * @exception IOException If an error occurs
+   */
+  public boolean failure (Exception ex);
 }
diff --git a/libjava/java/rmi/server/RMISocketFactory.java b/libjava/java/rmi/server/RMISocketFactory.java
index 95ff750ac68..544b1250660 100644
--- a/libjava/java/rmi/server/RMISocketFactory.java
+++ b/libjava/java/rmi/server/RMISocketFactory.java
@@ -43,42 +43,64 @@ import java.io.IOException;
 import gnu.java.rmi.server.RMIDefaultSocketFactory;
 
 public abstract class RMISocketFactory
-	implements RMIClientSocketFactory, RMIServerSocketFactory {
-
-static private RMISocketFactory defaultFactory;
-static private RMISocketFactory currentFactory;
-static private RMIFailureHandler currentHandler;
-
-static {
-	defaultFactory = new RMIDefaultSocketFactory();
-	currentFactory = defaultFactory;
-}
-
-public RMISocketFactory() {
-}
-
-public abstract Socket createSocket(String host, int port) throws IOException;
-
-public abstract ServerSocket createServerSocket(int port) throws IOException;
-
-public static void setSocketFactory(RMISocketFactory fac) throws IOException {
-	currentFactory = fac;
-}
-
-public static RMISocketFactory getSocketFactory() {
-	return (currentFactory);
-}
-
-public static RMISocketFactory getDefaultSocketFactory() {
-	return (defaultFactory);
-}
-
-public static void setFailureHandler(RMIFailureHandler fh) {
-	currentHandler = fh;
-}
-
-public static RMIFailureHandler getFailureHandler() {
-	return (currentHandler);
-}
-
+  implements RMIClientSocketFactory, RMIServerSocketFactory
+{
+  static private RMISocketFactory defaultFactory;
+  static private RMISocketFactory currentFactory;
+  static private RMIFailureHandler currentHandler;
+
+  static
+    {
+      defaultFactory = new RMIDefaultSocketFactory();
+      currentFactory = defaultFactory;
+    }
+
+  public RMISocketFactory ()
+  {
+  }
+
+  /**
+   * @exception IOException If an error occurs
+   */
+  public abstract Socket createSocket (String host, int port)
+    throws IOException;
+
+  /**
+   * @exception IOException If an error occurs
+   */
+  public abstract ServerSocket createServerSocket (int port)
+    throws IOException;
+
+  /**
+   * @exception IOException If an error occurs
+   * @exception SecurityException FIXME
+   */
+  public static void setSocketFactory (RMISocketFactory fac)
+    throws IOException
+  {
+    currentFactory = fac;
+  }
+
+  public static RMISocketFactory getSocketFactory ()
+  {
+    return currentFactory;
+  }
+
+  public static RMISocketFactory getDefaultSocketFactory ()
+  {
+    return defaultFactory;
+  }
+
+  /**
+   * @exception SecurityException FIXME
+   */
+  public static void setFailureHandler (RMIFailureHandler fh)
+  {
+    currentHandler = fh;
+  }
+
+  public static RMIFailureHandler getFailureHandler ()
+  {
+    return currentHandler;
+  }
 }
diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java
index 59deeb0a4af..eac9ee233a9 100644
--- a/libjava/java/rmi/server/RemoteCall.java
+++ b/libjava/java/rmi/server/RemoteCall.java
@@ -43,6 +43,9 @@ import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.StreamCorruptedException;
 
+/**
+ * @deprecated
+ */
 public interface RemoteCall {
 
 public ObjectOutput getOutputStream() throws IOException;
diff --git a/libjava/java/rmi/server/RemoteStub.java b/libjava/java/rmi/server/RemoteStub.java
index f0123e96c48..83cce3514e9 100644
--- a/libjava/java/rmi/server/RemoteStub.java
+++ b/libjava/java/rmi/server/RemoteStub.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,20 +38,22 @@ exception statement from your version. */
 package java.rmi.server;
 
 public abstract class RemoteStub
-	extends RemoteObject {
-
-public static final long serialVersionUID = -1585587260594494182l;
-
-protected RemoteStub() {
-	super();
-}
-
-protected RemoteStub(RemoteRef ref) {
-	super(ref);
-}
-
-protected static void setRef(RemoteStub stub, RemoteRef ref) {
-	stub.ref = ref;
-}
-
-}
+  extends RemoteObject
+{
+  static final long serialVersionUID = -1585587260594494182l;
+
+  protected RemoteStub ()
+  {
+    super ();
+  }
+
+  protected RemoteStub (RemoteRef ref)
+  {
+    super (ref);
+  }
+
+  protected static void setRef (RemoteStub stub,  RemoteRef ref)
+  {
+    stub.ref = ref;
+  }
+} // class RemoteSub
diff --git a/libjava/java/rmi/server/Skeleton.java b/libjava/java/rmi/server/Skeleton.java
index 9555f6b523e..a341894af5c 100644
--- a/libjava/java/rmi/server/Skeleton.java
+++ b/libjava/java/rmi/server/Skeleton.java
@@ -41,9 +41,13 @@ import java.rmi.Remote;
 import java.lang.Exception;
 import java.rmi.server.RemoteCall;
 
-public interface Skeleton {
-
-public void dispatch(Remote obj, RemoteCall theCall, int opnum, long hash) throws Exception;
-public Operation[] getOperations();
-
+/**
+ * @deprecated
+ */
+public interface Skeleton
+{
+  public void dispatch (Remote obj, RemoteCall theCall, int opnum, long hash)
+    throws Exception;
+
+  public Operation[] getOperations();
 }
diff --git a/libjava/java/text/AttributedCharacterIterator.java b/libjava/java/text/AttributedCharacterIterator.java
index 3b8fb1bc0b5..ba976b7de84 100644
--- a/libjava/java/text/AttributedCharacterIterator.java
+++ b/libjava/java/text/AttributedCharacterIterator.java
@@ -70,6 +70,8 @@ public interface AttributedCharacterIterator extends CharacterIterator
 public static class Attribute implements Serializable
 {
 
+  private static final long serialVersionUID = -9142742483513960612L;
+
 /*************************************************************************/
 
 /*
diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java
index f5ee3492974..0e4a678378c 100644
--- a/libjava/java/text/MessageFormat.java
+++ b/libjava/java/text/MessageFormat.java
@@ -143,6 +143,8 @@ final class MessageFormatElement
 
 public class MessageFormat extends Format
 {
+  private static final long serialVersionUID = 6479157306784022952L;
+  
   // Helper that returns the text up to the next format opener.  The
   // text is put into BUFFER.  Returns index of character after end of
   // string.  Throws IllegalArgumentException on error.