This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: javax.rmi - import cleanup
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 23 Apr 2004 08:40:12 +0200
- Subject: Patch: javax.rmi - import cleanup
Hi list,
I just commited the attached patch to merge javax.rmi with GNU classpath
again.
Michael
2004-04-23 Dalibor Topic <robilad@kaffe.org>
* javax/rmi/CORBA/PortableRemoteObjectDelegate.java,
javax/rmi/CORBA/Stub.java,
javax/rmi/CORBA/Util.java,
javax/rmi/CORBA/ValueHandler.java,
javax/rmi/CORBA/ValueHandler.java,
javax/rmi/PortableRemoteObject.java:
Cleaned up imports.
Index: javax/rmi/CORBA/PortableRemoteObjectDelegate.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 PortableRemoteObjectDelegate.java
--- javax/rmi/CORBA/PortableRemoteObjectDelegate.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/CORBA/PortableRemoteObjectDelegate.java 23 Apr 2004 06:39:05 -0000
@@ -1,5 +1,5 @@
/* PortableRemoteObjectDelegate.java -- Interface supporting PortableRemoteObject
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,7 +38,9 @@
package javax.rmi.CORBA;
-import java.rmi.*;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
/**
* A delegate is a singleton class that support delegation for method
Index: javax/rmi/CORBA/Stub.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/CORBA/Stub.java,v
retrieving revision 1.1
diff -u -r1.1 Stub.java
--- javax/rmi/CORBA/Stub.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/CORBA/Stub.java 23 Apr 2004 06:39:05 -0000
@@ -1,5 +1,5 @@
/* Stub.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,16 +38,14 @@
package javax.rmi.CORBA;
+import gnu.javax.rmi.CORBA.DelegateFactory;
+import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.rmi.RemoteException;
-//import org.omg.CORBA.ORB;
-//import org.omg.CORBA_2_3.portable.ObjectImpl;
-//import org.omg.CORBA.portable.ObjectImpl;
-import gnu.javax.rmi.CORBA.DelegateFactory;
-import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
public abstract class Stub extends ObjectImpl
implements Serializable
Index: javax/rmi/CORBA/Util.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/CORBA/Util.java,v
retrieving revision 1.1
diff -u -r1.1 Util.java
--- javax/rmi/CORBA/Util.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/CORBA/Util.java 23 Apr 2004 06:39:05 -0000
@@ -1,5 +1,5 @@
/* Util.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,15 +38,13 @@
package javax.rmi.CORBA;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.lang.Object;
-import java.io.*;
-//import org.omg.CORBA.*;
-//import org.omg.CORBA.portable.InputStream;
-//import org.omg.CORBA.portable.OutputStream;
import gnu.javax.rmi.CORBA.DelegateFactory;
import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
public class Util
{
Index: javax/rmi/CORBA/UtilDelegate.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/CORBA/UtilDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 UtilDelegate.java
--- javax/rmi/CORBA/UtilDelegate.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/CORBA/UtilDelegate.java 23 Apr 2004 06:39:05 -0000
@@ -38,9 +38,10 @@
package javax.rmi.CORBA;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.io.*;
//import org.omg.CORBA.ORB;
//import org.omg.CORBA.SystemException;
//import org.omg.CORBA.portable.InputStream;
Index: javax/rmi/CORBA/ValueHandler.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/CORBA/ValueHandler.java,v
retrieving revision 1.1
diff -u -r1.1 ValueHandler.java
--- javax/rmi/CORBA/ValueHandler.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/CORBA/ValueHandler.java 23 Apr 2004 06:39:05 -0000
@@ -1,5 +1,5 @@
/* ValueHandler.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,7 +38,9 @@
package javax.rmi.CORBA;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
//import org.omg.CORBA.portable.InputStream;
//import org.omg.CORBA.portable.OutputStream;
//import org.omg.SendingContext.RunTime;
Index: javax/rmi/PortableRemoteObject.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/rmi/PortableRemoteObject.java,v
retrieving revision 1.1
diff -u -r1.1 PortableRemoteObject.java
--- javax/rmi/PortableRemoteObject.java 29 Mar 2003 21:23:25 -0000 1.1
+++ javax/rmi/PortableRemoteObject.java 23 Apr 2004 06:39:05 -0000
@@ -1,5 +1,5 @@
/* PortableRemoteObject.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,13 +38,14 @@
package javax.rmi;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
import gnu.javax.rmi.CORBA.DelegateFactory;
import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
import javax.rmi.CORBA.PortableRemoteObjectDelegate;
-import javax.rmi.CORBA.Util;
public class PortableRemoteObject
implements Remote /* why doc doesn't say should implement Remote */