[multiple changes]

2004-04-23 Dalibor Topic <robilad@kaffe.org>

	* java/util/jar/JarFile.java,
	java/util/jar/JarInputStream.java,
	java/util/jar/JarOutputStream.java,
	java/util/jar/Manifest.java:
	Cleaned up imports.

2004-04-23 Dalibor Topic <robilad@kaffe.org>

	* java/util/ArrayList.java,
	java/util/Calendar.java,
	java/util/Currency.java,
	java/util/HashMap.java,
	java/util/HashSet.java,
	java/util/Hashtable.java,
	java/util/LinkedList.java,
	java/util/Properties.java,
	java/util/PropertyPermission.java,
	java/util/TimeZone.java,
	java/util/TreeMap.java,
	java/util/TreeSet.java,
	java/util/Vector.java,
	java/util/WeakHashMap.java:
	Cleaned up imports.

2004-04-23  Dalibor Topic  <robilad@kaffe.org>

	* java/util/logging/FileHandler.java,
	java/util/logging/Formatter.java,
	java/util/logging/Handler.java,
	java/util/logging/Logger.java,
	java/util/logging/SimpleFormatter.java,
	java/util/logging/XMLFormatter.java:
	Cleaned up imports.

From-SVN: r81077

25 files changed, 98 insertions, 68 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 53c81ea..f05d3c2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,39 @@
+2004-04-23 Dalibor Topic <robilad@kaffe.org>
+
+	* java/util/jar/JarFile.java,
+	java/util/jar/JarInputStream.java,
+	java/util/jar/JarOutputStream.java,
+	java/util/jar/Manifest.java:
+	Cleaned up imports.
+
+2004-04-23 Dalibor Topic <robilad@kaffe.org>
+
+	* java/util/ArrayList.java,
+	java/util/Calendar.java,
+	java/util/Currency.java,
+	java/util/HashMap.java,
+	java/util/HashSet.java,
+	java/util/Hashtable.java,
+	java/util/LinkedList.java,
+	java/util/Properties.java,
+	java/util/PropertyPermission.java,
+	java/util/TimeZone.java,
+	java/util/TreeMap.java,
+	java/util/TreeSet.java,
+	java/util/Vector.java,
+	java/util/WeakHashMap.java:
+	Cleaned up imports.
+
+2004-04-23  Dalibor Topic  <robilad@kaffe.org>
+
+	* java/util/logging/FileHandler.java,
+	java/util/logging/Formatter.java,
+	java/util/logging/Handler.java,
+	java/util/logging/Logger.java,
+	java/util/logging/SimpleFormatter.java,
+	java/util/logging/XMLFormatter.java:
+	Cleaned up imports.
+
 2004-04-22  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am (PEDANTIC_CFLAGS): New -ansi -pedantic -Wall
diff --git a/libjava/java/util/ArrayList.java b/libjava/java/util/ArrayList.java
index c6f6b86..a451f1e 100644
--- a/libjava/java/util/ArrayList.java
+++ b/libjava/java/util/ArrayList.java
@@ -1,6 +1,6 @@
 /* ArrayList.java -- JDK1.2's answer to Vector; this is an array-backed
    implementation of the List interface
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,11 +39,11 @@ exception statement from your version. */
 
 package java.util;
 
-import java.lang.reflect.Array;
-import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Array;
 
 /**
  * An array-backed implementation of the List interface.  This implements
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index 48624be..2a1e1d8 100644
--- a/libjava/java/util/Calendar.java
+++ b/libjava/java/util/Calendar.java
@@ -1,5 +1,5 @@
 /* java.util.Calendar
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package java.util;
 
-import java.lang.reflect.InvocationTargetException;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * This class is an abstract base class for Calendars, which can be
diff --git a/libjava/java/util/Currency.java b/libjava/java/util/Currency.java
index a742831..fa98927 100644
--- a/libjava/java/util/Currency.java
+++ b/libjava/java/util/Currency.java
@@ -1,5 +1,5 @@
 /* Currency.java -- Representation of a currency
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,6 @@ exception statement from your version. */
 package java.util;
 
 import java.io.Serializable;
-import java.util.ResourceBundle;
-import java.util.Locale;
 import java.text.NumberFormat;
 
 public final class Currency implements Serializable
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index fd6b658..dc1b112 100644
--- a/libjava/java/util/HashMap.java
+++ b/libjava/java/util/HashMap.java
@@ -1,6 +1,6 @@
 /* HashMap.java -- a class providing a basic hashtable data structure,
    mapping Object --> Object
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ exception statement from your version. */
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 // NOTE: This implementation is very similar to that of Hashtable. If you fix
 // a bug in here, chances are you should make a similar change to the Hashtable
