[multiple changes]

2004-10-18  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/protocol/http/Connection.java,
	java/nio/MappedByteBufferImpl.java,
	java/text/RuleBasedCollator.java,
	java/util/ResourceBundle.java:
	Reworked import statements.

2004-10-18  Jeroen Frijters  <jeroen@frijters.net>

	* java/security/IdentityScope.java
	(systemScope): Removed useless initializer.
	* java/security/Policy.java
	(currentPolicy): Likewise.

From-SVN: r89210

7 files changed, 26 insertions, 10 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index de695a5..080afaf 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,20 @@
 2004-10-18  Michael Koch  <konqueror@gmx.de>
 
+	* gnu/java/net/protocol/http/Connection.java,
+	java/nio/MappedByteBufferImpl.java,
+	java/text/RuleBasedCollator.java,
+	java/util/ResourceBundle.java:
+	Reworked import statements.
+
+2004-10-18  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/security/IdentityScope.java
+	(systemScope): Removed useless initializer.
+	* java/security/Policy.java
+	(currentPolicy): Likewise.
+
+2004-10-18  Michael Koch  <konqueror@gmx.de>
+
 	* java/lang/System.java: Revert accidential change.
 
 2004-10-18  Michael Koch  <konqueror@gmx.de>
diff --git a/libjava/gnu/java/net/protocol/http/Connection.java b/libjava/gnu/java/net/protocol/http/Connection.java
index e15fda8..2894e05 100644
--- a/libjava/gnu/java/net/protocol/http/Connection.java
+++ b/libjava/gnu/java/net/protocol/http/Connection.java
@@ -39,6 +39,9 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.net.HeaderFieldHelper;
+import gnu.java.security.action.GetPropertyAction;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -52,14 +55,11 @@ import java.net.HttpURLConnection;
 import java.net.ProtocolException;
 import java.net.Socket;
 import java.net.URL;
-import java.net.URLConnection;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import gnu.java.net.HeaderFieldHelper;
-import gnu.java.security.action.GetPropertyAction;
 
 /**
  * This subclass of java.net.URLConnection models a URLConnection via
diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java
index 5ed579b..275d088 100644
--- a/libjava/java/nio/MappedByteBufferImpl.java
+++ b/libjava/java/nio/MappedByteBufferImpl.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.nio;
 
-import java.io.IOException;
 import gnu.gcj.RawData;
 
+import java.io.IOException;
+
 final class MappedByteBufferImpl extends MappedByteBuffer
 {
   boolean readOnly;
diff --git a/libjava/java/security/IdentityScope.java b/libjava/java/security/IdentityScope.java
index 5965a00..004f4ee 100644
--- a/libjava/java/security/IdentityScope.java
+++ b/libjava/java/security/IdentityScope.java
@@ -71,7 +71,7 @@ import java.util.Enumeration;
 public abstract class IdentityScope extends Identity
 {
   private static final long serialVersionUID = -2337346281189773310L;
-  private static IdentityScope systemScope = null;
+  private static IdentityScope systemScope;
 
   /**
    * This constructor is used for serialization only and should not be used by
diff --git a/libjava/java/security/Policy.java b/libjava/java/security/Policy.java
index 47171cf..88f2e43 100644
--- a/libjava/java/security/Policy.java
+++ b/libjava/java/security/Policy.java
@@ -95,7 +95,7 @@ import java.util.Map;
  */
 public abstract class Policy
 {
-  static private Policy currentPolicy = null;
+  static private Policy currentPolicy;
 
   /** Map of ProtectionDomains to PermissionCollections for this instance. */
   private Map pd2pc = null;
diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java
index 061d97d..8b7fe16 100644
--- a/libjava/java/text/RuleBasedCollator.java
+++ b/libjava/java/text/RuleBasedCollator.java
@@ -35,11 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.text;
 
-import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 from http://www.javasoft.com.
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 12aaa6d..fdeaeed 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -38,10 +38,10 @@ exception statement from your version. */
 
 package java.util;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
-import java.io.InputStream;
-import java.io.IOException;
 
 /**
  * A resource bundle contains locale-specific data. If you need localized