From 2a6cf044878e6983ad0cf17ecdd690e1cb1de173 Mon Sep 17 00:00:00 2001
From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Apr 2004 06:36:06 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81077 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 36 +++++++++++++++++++
libjava/java/util/ArrayList.java | 6 ++--
libjava/java/util/Calendar.java | 4 +--
libjava/java/util/Currency.java | 4 +--
libjava/java/util/HashMap.java | 4 +--
libjava/java/util/HashSet.java | 4 +--
libjava/java/util/Hashtable.java | 4 +--
libjava/java/util/LinkedList.java | 8 ++---
libjava/java/util/Properties.java | 8 ++---
libjava/java/util/PropertyPermission.java | 12 +++----
libjava/java/util/TimeZone.java | 5 +--
libjava/java/util/TreeMap.java | 8 ++---
libjava/java/util/TreeSet.java | 4 +--
libjava/java/util/Vector.java | 4 +--
libjava/java/util/WeakHashMap.java | 4 +--
libjava/java/util/jar/JarFile.java | 10 +++---
libjava/java/util/jar/JarInputStream.java | 4 +--
libjava/java/util/jar/JarOutputStream.java | 4 +--
libjava/java/util/jar/Manifest.java | 7 ++--
libjava/java/util/logging/FileHandler.java | 4 +--
libjava/java/util/logging/Formatter.java | 4 +--
libjava/java/util/logging/Handler.java | 3 +-
libjava/java/util/logging/Logger.java | 6 ++--
.../java/util/logging/SimpleFormatter.java | 4 +--
libjava/java/util/logging/XMLFormatter.java | 5 ++-
25 files changed, 98 insertions(+), 68 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 53c81ea8256c..f05d3c21b67e 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 c6f6b86991df..a451f1e4c4ae 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 48624beb6146..2a1e1d8b7077 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 a742831e4c3d..fa98927377b4 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 fd6b658bcb77..dc1b112302cf 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 006db1e8603d..caad3ad16e74 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 698871b51249..3f5ae4c18c7f 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 c891f8230f08..4789a387ad53 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 921d55c21507..eac90e490fb6 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 0d439d888a78..ec2ca7abab6b 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 2636956527df..504d34e7ffa9 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 9426a0bc7f5a..d3b67481511e 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 bd625d158dd9..f38357082d3e 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 9cf8639fc3b9..d72788e30187 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 4cce821c5ff6..e76e4bac91f6 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 394b51af6d06..070b3375d19c 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 daf935fa70a0..74649edbadbc 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 19009999e91d..217e245c7ff4 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 9a153760ef8c..ddc201b45b5c 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 b9f61109d3b8..fe7afa25bcb5 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 c4819695165a..82753768f690 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 c0fb1cd653a7..f74ed0ec6c07 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 3c194785c5fd..b1e6ef5460e2 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 aece9d40596c..023e9a7fb897 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 2de6c73c8b0a..d8647177468b 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
--
GitLab