diff --git a/libjava/java/util/HashSet.java b/libjava/java/util/HashSet.java
index 006db1e..caad3ad 100644
--- a/libjava/java/util/HashSet.java
+++ b/libjava/java/util/HashSet.java
@@ -1,5 +1,5 @@
 /* HashSet.java -- a class providing a HashMap-backed Set
-   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@ exception statement from your version. */
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a HashMap-backed implementation of the Set interface.
diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java
index 698871b..3f5ae4c 100644
--- a/libjava/java/util/Hashtable.java
+++ b/libjava/java/util/Hashtable.java
@@ -1,6 +1,6 @@
 /* Hashtable.java -- a class providing a basic hashtable data structure,
    mapping Object --> Object
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@ exception statement from your version. */
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 // NOTE: This implementation is very similar to that of HashMap. If you fix
 // a bug in here, chances are you should make a similar change to the HashMap
diff --git a/libjava/java/util/LinkedList.java b/libjava/java/util/LinkedList.java
index c891f82..4789a38 100644
--- a/libjava/java/util/LinkedList.java
+++ b/libjava/java/util/LinkedList.java
@@ -1,5 +1,5 @@
 /* LinkedList.java -- Linked list implementation of the List interface
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,10 @@ exception statement from your version. */
 
 
 package java.util;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.lang.reflect.Array;
 
 /**
diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index 921d55c..eac90e4 100644
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -1,5 +1,5 @@
 /* Properties.java -- a set of persistent properties
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package java.util;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.PrintStream;
 import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 
 /**
  * A set of persistent properties, which can be saved or loaded from a stream.
diff --git a/libjava/java/util/PropertyPermission.java b/libjava/java/util/PropertyPermission.java
index 0d439d8..ec2ca7a 100644
--- a/libjava/java/util/PropertyPermission.java
+++ b/libjava/java/util/PropertyPermission.java
@@ -1,5 +1,5 @@
 /* PropertyPermission.java -- permission to get and set System properties
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,13 @@ exception statement from your version. */
 
 package java.util;
 
-import java.security.Permission;
-import java.security.BasicPermission;
-import java.security.PermissionCollection;
-import java.io.ObjectStreamField;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.ObjectStreamField;
+import java.security.BasicPermission;
+import java.security.Permission;
+import java.security.PermissionCollection;
 
 /**
  * This class represents the permission to access and modify a property.<br>
diff --git a/libjava/java/util/TimeZone.java b/libjava/java/util/TimeZone.java
index 2636956..504d34e 100644
--- a/libjava/java/util/TimeZone.java
+++ b/libjava/java/util/TimeZone.java
@@ -1,5 +1,5 @@
 /* java.util.TimeZone
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 
 package java.util;
-import java.text.DateFormatSymbols;
 import gnu.classpath.Configuration;
 
+import java.text.DateFormatSymbols;
+
 /**
  * This class represents a time zone offset and handles daylight savings.
  * 
diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java
index 9426a0b..d3b6748 100644
--- a/libjava/java/util/TreeMap.java
+++ b/libjava/java/util/TreeMap.java
@@ -1,6 +1,6 @@
 /* TreeMap.java -- a class providing a basic Red-Black Tree data structure,
    mapping Object --> Object
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,10 +39,10 @@ exception statement from your version. */
 
 package java.util;
 
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a red-black tree implementation of the SortedMap
diff --git a/libjava/java/util/TreeSet.java b/libjava/java/util/TreeSet.java
index bd625d1..f383570 100644
--- a/libjava/java/util/TreeSet.java
+++ b/libjava/java/util/TreeSet.java
@@ -1,5 +1,5 @@
 /* TreeSet.java -- a class providing a TreeMap-backed SortedSet
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@ exception statement from your version. */
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a TreeMap-backed implementation of the SortedSet
diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java
index 9cf8639..d72788e 100644
--- a/libjava/java/util/Vector.java
+++ b/libjava/java/util/Vector.java
@@ -1,5 +1,5 @@
 /* Vector.java -- Class that provides growable arrays.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@ exception statement from your version. */
 
 
 package java.util;
-import java.lang.reflect.Array;
 import java.io.Serializable;
+import java.lang.reflect.Array;
 
 /**
  * The <code>Vector</code> classes implements growable arrays of Objects.
diff --git a/libjava/java/util/WeakHashMap.java b/libjava/java/util/WeakHashMap.java
index 4cce821..e76e4ba 100644
--- a/libjava/java/util/WeakHashMap.java
+++ b/libjava/java/util/WeakHashMap.java
@@ -1,6 +1,6 @@
 /* WeakHashMap -- a hashtable that keeps only weak references
    to its keys, allowing the virtual machine to reclaim them
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,8 @@ exception statement from your version. */
 
 package java.util;
 
