This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.rmi
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 31 Mar 2003 08:35:12 +0200
- Subject: FYI: Patch: java.rmi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to trunk to reformat some code. This
patch will go into classpath too.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+h+GgWSOgCCdjSDsRAn9IAJ9m+R2BPFO4iDXYYA5vKAFEX7uq0gCgiqE/
7l11B3c8zsEGov5/rUgC28s=
=gwBe
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1826
diff -u -r1.1826 ChangeLog
--- ChangeLog 30 Mar 2003 06:43:44 -0000 1.1826
+++ ChangeLog 31 Mar 2003 06:27:48 -0000
@@ -1,3 +1,14 @@
+2003-03-31 Michael Koch <konqueror at gmx dot de>
+
+ * java/rmi/dgc/VMID.java,
+ java/rmi/registry/RegistryHandler.java,
+ java/rmi/server/LogStream.java,
+ java/rmi/server/Operation.java,
+ java/rmi/server/RemoteCall.java,
+ java/rmi/server/RemoteRef.java,
+ java/rmi/server/RemoteStub.java:
+ Reformatted.
+
2003-03-29 Eric Blake <ebb9 at email dot byu dot edu>
Tom Tromey <tromey at redhat dot com>
Index: java/rmi/dgc/VMID.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/dgc/VMID.java,v
retrieving revision 1.2
diff -u -r1.2 VMID.java
--- java/rmi/dgc/VMID.java 22 Jan 2002 22:40:26 -0000 1.2
+++ java/rmi/dgc/VMID.java 31 Mar 2003 06:27:48 -0000
@@ -38,79 +38,98 @@
package java.rmi.dgc;
import java.io.Serializable;
-import java.rmi.server.UID;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.rmi.server.UID;
-public final class VMID
- implements Serializable {
-
-static final long serialVersionUID = -538642295484486218L;
-static final boolean areWeUnique;
-static byte[] localAddr;
-
-private byte[] addr;
-private UID uid;
-
-static {
- byte[] addr;
- boolean awu = true;
- try {
- addr = InetAddress.getLocalHost().getAddress();
- if (addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1) {
- awu = false;
- }
- }
- catch (UnknownHostException _) {
- addr = new byte[]{ 127, 0, 0, 1 };
- awu = false;
- }
- localAddr = addr;
- areWeUnique = awu;
-}
-
-public VMID() {
- addr = localAddr;
- uid = new UID();
-}
-
-public static boolean isUnique() {
- return (areWeUnique);
-}
-
-public int hashCode() {
- return (super.hashCode());
-}
-
-public boolean equals(Object obj) {
- if (!(obj instanceof VMID)) {
- return (false);
- }
- VMID other = (VMID)obj;
- if (addr.length != other.addr.length) {
- return (false);
- }
- for (int i = addr.length - 1; i >= 0; i--) {
- if (addr[i] != other.addr[i]) {
- return (false);
- }
- }
- return (uid.equals(other.uid));
-}
-
-public String toString() {
- StringBuffer buf = new StringBuffer("[VMID: ");
- for (int i = 0; i < addr.length; i++) {
- if (i > 0) {
- buf.append(".");
- }
- buf.append(Integer.toString(addr[i]));
- }
- buf.append(" ");
- buf.append(uid.toString());
- buf.append("]");
-
- return (buf.toString());
-}
+public final class VMID implements Serializable
+{
+ static final long serialVersionUID = -538642295484486218L;
+
+ static final boolean areWeUnique;
+
+ static byte[] localAddr;
+
+ private byte[] addr;
+
+ private UID uid;
+
+ static
+ {
+ byte[] addr;
+ boolean awu = true;
+ try {
+ addr = InetAddress.getLocalHost().getAddress();
+ if (addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1) {
+ awu = false;
+ }
+ }
+ catch (UnknownHostException _) {
+ addr = new byte[]{ 127, 0, 0, 1 };
+ awu = false;
+ }
+ localAddr = addr;
+ areWeUnique = awu;
+ }
+
+ public VMID()
+ {
+ addr = localAddr;
+ uid = new UID();
+ }
+
+ public static boolean isUnique ()
+ {
+ return areWeUnique;
+ }
+
+ public int hashCode ()
+ {
+ return super.hashCode();
+ }
+
+ public boolean equals (Object obj)
+ {
+ if (!(obj instanceof VMID))
+ {
+ return false;
+ }
+
+ VMID other = (VMID) obj;
+ if (addr.length != other.addr.length)
+ {
+ return false;
+ }
+
+ for (int i = addr.length - 1; i >= 0; i--)
+ {
+ if (addr[i] != other.addr[i])
+ {
+ return false;
+ }
+ }
+
+ return uid.equals(other.uid);
+ }
+
+ public String toString ()
+ {
+ StringBuffer buf = new StringBuffer ("[VMID: ");
+
+ for (int i = 0; i < addr.length; i++)
+ {
+ if (i > 0)
+ {
+ buf.append (".");
+ }
+
+ buf.append (Integer.toString (addr [i]));
+ }
+
+ buf.append (" ");
+ buf.append (uid.toString ());
+ buf.append ("]");
+ return buf.toString();
+ }
}
Index: java/rmi/registry/RegistryHandler.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/registry/RegistryHandler.java,v
retrieving revision 1.4
diff -u -r1.4 RegistryHandler.java
--- java/rmi/registry/RegistryHandler.java 24 Mar 2003 14:01:41 -0000 1.4
+++ java/rmi/registry/RegistryHandler.java 31 Mar 2003 06:27:48 -0000
@@ -43,12 +43,16 @@
/**
* @deprecated
*/
-public interface RegistryHandler {
-
-/** @deprecated */
-public Registry registryStub(String host, int port) throws RemoteException, UnknownHostException;
-
-/** @deprecated */
-public Registry registryImpl(int port) throws RemoteException;
+public interface RegistryHandler
+{
+ /**
+ * @deprecated
+ */
+ public Registry registryStub (String host, int port)
+ throws RemoteException, UnknownHostException;
+ /**
+ * @deprecated
+ */
+ public Registry registryImpl (int port) throws RemoteException;
}
Index: java/rmi/server/LogStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/LogStream.java,v
retrieving revision 1.4
diff -u -r1.4 LogStream.java
--- java/rmi/server/LogStream.java 21 Mar 2003 09:00:29 -0000 1.4
+++ java/rmi/server/LogStream.java 31 Mar 2003 06:27:48 -0000
@@ -44,8 +44,7 @@
/**
* @deprecated
*/
-public class LogStream
- extends PrintStream
+public class LogStream extends PrintStream
{
public static final int SILENT = 0;
public static final int BRIEF = 10;
@@ -53,68 +52,71 @@
private static PrintStream defStream;
- private LogStream(OutputStream s)
+ private LogStream (OutputStream s)
{
- super(s);
+ super (s);
}
- public static LogStream log(String name)
+ /**
+ * @deprecated
+ */
+ public static LogStream log (String name)
{
- throw new Error("Not implemented");
+ throw new Error ("Not implemented");
}
- public static PrintStream getDefaultStream()
+ public static PrintStream getDefaultStream ()
{
- return (defStream);
+ return defStream;
}
- public static void setDefaultStream(PrintStream s)
+ public static void setDefaultStream (PrintStream s)
{
defStream = s;
}
- public OutputStream getOutputStream()
+ public OutputStream getOutputStream ()
{
- return (out);
+ return out;
}
- public void setOutputStream(OutputStream s)
+ public void setOutputStream (OutputStream s)
{
out = s;
}
- public void write(int b)
+ public void write (int buffer)
{
- super.write(b);
+ super.write (buffer);
}
- public void write(byte[] b, int off, int len)
+ public void write (byte[] buffer, int offset, int len)
{
- super.write(b, off, len);
+ super.write (buffer, offset, len);
}
- public String toString()
+ public String toString ()
{
- throw new Error("Not implemented");
+ throw new Error ("Not implemented");
}
- public static int parseLevel(String s) {
- if (s.equalsIgnoreCase("silent"))
+ public static int parseLevel (String s)
+ {
+ if (s.equalsIgnoreCase ("silent"))
{
- return (SILENT);
+ return SILENT;
}
- if (s.equalsIgnoreCase("brief"))
+ if (s.equalsIgnoreCase ("brief"))
{
- return (BRIEF);
+ return BRIEF;
}
- if (s.equalsIgnoreCase("verbose"))
+ if (s.equalsIgnoreCase ("verbose"))
{
- return (VERBOSE);
+ return VERBOSE;
}
- return (SILENT);
-}
-
+ return SILENT;
+ }
}
Index: java/rmi/server/Operation.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/Operation.java,v
retrieving revision 1.3
diff -u -r1.3 Operation.java
--- java/rmi/server/Operation.java 21 Mar 2003 09:00:29 -0000 1.3
+++ java/rmi/server/Operation.java 31 Mar 2003 06:27:48 -0000
@@ -40,20 +40,22 @@
/**
* @deprecated
*/
-public class Operation {
+public class Operation
+{
+ private String operation;
-private String operation;
+ public Operation (String op)
+ {
+ operation = op;
+ }
-public Operation(String op) {
- operation = op;
-}
-
-public String getOperation() {
- return (operation);
-}
-
-public String toString() {
- return (operation);
-}
+ public String getOperation ()
+ {
+ return operation;
+ }
+ public String toString ()
+ {
+ return operation;
+ }
}
Index: java/rmi/server/RemoteCall.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteCall.java,v
retrieving revision 1.3
diff -u -r1.3 RemoteCall.java
--- java/rmi/server/RemoteCall.java 21 Mar 2003 09:00:29 -0000 1.3
+++ java/rmi/server/RemoteCall.java 31 Mar 2003 06:27:48 -0000
@@ -46,14 +46,20 @@
/**
* @deprecated
*/
-public interface RemoteCall {
+public interface RemoteCall
+{
+ public ObjectOutput getOutputStream () throws IOException;
-public ObjectOutput getOutputStream() throws IOException;
-public void releaseOutputStream() throws IOException;
-public ObjectInput getInputStream() throws IOException;
-public void releaseInputStream() throws IOException;
-public ObjectOutput getResultStream(boolean success) throws IOException, StreamCorruptedException;
-public void executeCall() throws Exception;
-public void done() throws IOException;
+ public void releaseOutputStream () throws IOException;
+ public ObjectInput getInputStream () throws IOException;
+
+ public void releaseInputStream () throws IOException;
+
+ public ObjectOutput getResultStream (boolean success)
+ throws IOException, StreamCorruptedException;
+
+ public void executeCall () throws Exception;
+
+ public void done () throws IOException;
}
Index: java/rmi/server/RemoteRef.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteRef.java,v
retrieving revision 1.2
diff -u -r1.2 RemoteRef.java
--- java/rmi/server/RemoteRef.java 22 Jan 2002 22:40:29 -0000 1.2
+++ java/rmi/server/RemoteRef.java 31 Mar 2003 06:27:48 -0000
@@ -43,19 +43,28 @@
import java.rmi.RemoteException;
import java.io.ObjectOutput;
-public interface RemoteRef
- extends Externalizable {
+public interface RemoteRef extends Externalizable
+{
+ public static final long serialVersionUID = 0;
+
+ public static final String packagePrefix = "gnu.java.rmi.server";
-public static final long serialVersionUID = 0;
-public static final String packagePrefix = "gnu.java.rmi.server";
-
-public void invoke(RemoteCall call) throws Exception;
-public Object invoke(Remote obj, Method method, Object[] params, long opnum) throws Exception;
-public RemoteCall newCall(RemoteObject obj, Operation[] op, int opnum, long hash) throws RemoteException;
-public void done(RemoteCall call) throws RemoteException;
-public boolean remoteEquals(RemoteRef ref);
-public int remoteHashCode();
-public String getRefClass(ObjectOutput out);
-public String remoteToString();
+ public void invoke(RemoteCall call) throws Exception;
+
+ public Object invoke (Remote obj, Method method, Object[] params, long opnum)
+ throws Exception;
+
+ public RemoteCall newCall (RemoteObject obj, Operation[] op, int opnum,
+ long hash)
+ throws RemoteException;
+ public void done (RemoteCall call) throws RemoteException;
+
+ public boolean remoteEquals (RemoteRef ref);
+
+ public int remoteHashCode ();
+
+ public String getRefClass (ObjectOutput out);
+
+ public String remoteToString ();
}
Index: java/rmi/server/RemoteStub.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteStub.java,v
retrieving revision 1.3
diff -u -r1.3 RemoteStub.java
--- java/rmi/server/RemoteStub.java 21 Mar 2003 09:00:29 -0000 1.3
+++ java/rmi/server/RemoteStub.java 31 Mar 2003 06:27:48 -0000
@@ -37,8 +37,7 @@
package java.rmi.server;
-public abstract class RemoteStub
- extends RemoteObject
+public abstract class RemoteStub extends RemoteObject
{
static final long serialVersionUID = -1585587260594494182l;