diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 70ec77ab313f..840bf74813fa 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,23 @@ +2004-10-20 Michael Koch + + * java/sql/Timestamp.java, + java/text/AttributedCharacterIterator.java, + java/text/AttributedString.java, + java/util/zip/CheckedOutputStream.java, + java/util/zip/DeflaterOutputStream.java, + java/util/zip/ZipFile.java, + javax/crypto/Cipher.java, + javax/crypto/ExemptionMechanismException.java, + javax/crypto/SecretKey.java, + javax/crypto/SecretKeyFactory.java, + javax/naming/directory/ModificationItem.java, + javax/naming/directory/SearchControls.java, + javax/naming/event/NamingListener.java, + javax/naming/ldap/Control.java, + javax/naming/ldap/ExtendedResponse.java, + javax/net/ssl/SSLSocketFactory.java: + Reorganized imports and fixed copyright headers. + 2004-10-20 Michael Koch * java/util/logging/ConsoleHandler.java, diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java index b791ca1e0f2e..501810054f29 100644 --- a/libjava/java/sql/Timestamp.java +++ b/libjava/java/sql/Timestamp.java @@ -1,5 +1,5 @@ /* Time.java -- Wrapper around java.util.Date - Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,8 +38,8 @@ exception statement from your version. */ package java.sql; -import java.text.ParseException; import java.text.DecimalFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; /** diff --git a/libjava/java/text/AttributedCharacterIterator.java b/libjava/java/text/AttributedCharacterIterator.java index c1366adc4ad5..3bcf1d05aa3f 100644 --- a/libjava/java/text/AttributedCharacterIterator.java +++ b/libjava/java/text/AttributedCharacterIterator.java @@ -38,10 +38,10 @@ exception statement from your version. */ package java.text; -import java.io.Serializable; import java.io.InvalidObjectException; -import java.util.Set; +import java.io.Serializable; import java.util.Map; +import java.util.Set; /** * This interface extends the CharacterIterator interface diff --git a/libjava/java/text/AttributedString.java b/libjava/java/text/AttributedString.java index 41512dc6c5e6..752b37681907 100644 --- a/libjava/java/text/AttributedString.java +++ b/libjava/java/text/AttributedString.java @@ -38,8 +38,8 @@ exception statement from your version. */ package java.text; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; diff --git a/libjava/java/util/zip/CheckedOutputStream.java b/libjava/java/util/zip/CheckedOutputStream.java index 266a36923515..0f22b21cbfa2 100644 --- a/libjava/java/util/zip/CheckedOutputStream.java +++ b/libjava/java/util/zip/CheckedOutputStream.java @@ -35,11 +35,12 @@ 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.util.zip; import java.io.FilterOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; /* Written using on-line Java Platform 1.2 API Specification * and JCL book. diff --git a/libjava/java/util/zip/DeflaterOutputStream.java b/libjava/java/util/zip/DeflaterOutputStream.java index 7ae7d193acdc..4d84f2a3f57b 100644 --- a/libjava/java/util/zip/DeflaterOutputStream.java +++ b/libjava/java/util/zip/DeflaterOutputStream.java @@ -35,11 +35,12 @@ 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.util.zip; import java.io.FilterOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; /* Written using on-line Java Platform 1.2 API Specification * and JCL book. diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 25b5785432a2..1f9ab5ed5eef 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -35,19 +35,19 @@ 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.util.zip; import java.io.BufferedInputStream; import java.io.DataInput; +import java.io.EOFException; import java.io.File; import java.io.InputStream; import java.io.IOException; -import java.io.EOFException; import java.io.RandomAccessFile; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; -import java.util.NoSuchElementException; /** * This class represents a Zip archive. You can ask for the contained diff --git a/libjava/javax/crypto/Cipher.java b/libjava/javax/crypto/Cipher.java index d768d6ad7d37..af7f2f244194 100644 --- a/libjava/javax/crypto/Cipher.java +++ b/libjava/javax/crypto/Cipher.java @@ -51,7 +51,6 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.security.spec.AlgorithmParameterSpec; -import java.util.Enumeration; import java.util.StringTokenizer; import gnu.java.security.Engine; diff --git a/libjava/javax/crypto/ExemptionMechanismException.java b/libjava/javax/crypto/ExemptionMechanismException.java index 42e1c5e9b771..2c0665dc8155 100644 --- a/libjava/javax/crypto/ExemptionMechanismException.java +++ b/libjava/javax/crypto/ExemptionMechanismException.java @@ -1,25 +1,22 @@ /* ExemptionMechanismException -- An error in an exemption mechanism. Copyright (C) 2004 Free Software Foundation, Inc. -This file is a part of GNU Classpath. +This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +the Free Software Foundation; either version 2, or (at your option) +any later version. GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along -with GNU Classpath; if not, write to the - - Free Software Foundation, Inc., - 59 Temple Place, Suite 330, - Boston, MA 02111-1307 - USA +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -29,14 +26,14 @@ combination. As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under terms -of your choice, provided that you also meet, for each linked independent -module, the terms and conditions of the license of that module. An -independent module is a module which is not derived from or based on -this library. If you modify this library, you may extend 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. */ +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +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 javax.crypto; diff --git a/libjava/javax/crypto/SecretKey.java b/libjava/javax/crypto/SecretKey.java index 85529b94de2a..ce7057e7092d 100644 --- a/libjava/javax/crypto/SecretKey.java +++ b/libjava/javax/crypto/SecretKey.java @@ -1,25 +1,22 @@ /* SecretKey.java -- A key for symmetric cryptography. Copyright (C) 2004 Free Software Foundation, Inc. -This file is a part of GNU Classpath. +This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +the Free Software Foundation; either version 2, or (at your option) +any later version. GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along -with GNU Classpath; if not, write to the - - Free Software Foundation, Inc., - 59 Temple Place, Suite 330, - Boston, MA 02111-1307 - USA +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -29,14 +26,14 @@ combination. As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under terms -of your choice, provided that you also meet, for each linked independent -module, the terms and conditions of the license of that module. An -independent module is a module which is not derived from or based on -this library. If you modify this library, you may extend 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. */ +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +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 javax.crypto; diff --git a/libjava/javax/crypto/SecretKeyFactory.java b/libjava/javax/crypto/SecretKeyFactory.java index 92f18ec66599..d12e1b582e9b 100644 --- a/libjava/javax/crypto/SecretKeyFactory.java +++ b/libjava/javax/crypto/SecretKeyFactory.java @@ -44,7 +44,6 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Provider; -import java.security.SecureRandom; import java.security.Security; import java.security.spec.KeySpec; import java.security.spec.InvalidKeySpecException; diff --git a/libjava/javax/naming/directory/ModificationItem.java b/libjava/javax/naming/directory/ModificationItem.java index b32fd6f7aa50..6b9127df8f08 100644 --- a/libjava/javax/naming/directory/ModificationItem.java +++ b/libjava/javax/naming/directory/ModificationItem.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.naming.directory; + import java.io.Serializable; /** diff --git a/libjava/javax/naming/directory/SearchControls.java b/libjava/javax/naming/directory/SearchControls.java index 2b040d91fff8..0bccb357f946 100644 --- a/libjava/javax/naming/directory/SearchControls.java +++ b/libjava/javax/naming/directory/SearchControls.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.naming.directory; + import java.io.Serializable; /** diff --git a/libjava/javax/naming/event/NamingListener.java b/libjava/javax/naming/event/NamingListener.java index 4a11c9f89c55..d75dd5b93167 100644 --- a/libjava/javax/naming/event/NamingListener.java +++ b/libjava/javax/naming/event/NamingListener.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.naming.event; + import java.util.EventListener; /** diff --git a/libjava/javax/naming/ldap/Control.java b/libjava/javax/naming/ldap/Control.java index ee29e586b7c4..20ccafebe5e5 100644 --- a/libjava/javax/naming/ldap/Control.java +++ b/libjava/javax/naming/ldap/Control.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.naming.ldap; + import java.io.Serializable; /** diff --git a/libjava/javax/naming/ldap/ExtendedResponse.java b/libjava/javax/naming/ldap/ExtendedResponse.java index d22e2274e6e9..4815ad9ab22c 100644 --- a/libjava/javax/naming/ldap/ExtendedResponse.java +++ b/libjava/javax/naming/ldap/ExtendedResponse.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.naming.ldap; + import java.io.Serializable; /** diff --git a/libjava/javax/net/ssl/SSLSocketFactory.java b/libjava/javax/net/ssl/SSLSocketFactory.java index 181ab18a1d2d..3532164168b4 100644 --- a/libjava/javax/net/ssl/SSLSocketFactory.java +++ b/libjava/javax/net/ssl/SSLSocketFactory.java @@ -40,9 +40,7 @@ package javax.net.ssl; import java.io.IOException; import java.net.Socket; -import java.security.AccessController; import java.security.KeyStore; -import java.security.PrivilegedAction; import java.security.Security; import javax.net.SocketFactory;