-import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 
 /**
  * A weak hash map has only weak references to the key. This means that it
diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java
index 394b51a..070b337 100644
--- a/libjava/java/util/jar/JarFile.java
+++ b/libjava/java/util/jar/JarFile.java
@@ -1,5 +1,5 @@
 /* JarFile.java - Representation of a jar file
-   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,14 @@ exception statement from your version. */
 
 package java.util.jar;
 
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
 
 /**
  * Representation of a jar file.
diff --git a/libjava/java/util/jar/JarInputStream.java b/libjava/java/util/jar/JarInputStream.java
index daf935f..74649ed 100644
--- a/libjava/java/util/jar/JarInputStream.java
+++ b/libjava/java/util/jar/JarInputStream.java
@@ -1,5 +1,5 @@
 /* JarInputStream.java - InputStream for reading jar files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@ exception statement from your version. */
 
 package java.util.jar;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
diff --git a/libjava/java/util/jar/JarOutputStream.java b/libjava/java/util/jar/JarOutputStream.java
index 1900999..217e245 100644
--- a/libjava/java/util/jar/JarOutputStream.java
+++ b/libjava/java/util/jar/JarOutputStream.java
@@ -1,5 +1,5 @@
 /* JarOutputStream.java - OutputStream for writing jar files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@ exception statement from your version. */
 
 package java.util.jar;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
diff --git a/libjava/java/util/jar/Manifest.java b/libjava/java/util/jar/Manifest.java
index 9a15376..ddc201b 100644
--- a/libjava/java/util/jar/Manifest.java
+++ b/libjava/java/util/jar/Manifest.java
@@ -1,5 +1,5 @@
-/* Attributes.java -- Reads, writes and manipulaties jar manifest files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+/* Manifest.java -- Reads, writes and manipulaties jar manifest files
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,12 +45,9 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Reads, writes and manipulaties jar manifest files.
diff --git a/libjava/java/util/logging/FileHandler.java b/libjava/java/util/logging/FileHandler.java
index b9f6110..fe7afa2 100644
--- a/libjava/java/util/logging/FileHandler.java
+++ b/libjava/java/util/logging/FileHandler.java
@@ -1,7 +1,7 @@
 /* FileHandler.java
    -- a class for publishing log messages to log files
 
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ exception statement from your version.
 
 package java.util.logging;
 
-import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A <code>FileHandler</code> publishes log records to a set of log
diff --git a/libjava/java/util/logging/Formatter.java b/libjava/java/util/logging/Formatter.java
index c481969..8275376 100644
--- a/libjava/java/util/logging/Formatter.java
+++ b/libjava/java/util/logging/Formatter.java
@@ -2,7 +2,7 @@
    -- a class for formatting log messages by localizing message texts
       and performing substitution of parameters
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,8 +43,8 @@ exception statement from your version.
 
 package java.util.logging;
 
-import java.util.ResourceBundle;
 import java.text.MessageFormat;
+import java.util.ResourceBundle;
 
 /**
  * A <code>Formatter</code> supports handlers by localizing
diff --git a/libjava/java/util/logging/Handler.java b/libjava/java/util/logging/Handler.java
index c0fb1cd..f74ed0e 100644
--- a/libjava/java/util/logging/Handler.java
+++ b/libjava/java/util/logging/Handler.java
@@ -1,7 +1,7 @@
 /* Handler.java
    -- a class for publishing log messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ exception statement from your version.
 package java.util.logging;
 
 import java.io.UnsupportedEncodingException;
-import java.security.AccessController;
 
 /**
  * A <code>Handler</code> publishes <code>LogRecords</code> to
diff --git a/libjava/java/util/logging/Logger.java b/libjava/java/util/logging/Logger.java
index 3c19478..b1e6ef5 100644
--- a/libjava/java/util/logging/Logger.java
+++ b/libjava/java/util/logging/Logger.java
@@ -1,7 +1,7 @@
 /* Logger.java
    -- a class for logging messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,9 +42,9 @@ exception statement from your version.
 
 package java.util.logging;
 
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
 import java.util.List;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * A Logger is used for logging information about events. Usually, there
diff --git a/libjava/java/util/logging/SimpleFormatter.java b/libjava/java/util/logging/SimpleFormatter.java
index aece9d4..023e9a7 100644
--- a/libjava/java/util/logging/SimpleFormatter.java
+++ b/libjava/java/util/logging/SimpleFormatter.java
@@ -1,7 +1,7 @@
 /* SimpleFormatter.java
    -- a class for formatting log records into short human-readable messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,8 +42,8 @@ exception statement from your version.
 
 package java.util.logging;
 
-import java.util.Date;
 import java.text.DateFormat;
+import java.util.Date;
 
 /**
  * A <code>SimpleFormatter</code> formats log records into
diff --git a/libjava/java/util/logging/XMLFormatter.java b/libjava/java/util/logging/XMLFormatter.java
index 2de6c73..d864717 100644
--- a/libjava/java/util/logging/XMLFormatter.java
+++ b/libjava/java/util/logging/XMLFormatter.java
@@ -1,7 +1,7 @@
 /* XMLFormatter.java
    -- a class for formatting log messages into a standard XML format
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,10 +42,9 @@ exception statement from your version.
 
 package java.util.logging;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ResourceBundle;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
 
 /**
  * An <code>XMLFormatter</code> formats LogRecords into