This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: clean up all over
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 3 May 2004 21:53:54 +0200
- Subject: Patch: clean up all over
Hi list,
I just commited the attached patch to merge changes Tom Tromey made in
GNU classpath.
Michael
2004-05-03 Tom Tromey <tromey@redhat.com>
* java/net/URLStreamHandler.java (toExternalForm): Removed
unused variables.
unused constructor.
* java/math/BigDecimal.java (divide): Removed unused variable.
* java/lang/Throwable.java: Cleaned up imports.
* java/lang/ClassLoader.java: Cleaned up imports.
* java/io/FilePermission.java (implies): Removed unused
variable.
* java/awt/TextComponent.java: Removed unused import.
* gnu/java/util/prefs/NodeReader.java: Cleaned up imports.
* gnu/java/util/DoubleEnumeration.java: Removed unused import.
* gnu/java/text/WordBreakIterator.java: Removed unused import.
* gnu/java/text/SentenceBreakIterator.java: Removed unused
import.
* gnu/java/text/LineBreakIterator.java: Removed unused import.
* gnu/java/text/CharacterBreakIterator.java: Removed
unused import.
* gnu/java/security/provider/DSAKeyPairGenerator.java:
Cleaned up imports.
* gnu/java/security/der/DERWriter.java: Cleaned up imports.
* gnu/java/nio/charset/UTF_16Decoder.java (put): Removed
unused method.
* gnu/java/nio/SocketChannelImpl.java: Cleaned up imports.
* gnu/java/nio/FileLockImpl.java: Cleaned up imports.
* gnu/java/io/Base64InputStream.java: Cleaned up imports.
* gnu/java/beans/info/ComponentBeanInfo.java: Cleaned up imports.
* gnu/classpath/ServiceFactory.java: Cleaned up imports.
(lookupProviders): Removed unused variable.
(loadNextServiceProvider): Likewise.
* gnu/java/beans/BeanInfoEmbryo.java: Cleaned up imports.
Index: gnu/java/awt/BitwiseXORComposite.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/BitwiseXORComposite.java,v
retrieving revision 1.1
diff -u -r1.1 BitwiseXORComposite.java
--- gnu/java/awt/BitwiseXORComposite.java 12 Jan 2004 19:11:00 -0000 1.1
+++ gnu/java/awt/BitwiseXORComposite.java 3 May 2004 19:48:50 -0000
@@ -232,7 +232,7 @@
WritableRaster dstOut)
{
int aX, bX, dstX, aY, bY, dstY, width, height;
- int xorPixel, transferType;
+ int xorPixel;
int[] srcLine, dstLine;
aX = src.getMinX();
Index: gnu/java/beans/BeanInfoEmbryo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/beans/BeanInfoEmbryo.java,v
retrieving revision 1.3
diff -u -r1.3 BeanInfoEmbryo.java
--- gnu/java/beans/BeanInfoEmbryo.java 24 Mar 2002 21:32:13 -0000 1.3
+++ gnu/java/beans/BeanInfoEmbryo.java 3 May 2004 19:48:50 -0000
@@ -38,10 +38,17 @@
package gnu.java.beans;
-import java.beans.*;
-import java.util.*;
-import gnu.java.lang.*;
-import java.lang.reflect.*;
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.EventSetDescriptor;
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
/**
** A BeanInfoEmbryo accumulates information about a Bean
Index: gnu/java/beans/info/ComponentBeanInfo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/beans/info/ComponentBeanInfo.java,v
retrieving revision 1.2
diff -u -r1.2 ComponentBeanInfo.java
--- gnu/java/beans/info/ComponentBeanInfo.java 22 Jan 2002 22:39:51 -0000 1.2
+++ gnu/java/beans/info/ComponentBeanInfo.java 3 May 2004 19:48:50 -0000
@@ -38,8 +38,9 @@
package gnu.java.beans.info;
-import gnu.java.beans.*;
-import java.beans.*;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
/** BeanInfo class for java.awt.Component.
** This provides a few properties, but that's
Index: gnu/classpath/ServiceFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/classpath/ServiceFactory.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceFactory.java
--- gnu/classpath/ServiceFactory.java 21 Apr 2004 08:20:30 -0000 1.1
+++ gnu/classpath/ServiceFactory.java 3 May 2004 19:48:50 -0000
@@ -38,11 +38,9 @@
package gnu.classpath;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.Reader;
import java.net.URL;
import java.security.AccessControlContext;
import java.security.AccessController;
@@ -52,8 +50,8 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.logging.LogRecord;
+import java.util.logging.Logger;
/**
@@ -227,7 +225,6 @@
public static Iterator lookupProviders(Class spi,
ClassLoader loader)
{
- InputStream stream;
String resourceName;
Enumeration urls;
@@ -407,7 +404,6 @@
private Object loadNextServiceProvider()
{
String line;
- Class klass;
if (reader == null)
advanceReader();
Index: gnu/java/io/Base64InputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/io/Base64InputStream.java,v
retrieving revision 1.1
diff -u -r1.1 Base64InputStream.java
--- gnu/java/io/Base64InputStream.java 30 Apr 2003 07:23:40 -0000 1.1
+++ gnu/java/io/Base64InputStream.java 3 May 2004 19:48:50 -0000
@@ -39,9 +39,8 @@
package gnu.java.io;
import java.io.FilterInputStream;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.EOFException;
+import java.io.InputStream;
/**
* A filter input stream that decodes data encoded in the Base-64
Index: gnu/java/nio/FileLockImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/FileLockImpl.java,v
retrieving revision 1.10
diff -u -r1.10 FileLockImpl.java
--- gnu/java/nio/FileLockImpl.java 20 Apr 2004 10:43:48 -0000 1.10
+++ gnu/java/nio/FileLockImpl.java 3 May 2004 19:48:50 -0000
@@ -38,10 +38,10 @@
package gnu.java.nio;
+import gnu.java.nio.channels.FileChannelImpl;
+
import java.io.IOException;
import java.nio.channels.FileLock;
-import gnu.classpath.Configuration;
-import gnu.java.nio.channels.FileChannelImpl;
/**
* @author Michael Koch
Index: gnu/java/nio/SocketChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.18
diff -u -r1.18 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java 5 Feb 2004 15:57:01 -0000 1.18
+++ gnu/java/nio/SocketChannelImpl.java 3 May 2004 19:48:50 -0000
@@ -38,12 +38,12 @@
package gnu.java.nio;
-import java.io.InputStream;
+import gnu.java.net.PlainSocketImpl;
+
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
-import gnu.java.net.PlainSocketImpl;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
@@ -53,13 +53,12 @@
import java.nio.channels.ConnectionPendingException;
import java.nio.channels.NoConnectionPendingException;
import java.nio.channels.NotYetConnectedException;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
import java.nio.channels.UnresolvedAddressException;
import java.nio.channels.UnsupportedAddressTypeException;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.Selector;
-import java.nio.channels.SelectionKey;
import java.nio.channels.spi.SelectorProvider;
-import gnu.classpath.Configuration;
public final class SocketChannelImpl extends SocketChannel
{
Index: gnu/java/nio/charset/UTF_16Decoder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/charset/UTF_16Decoder.java,v
retrieving revision 1.1
diff -u -r1.1 UTF_16Decoder.java
--- gnu/java/nio/charset/UTF_16Decoder.java 11 Nov 2002 07:36:41 -0000 1.1
+++ gnu/java/nio/charset/UTF_16Decoder.java 3 May 2004 19:48:50 -0000
@@ -144,24 +144,6 @@
}
}
- /**
- * Writes <code>c</code> to <code>out</code> in the byte order
- * specified by <code>byteOrder</code>.
- **/
- private void put (ByteBuffer out, char c)
- {
- if (byteOrder == BIG_ENDIAN)
- {
- out.put ((byte) (c >> 8));
- out.put ((byte) (c & 0xFF));
- }
- else
- {
- out.put ((byte) (c & 0xFF));
- out.put ((byte) (c >> 8));
- }
- }
-
protected void implReset ()
{
byteOrder = originalByteOrder;
Index: gnu/java/security/der/DERWriter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/der/DERWriter.java,v
retrieving revision 1.1
diff -u -r1.1 DERWriter.java
--- gnu/java/security/der/DERWriter.java 30 Apr 2003 07:23:40 -0000 1.1
+++ gnu/java/security/der/DERWriter.java 3 May 2004 19:48:50 -0000
@@ -38,27 +38,22 @@
package gnu.java.security.der;
+import gnu.java.security.OID;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-
import java.math.BigInteger;
-
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-
import java.text.SimpleDateFormat;
-
-import java.util.BitSet;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TimeZone;
-
-import gnu.java.security.OID;
/**
* Methods that allow various Java types to be written as a DER
Index: gnu/java/security/provider/DSAKeyPairGenerator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/DSAKeyPairGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 DSAKeyPairGenerator.java
--- gnu/java/security/provider/DSAKeyPairGenerator.java 11 Aug 2002 12:08:03 -0000 1.3
+++ gnu/java/security/provider/DSAKeyPairGenerator.java 3 May 2004 19:48:50 -0000
@@ -39,19 +39,17 @@
package gnu.java.security.provider;
import java.math.BigInteger;
-import java.security.AlgorithmParameters;
import java.security.AlgorithmParameterGenerator;
-import java.security.KeyPairGeneratorSpi;
+import java.security.AlgorithmParameters;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
import java.security.KeyPair;
+import java.security.KeyPairGeneratorSpi;
import java.security.SecureRandom;
-import java.security.InvalidParameterException;
-import java.security.InvalidAlgorithmParameterException;
import java.security.interfaces.DSAParams;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
import java.util.Random;
-
-import gnu.java.security.util.Prime;
public class DSAKeyPairGenerator extends KeyPairGeneratorSpi
implements java.security.interfaces.DSAKeyPairGenerator
Index: gnu/java/text/CharacterBreakIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/text/CharacterBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 CharacterBreakIterator.java
--- gnu/java/text/CharacterBreakIterator.java 22 Jan 2002 22:40:02 -0000 1.2
+++ gnu/java/text/CharacterBreakIterator.java 3 May 2004 19:48:50 -0000
@@ -38,7 +38,6 @@
package gnu.java.text;
-import java.text.BreakIterator;
import java.text.CharacterIterator;
/**
Index: gnu/java/text/LineBreakIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/text/LineBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 LineBreakIterator.java
--- gnu/java/text/LineBreakIterator.java 22 Jan 2002 22:40:02 -0000 1.2
+++ gnu/java/text/LineBreakIterator.java 3 May 2004 19:48:50 -0000
@@ -38,7 +38,6 @@
package gnu.java.text;
-import java.text.BreakIterator;
import java.text.CharacterIterator;
/**
Index: gnu/java/text/WordBreakIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/text/WordBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 WordBreakIterator.java
--- gnu/java/text/WordBreakIterator.java 22 Jan 2002 22:40:02 -0000 1.2
+++ gnu/java/text/WordBreakIterator.java 3 May 2004 19:48:50 -0000
@@ -38,7 +38,6 @@
package gnu.java.text;
-import java.text.BreakIterator;
import java.text.CharacterIterator;
/**
Index: gnu/java/text/SentenceBreakIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/text/SentenceBreakIterator.java,v
retrieving revision 1.3
diff -u -r1.3 SentenceBreakIterator.java
--- gnu/java/text/SentenceBreakIterator.java 12 May 2002 01:11:18 -0000 1.3
+++ gnu/java/text/SentenceBreakIterator.java 3 May 2004 19:48:50 -0000
@@ -38,7 +38,6 @@
package gnu.java.text;
-import java.text.BreakIterator;
import java.text.CharacterIterator;
/**
Index: gnu/java/util/DoubleEnumeration.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/util/DoubleEnumeration.java,v
retrieving revision 1.2
diff -u -r1.2 DoubleEnumeration.java
--- gnu/java/util/DoubleEnumeration.java 22 Jan 2002 22:40:03 -0000 1.2
+++ gnu/java/util/DoubleEnumeration.java 3 May 2004 19:48:50 -0000
@@ -37,7 +37,6 @@
package gnu.java.util;
-import java.io.*;
import java.util.Enumeration;
import java.util.NoSuchElementException;
Index: gnu/java/util/prefs/NodeReader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/util/prefs/NodeReader.java,v
retrieving revision 1.1
diff -u -r1.1 NodeReader.java
--- gnu/java/util/prefs/NodeReader.java 13 Feb 2003 07:45:58 -0000 1.1
+++ gnu/java/util/prefs/NodeReader.java 3 May 2004 19:48:50 -0000
@@ -38,13 +38,13 @@
package gnu.java.util.prefs;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.Reader;
-
-import java.util.prefs.*;
+import java.util.prefs.InvalidPreferencesFormatException;
+import java.util.prefs.Preferences;
+import java.util.prefs.PreferencesFactory;
/**
* Reads and imports preferences nodes from files.
Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextComponent.java,v
retrieving revision 1.11
diff -u -r1.11 TextComponent.java
--- java/awt/TextComponent.java 4 Dec 2003 19:31:01 -0000 1.11
+++ java/awt/TextComponent.java 3 May 2004 19:48:51 -0000
@@ -41,7 +41,6 @@
import java.awt.event.TextEvent;
import java.awt.event.TextListener;
import java.awt.peer.TextComponentPeer;
-import java.awt.peer.ComponentPeer;
import java.io.Serializable;
import java.util.EventListener;
Index: java/io/FilePermission.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/FilePermission.java,v
retrieving revision 1.10
diff -u -r1.10 FilePermission.java
--- java/io/FilePermission.java 19 Mar 2004 22:05:33 -0000 1.10
+++ java/io/FilePermission.java 3 May 2004 19:48:51 -0000
@@ -229,7 +229,6 @@
return false;
/* Make sure there are no subdirectories specified
underneath this one */
- String sub2 = f2.substring(sub1.length()+1);
if(f2.substring(sub1.length()+1).indexOf(File.separatorChar)
!= -1)
return false;
Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/ClassLoader.java,v
retrieving revision 1.32
diff -u -r1.32 ClassLoader.java
--- java/lang/ClassLoader.java 20 Apr 2004 12:30:18 -0000 1.32
+++ java/lang/ClassLoader.java 3 May 2004 19:48:51 -0000
@@ -38,9 +38,11 @@
package java.lang;
-import java.io.InputStream;
+import gnu.java.util.DoubleEnumeration;
+import gnu.java.util.EmptyEnumeration;
+
import java.io.IOException;
-import java.lang.reflect.Constructor;
+import java.io.InputStream;
import java.net.URL;
import java.security.CodeSource;
import java.security.PermissionCollection;
@@ -49,8 +51,6 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import gnu.java.util.DoubleEnumeration;
-import gnu.java.util.EmptyEnumeration;
/**
* The ClassLoader is a way of customizing the way Java gets its classes
Index: java/lang/Throwable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Throwable.java,v
retrieving revision 1.15
diff -u -r1.15 Throwable.java
--- java/lang/Throwable.java 20 Apr 2004 12:30:19 -0000 1.15
+++ java/lang/Throwable.java 3 May 2004 19:48:51 -0000
@@ -37,13 +37,9 @@
package java.lang;
-import java.io.Serializable;
-import java.io.PrintWriter;
import java.io.PrintStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
/**
* Throwable is the superclass of all exceptions that can be raised.
Index: java/math/BigDecimal.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/math/BigDecimal.java,v
retrieving revision 1.10
diff -u -r1.10 BigDecimal.java
--- java/math/BigDecimal.java 1 Aug 2003 15:07:49 -0000 1.10
+++ java/math/BigDecimal.java 3 May 2004 19:48:51 -0000
@@ -271,7 +271,6 @@
return newScale == 0 ? ZERO : new BigDecimal (ZERO.intVal, newScale);
// Ensure that pow gets a non-negative value.
- int valScale = val.scale;
BigInteger valIntVal = val.intVal;
int power = newScale - (scale - val.scale);
if (power < 0)