Timestamp.java, [...]: Reorganized imports and fixed copyright headers.

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

	* 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.

From-SVN: r89324
This commit is contained in:
Michael Koch 2004-10-20 08:09:27 +00:00 committed by Michael Koch
parent aa75e737b8
commit 724c25170e
17 changed files with 66 additions and 49 deletions

View File

@ -1,3 +1,23 @@
2004-10-20 Michael Koch <konqueror@gmx.de>
* 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 <konqueror@gmx.de>
* java/util/logging/ConsoleHandler.java,

View File

@ -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;
/**

View File

@ -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 <code>CharacterIterator</code> interface

View File

@ -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;

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -37,6 +37,7 @@ exception statement from your version. */
package javax.naming.directory;
import java.io.Serializable;
/**

View File

@ -37,6 +37,7 @@ exception statement from your version. */
package javax.naming.directory;
import java.io.Serializable;
/**

View File

@ -37,6 +37,7 @@ exception statement from your version. */
package javax.naming.event;
import java.util.EventListener;
/**

View File

@ -37,6 +37,7 @@ exception statement from your version. */
package javax.naming.ldap;
import java.io.Serializable;
/**

View File

@ -37,6 +37,7 @@ exception statement from your version. */
package javax.naming.ldap;
import java.io.Serializable;
/**

View File

@ -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;