From 60c98fd6115a55ff13c492d2b022925bc3f80111 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 31 Mar 2003 06:32:37 +0000 Subject: [PATCH] VMID.java, [...]: Reformatted. 2003-03-31 Michael Koch * 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. From-SVN: r65078 --- libjava/ChangeLog | 11 ++ libjava/java/rmi/dgc/VMID.java | 163 ++++++++++++++----------- libjava/java/rmi/registry/RegistryHandler.java | 20 +-- libjava/java/rmi/server/LogStream.java | 58 ++++----- libjava/java/rmi/server/Operation.java | 34 +++--- libjava/java/rmi/server/RemoteCall.java | 22 ++-- libjava/java/rmi/server/RemoteRef.java | 35 ++++-- libjava/java/rmi/server/RemoteStub.java | 3 +- 8 files changed, 199 insertions(+), 147 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 142e27c..393d82a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,16 @@ 2003-03-31 Michael Koch + * 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-31 Michael Koch + * javax/swing/AbstractCellEditor.java, javax/swing/AbstractListModel.java, javax/swing/ActionMap.java, diff --git a/libjava/java/rmi/dgc/VMID.java b/libjava/java/rmi/dgc/VMID.java index 408f365..c7946cd 100644 --- a/libjava/java/rmi/dgc/VMID.java +++ b/libjava/java/rmi/dgc/VMID.java @@ -38,79 +38,98 @@ exception statement from your version. */ 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(); + } } diff --git a/libjava/java/rmi/registry/RegistryHandler.java b/libjava/java/rmi/registry/RegistryHandler.java index 16ec5b2..bf89b6a 100644 --- a/libjava/java/rmi/registry/RegistryHandler.java +++ b/libjava/java/rmi/registry/RegistryHandler.java @@ -43,12 +43,16 @@ import java.rmi.UnknownHostException; /** * @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; } diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java index b7e8fea..2f4fe76 100644 --- a/libjava/java/rmi/server/LogStream.java +++ b/libjava/java/rmi/server/LogStream.java @@ -44,8 +44,7 @@ import java.io.IOException; /** * @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 @@ public class LogStream 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; + } } diff --git a/libjava/java/rmi/server/Operation.java b/libjava/java/rmi/server/Operation.java index 9b1e7c2..6fd408c 100644 --- a/libjava/java/rmi/server/Operation.java +++ b/libjava/java/rmi/server/Operation.java @@ -40,20 +40,22 @@ package java.rmi.server; /** * @deprecated */ -public class Operation { - -private String operation; - -public Operation(String op) { - operation = op; -} - -public String getOperation() { - return (operation); -} - -public String toString() { - return (operation); -} - +public class Operation +{ + private String operation; + + public Operation (String op) + { + operation = op; + } + + public String getOperation () + { + return operation; + } + + public String toString () + { + return operation; + } } diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java index eac9ee2..7621152 100644 --- a/libjava/java/rmi/server/RemoteCall.java +++ b/libjava/java/rmi/server/RemoteCall.java @@ -46,14 +46,20 @@ import java.io.StreamCorruptedException; /** * @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; } diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java index 4abf6e1..d9f9232 100644 --- a/libjava/java/rmi/server/RemoteRef.java +++ b/libjava/java/rmi/server/RemoteRef.java @@ -43,19 +43,28 @@ import java.rmi.Remote; 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 (); } diff --git a/libjava/java/rmi/server/RemoteStub.java b/libjava/java/rmi/server/RemoteStub.java index 83cce35..cc6b589 100644 --- a/libjava/java/rmi/server/RemoteStub.java +++ b/libjava/java/rmi/server/RemoteStub.java @@ -37,8 +37,7 @@ exception statement from your version. */ package java.rmi.server; -public abstract class RemoteStub - extends RemoteObject +public abstract class RemoteStub extends RemoteObject { static final long serialVersionUID = -1585587260594494182l; -- 2.7.4