This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: java.util - import cleanup
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 22 Apr 2004 08:47:00 +0200
- Subject: Patch: java.util - import cleanup
Hi list,
I just commited the attached patch to merge cleanups done by Dalibor
Topic in GNU classpath.
Michael
2004-04-22 Dalibor Topic <robilad@kaffe.org>
* java/util/prefs/Preferences.java,
java/util/prefs/InvalidPreferencesFormatException.java,
java/util/prefs/BackingStoreException.java,
java/util/prefs/AbstractPreferences.java:
Cleaned up imports.
2004-04-22 Dalibor Topic <robilad@kaffe.org>
* java/util/regex/Matcher.java,
java/util/regex/Pattern.java:
Cleaned up imports.
Index: java/util/prefs/AbstractPreferences.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/prefs/AbstractPreferences.java,v
retrieving revision 1.4
diff -u -r1.4 AbstractPreferences.java
--- java/util/prefs/AbstractPreferences.java 18 Dec 2003 16:48:33 -0000 1.4
+++ java/util/prefs/AbstractPreferences.java 22 Apr 2004 06:45:51 -0000
@@ -38,13 +38,14 @@
package java.util.prefs;
+import gnu.java.util.prefs.NodeWriter;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.TreeSet;
-import gnu.java.util.prefs.NodeWriter;
/**
* Partial implementation of a Preference node.
Index: java/util/prefs/BackingStoreException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/prefs/BackingStoreException.java,v
retrieving revision 1.1
diff -u -r1.1 BackingStoreException.java
--- java/util/prefs/BackingStoreException.java 13 Feb 2003 07:45:58 -0000 1.1
+++ java/util/prefs/BackingStoreException.java 22 Apr 2004 06:45:51 -0000
@@ -38,9 +38,9 @@
package java.util.prefs;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
/**
* Chained exception thrown when backing store fails. This exception is
Index: java/util/prefs/InvalidPreferencesFormatException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/prefs/InvalidPreferencesFormatException.java,v
retrieving revision 1.1
diff -u -r1.1 InvalidPreferencesFormatException.java
--- java/util/prefs/InvalidPreferencesFormatException.java 13 Feb 2003 07:45:58 -0000 1.1
+++ java/util/prefs/InvalidPreferencesFormatException.java 22 Apr 2004 06:45:51 -0000
@@ -38,9 +38,9 @@
package java.util.prefs;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
/**
* Indicates reading prefs from stream failed. Thrown by the
Index: java/util/prefs/Preferences.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/prefs/Preferences.java,v
retrieving revision 1.4
diff -u -r1.4 Preferences.java
--- java/util/prefs/Preferences.java 9 Dec 2003 16:17:01 -0000 1.4
+++ java/util/prefs/Preferences.java 22 Apr 2004 06:45:51 -0000
@@ -37,15 +37,14 @@
package java.util.prefs;
+import gnu.java.util.prefs.NodeReader;
+
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
-
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
-
-import gnu.java.util.prefs.NodeReader;
/**
* Preference node containing key value entries and subnodes.
Index: java/util/regex/Matcher.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/regex/Matcher.java,v
retrieving revision 1.3
diff -u -r1.3 Matcher.java
--- java/util/regex/Matcher.java 9 Mar 2004 19:14:23 -0000 1.3
+++ java/util/regex/Matcher.java 22 Apr 2004 06:45:51 -0000
@@ -38,7 +38,6 @@
package java.util.regex;
-import gnu.regexp.RE;
import gnu.regexp.REMatch;
/**
Index: java/util/regex/Pattern.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/regex/Pattern.java,v
retrieving revision 1.4
diff -u -r1.4 Pattern.java
--- java/util/regex/Pattern.java 9 Mar 2004 19:14:23 -0000 1.4
+++ java/util/regex/Pattern.java 22 Apr 2004 06:45:51 -0000
@@ -38,8 +38,8 @@
package java.util.regex;
import gnu.regexp.RE;
-import gnu.regexp.RESyntax;
import gnu.regexp.REException;
+import gnu.regexp.RESyntax;
import java.io.Serializable;
import java.util.ArrayList;