[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small whitespace and import fixes

Kaffe CVS cvs-commits at kaffe.org
Mon Dec 6 14:57:03 PST 2004


PatchSet 5559 
Date: 2004/12/06 22:07:53
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small whitespace and import fixes

Members: 
	ChangeLog:1.3105->1.3106 
	libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java:1.2->1.3 
	libraries/javalib/gnu/java/security/der/DEREncodingException.java:1.1->1.2 
	libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java:1.2->1.3 
	libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java:1.2->1.3 
	libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java:1.2->1.3 
	libraries/javalib/gnu/java/util/prefs/NodeWriter.java:1.2->1.3 
	libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java:1.2->1.3 
	libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3105 kaffe/ChangeLog:1.3106
--- kaffe/ChangeLog:1.3105	Mon Dec  6 21:31:43 2004
+++ kaffe/ChangeLog	Mon Dec  6 22:07:53 2004
@@ -1,5 +1,19 @@
 2004-12-06  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java,
+	libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java,
+	libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java,
+	libraries/javalib/gnu/java/security/der/DEREncodingException.java,
+	libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java,
+	libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java,
+	libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java,
+	libraries/javalib/gnu/java/util/prefs/NodeWriter.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java:
+	Resynced with GNU Classpath. Whitespace and import fixes.
+
+2004-12-06  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/nio/NIOServerSocket.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java:1.2	Mon Mar 22 11:24:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java	Mon Dec  6 22:07:56 2004
@@ -39,10 +39,9 @@
 package gnu.java.rmi;
 
 import gnu.java.rmi.server.RMIObjectInputStream;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
 
 /**
  * This class is only for java.rmi.MarshalledObject to deserialize object from 
Index: kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java:1.2	Mon Mar 22 11:24:22 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java	Mon Dec  6 22:07:56 2004
@@ -37,22 +37,21 @@
 
 package gnu.java.rmi.registry;
 
-import gnu.java.rmi.server.UnicastServerRef;
-
+import java.rmi.registry.Registry;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.RemoteException;
+import java.rmi.NotBoundException;
 import java.rmi.AccessException;
 import java.rmi.AlreadyBoundException;
-import java.rmi.NotBoundException;
 import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
+import java.rmi.server.UnicastRemoteObject;
 import java.rmi.server.ObjID;
+import java.util.Hashtable;
+import java.util.Enumeration;
+import java.rmi.server.RMISocketFactory;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RMISocketFactory;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import gnu.java.rmi.server.UnicastServerRef;
 
 public class RegistryImpl
 	extends UnicastRemoteObject implements Registry {
Index: kaffe/libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java:1.2	Mon Mar 22 11:24:22 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java	Mon Dec  6 22:07:56 2004
@@ -38,8 +38,8 @@
 package gnu.java.rmi.rmic;
 
 import java.io.FilterWriter;
-import java.io.IOException;
 import java.io.Writer;
+import java.io.IOException;
 
 public class TabbedWriter
 	extends FilterWriter {
Index: kaffe/libraries/javalib/gnu/java/security/der/DEREncodingException.java
diff -u kaffe/libraries/javalib/gnu/java/security/der/DEREncodingException.java:1.1 kaffe/libraries/javalib/gnu/java/security/der/DEREncodingException.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/der/DEREncodingException.java:1.1	Fri Aug 15 16:58:53 2003
+++ kaffe/libraries/javalib/gnu/java/security/der/DEREncodingException.java	Mon Dec  6 22:07:58 2004
@@ -7,7 +7,7 @@
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -46,7 +46,7 @@
   {
     super ();
   }
-  
+
   public DEREncodingException (String msg)
   {
     super (msg);
Index: kaffe/libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java
diff -u kaffe/libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java:1.2 kaffe/libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java:1.3
--- kaffe/libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java:1.2	Mon Mar 22 11:24:27 2004
+++ kaffe/libraries/javalib/gnu/java/util/prefs/FileBasedFactory.java	Mon Dec  6 22:07:58 2004
@@ -37,8 +37,7 @@
 
 package gnu.java.util.prefs;
 
-import java.util.prefs.Preferences;
-import java.util.prefs.PreferencesFactory;
+import java.util.prefs.*;
 
 /**
  * Default Classpath implementation of a PreferencesFactory.
Index: kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java
diff -u kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java:1.2 kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java:1.3
--- kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java:1.2	Mon Mar 22 11:24:27 2004
+++ kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedFactory.java	Mon Dec  6 22:07:58 2004
@@ -37,8 +37,7 @@
 
 package gnu.java.util.prefs;
 
-import java.util.prefs.Preferences;
-import java.util.prefs.PreferencesFactory;
+import java.util.prefs.*;
 
 /**
  * Memory based PreferencesFactory usefull for testing.
Index: kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java
diff -u kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java:1.2 kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java:1.3
--- kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java:1.2	Mon Mar 22 11:24:27 2004
+++ kaffe/libraries/javalib/gnu/java/util/prefs/MemoryBasedPreferences.java	Mon Dec  6 22:07:58 2004
@@ -38,8 +38,8 @@
 package gnu.java.util.prefs;
 
 import java.util.HashMap;
-import java.util.prefs.AbstractPreferences;
-import java.util.prefs.BackingStoreException;
+
+import java.util.prefs.*;
 
 /**
  * A Preference node which holds all entries in memory
Index: kaffe/libraries/javalib/gnu/java/util/prefs/NodeWriter.java
diff -u kaffe/libraries/javalib/gnu/java/util/prefs/NodeWriter.java:1.2 kaffe/libraries/javalib/gnu/java/util/prefs/NodeWriter.java:1.3
--- kaffe/libraries/javalib/gnu/java/util/prefs/NodeWriter.java:1.2	Mon Mar 22 11:24:27 2004
+++ kaffe/libraries/javalib/gnu/java/util/prefs/NodeWriter.java	Mon Dec  6 22:07:58 2004
@@ -42,9 +42,10 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+
 import java.util.StringTokenizer;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
+
+import java.util.prefs.*;
 
 /**
  * Writes and exports preferences nodes to files
Index: kaffe/libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java
diff -u kaffe/libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java:1.2 kaffe/libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java:1.3
--- kaffe/libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java:1.2	Mon Mar 22 11:24:28 2004
+++ kaffe/libraries/javalib/gnu/javax/rmi/CORBA/UtilDelegateImpl.java	Mon Dec  6 22:07:59 2004
@@ -38,18 +38,16 @@
 
 package gnu.javax.rmi.CORBA;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.rmi.server.RMIClassLoader;
-
-import javax.rmi.CORBA.Stub;
-import javax.rmi.CORBA.SystemException;
-import javax.rmi.CORBA.Tie;
-import javax.rmi.CORBA.UtilDelegate;
-import javax.rmi.CORBA.ValueHandler;
+import java.net.MalformedURLException;
+import java.io.*;
+//import org.omg.CORBA.ORB;
+//import org.omg.CORBA.SystemException;
+//import org.omg.CORBA.portable.InputStream;
+//import org.omg.CORBA.portable.OutputStream;
+import javax.rmi.CORBA.*;
 
 public class UtilDelegateImpl
   implements UtilDelegate
Index: kaffe/libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java
diff -u kaffe/libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java:1.2 kaffe/libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java:1.3
--- kaffe/libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java:1.2	Mon Mar 22 11:24:28 2004
+++ kaffe/libraries/javalib/gnu/javax/rmi/CORBA/ValueHandlerImpl.java	Mon Dec  6 22:07:59 2004
@@ -38,10 +38,10 @@
 
 package gnu.javax.rmi.CORBA;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
+import java.io.*;
+//import org.omg.CORBA.portable.InputStream;
+//import org.omg.CORBA.portable.OutputStream;
+//import org.omg.SendingContext.RunTime;
 import javax.rmi.CORBA.ValueHandler;
 
 public class ValueHandlerImpl




More information about the kaffe mailing list