From 5bc97d2c06d636deb2c17b67f0d9716786741ed2 Mon Sep 17 00:00:00 2001
From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Apr 2004 06:39:30 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81078 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 10 ++++++++++
.../rmi/CORBA/PortableRemoteObjectDelegate.java | 6 ++++--
libjava/javax/rmi/CORBA/Stub.java | 10 ++++------
libjava/javax/rmi/CORBA/Util.java | 14 ++++++--------
libjava/javax/rmi/CORBA/UtilDelegate.java | 3 ++-
libjava/javax/rmi/CORBA/ValueHandler.java | 6 ++++--
libjava/javax/rmi/PortableRemoteObject.java | 11 ++++++-----
7 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f05d3c21b67e..68fd9dc9e778 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
2004-04-23 Dalibor Topic <robilad@kaffe.org>
* java/util/jar/JarFile.java,
diff --git a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
index a073cf4705cb..7798a46668c8 100644
--- a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
+++ b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
@@ -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 @@ exception statement from your version. */
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
diff --git a/libjava/javax/rmi/CORBA/Stub.java b/libjava/javax/rmi/CORBA/Stub.java
index c79b85cb46e5..0ea10c9ee32f 100644
--- a/libjava/javax/rmi/CORBA/Stub.java
+++ b/libjava/javax/rmi/CORBA/Stub.java
@@ -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 @@ exception statement from your version. */
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
diff --git a/libjava/javax/rmi/CORBA/Util.java b/libjava/javax/rmi/CORBA/Util.java
index 45a189d97c5d..34e05dafda2d 100644
--- a/libjava/javax/rmi/CORBA/Util.java
+++ b/libjava/javax/rmi/CORBA/Util.java
@@ -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,16 +38,14 @@ exception statement from your version. */
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
{
diff --git a/libjava/javax/rmi/CORBA/UtilDelegate.java b/libjava/javax/rmi/CORBA/UtilDelegate.java
index 4d611bc8bfb6..fac60d54236a 100644
--- a/libjava/javax/rmi/CORBA/UtilDelegate.java
+++ b/libjava/javax/rmi/CORBA/UtilDelegate.java
@@ -38,9 +38,10 @@ exception statement from your version. */
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;
diff --git a/libjava/javax/rmi/CORBA/ValueHandler.java b/libjava/javax/rmi/CORBA/ValueHandler.java
index 3a008f18cca2..fe9800221910 100644
--- a/libjava/javax/rmi/CORBA/ValueHandler.java
+++ b/libjava/javax/rmi/CORBA/ValueHandler.java
@@ -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 @@ exception statement from your version. */
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;
diff --git a/libjava/javax/rmi/PortableRemoteObject.java b/libjava/javax/rmi/PortableRemoteObject.java
index ee40d9c9e74e..f95dafd6b839 100644
--- a/libjava/javax/rmi/PortableRemoteObject.java
+++ b/libjava/javax/rmi/PortableRemoteObject.java
@@ -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 @@ exception statement from your version. */
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 */
--
GitLab