[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: FYI: more minor cleanups
|
From: |
Tom Tromey |
|
Subject: |
Patch: FYI: more minor cleanups |
|
Date: |
23 Apr 2004 14:47:55 -0600 |
Even more minor cleanups found by Eclipse.
This is all unused variables, imports, or private constructors.
(Note that some private constructors in Classpath are used by native
code and are documented as such. I don't think the ones below qualify.)
Tom
Index: gnu/classpath/ServiceFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/ServiceFactory.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceFactory.java
--- gnu/classpath/ServiceFactory.java 24 Mar 2004 07:29:56 -0000 1.1
+++ gnu/classpath/ServiceFactory.java 23 Apr 2004 20:15: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/beans/BeanInfoEmbryo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/beans/BeanInfoEmbryo.java,v
retrieving revision 1.7
diff -u -r1.7 BeanInfoEmbryo.java
--- gnu/java/beans/BeanInfoEmbryo.java 23 Feb 2002 09:19:52 -0000 1.7
+++ gnu/java/beans/BeanInfoEmbryo.java 23 Apr 2004 20:15: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:
/cvsroot/classpath/classpath/gnu/java/beans/info/ComponentBeanInfo.java,v
retrieving revision 1.4
diff -u -r1.4 ComponentBeanInfo.java
--- gnu/java/beans/info/ComponentBeanInfo.java 22 Jan 2002 22:26:57 -0000
1.4
+++ gnu/java/beans/info/ComponentBeanInfo.java 23 Apr 2004 20:15:51 -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/java/io/Base64InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/Base64InputStream.java,v
retrieving revision 1.1
diff -u -r1.1 Base64InputStream.java
--- gnu/java/io/Base64InputStream.java 23 Apr 2003 23:05:52 -0000 1.1
+++ gnu/java/io/Base64InputStream.java 23 Apr 2004 20:15:51 -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: /cvsroot/classpath/classpath/gnu/java/nio/FileLockImpl.java,v
retrieving revision 1.6
diff -u -r1.6 FileLockImpl.java
--- gnu/java/nio/FileLockImpl.java 8 Apr 2004 20:04:12 -0000 1.6
+++ gnu/java/nio/FileLockImpl.java 23 Apr 2004 20:15:52 -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: /cvsroot/classpath/classpath/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.22
diff -u -r1.22 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java 6 Feb 2004 09:13:24 -0000 1.22
+++ gnu/java/nio/SocketChannelImpl.java 23 Apr 2004 20:15:52 -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: /cvsroot/classpath/classpath/gnu/java/nio/charset/UTF_16Decoder.java,v
retrieving revision 1.2
diff -u -r1.2 UTF_16Decoder.java
--- gnu/java/nio/charset/UTF_16Decoder.java 8 Nov 2002 14:05:22 -0000
1.2
+++ gnu/java/nio/charset/UTF_16Decoder.java 23 Apr 2004 20:15:52 -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: /cvsroot/classpath/classpath/gnu/java/security/der/DERWriter.java,v
retrieving revision 1.1
diff -u -r1.1 DERWriter.java
--- gnu/java/security/der/DERWriter.java 23 Apr 2003 22:52:15 -0000
1.1
+++ gnu/java/security/der/DERWriter.java 23 Apr 2004 20:15:53 -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:
/cvsroot/classpath/classpath/gnu/java/security/provider/DSAKeyPairGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 DSAKeyPairGenerator.java
--- gnu/java/security/provider/DSAKeyPairGenerator.java 22 Jan 2002 22:26:58
-0000 1.3
+++ gnu/java/security/provider/DSAKeyPairGenerator.java 23 Apr 2004 20:15:53
-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:
/cvsroot/classpath/classpath/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:26:58 -0000
1.2
+++ gnu/java/text/CharacterBreakIterator.java 23 Apr 2004 20:15:53 -0000
@@ -38,7 +38,6 @@
package gnu.java.text;
-import java.text.BreakIterator;
import java.text.CharacterIterator;
/**
@@ -161,7 +160,6 @@
if (iter.getIndex() == iter.getBeginIndex())
return DONE;
- int start = iter.getBeginIndex();
while (iter.getIndex() >= iter.getBeginIndex())
{
char c = iter.previous();
Index: gnu/java/text/LineBreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/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:26:58 -0000
1.2
+++ gnu/java/text/LineBreakIterator.java 23 Apr 2004 20:15:53 -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:
/cvsroot/classpath/classpath/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:15:36 -0000
1.3
+++ gnu/java/text/SentenceBreakIterator.java 23 Apr 2004 20:15:54 -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: /cvsroot/classpath/classpath/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:26:58 -0000
1.2
+++ gnu/java/text/WordBreakIterator.java 23 Apr 2004 20:16:05 -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: /cvsroot/classpath/classpath/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:26:58 -0000
1.2
+++ gnu/java/util/DoubleEnumeration.java 23 Apr 2004 20:16:05 -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: /cvsroot/classpath/classpath/gnu/java/util/prefs/NodeReader.java,v
retrieving revision 1.3
diff -u -r1.3 NodeReader.java
--- gnu/java/util/prefs/NodeReader.java 10 Sep 2002 20:16:16 -0000 1.3
+++ gnu/java/util/prefs/NodeReader.java 23 Apr 2004 20:16:05 -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: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.13
diff -u -r1.13 TextComponent.java
--- java/awt/TextComponent.java 23 Apr 2004 17:37:46 -0000 1.13
+++ java/awt/TextComponent.java 23 Apr 2004 20:16:06 -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: /cvsroot/classpath/classpath/java/io/FilePermission.java,v
retrieving revision 1.14
diff -u -r1.14 FilePermission.java
--- java/io/FilePermission.java 12 Mar 2004 14:32:36 -0000 1.14
+++ java/io/FilePermission.java 23 Apr 2004 20:16:07 -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: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v
retrieving revision 1.30
diff -u -r1.30 ClassLoader.java
--- java/lang/ClassLoader.java 17 Apr 2004 17:08:22 -0000 1.30
+++ java/lang/ClassLoader.java 23 Apr 2004 20:16:07 -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/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.55
diff -u -r1.55 String.java
--- java/lang/String.java 17 Apr 2004 17:08:22 -0000 1.55
+++ java/lang/String.java 23 Apr 2004 20:16:07 -0000
@@ -39,15 +39,15 @@
package java.lang;
+import gnu.java.io.EncodingManager;
+import gnu.java.lang.CharData;
+
+import java.io.CharConversionException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Comparator;
import java.util.Locale;
import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import java.io.CharConversionException;
-import gnu.java.io.EncodingManager;
-import gnu.java.lang.CharData;
/**
* Strings represent an immutable set of characters. All String literals
Index: java/lang/Throwable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v
retrieving revision 1.21
diff -u -r1.21 Throwable.java
--- java/lang/Throwable.java 17 Apr 2004 17:08:23 -0000 1.21
+++ java/lang/Throwable.java 23 Apr 2004 20:16:07 -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: /cvsroot/classpath/classpath/java/math/BigDecimal.java,v
retrieving revision 1.16
diff -u -r1.16 BigDecimal.java
--- java/math/BigDecimal.java 1 Aug 2003 12:44:08 -0000 1.16
+++ java/math/BigDecimal.java 23 Apr 2004 20:16:08 -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)
Index: java/net/URLClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLClassLoader.java,v
retrieving revision 1.20
diff -u -r1.20 URLClassLoader.java
--- java/net/URLClassLoader.java 8 Apr 2004 17:25:02 -0000 1.20
+++ java/net/URLClassLoader.java 23 Apr 2004 20:16:08 -0000
@@ -548,25 +548,6 @@
}
/**
- * Private constructor used by the static
- * <code>newInstance(URL[])</code> method. Creates an
- * <code>URLClassLoader</code> without any <code>URL</code>s
- * yet. This is used to bypass the normal security check for
- * creating classloaders, but remembers the security context which
- * will be used when defining classes. The <code>URL</code>s to
- * load from must be added by the <code>newInstance()</code> method
- * in the security context of the caller.
- *
- * @param securityContext the security context of the unprivileged code.
- */
- private URLClassLoader(AccessControlContext securityContext)
- {
- super();
- this.factory = null;
- this.securityContext = securityContext;
- }
-
- /**
* Creates a <code>URLClassLoader</code> that gets classes from the supplied
* <code>URL</code>s.
* To determine if this classloader may be created the constructor of
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.27
diff -u -r1.27 URLConnection.java
--- java/net/URLConnection.java 23 Apr 2004 07:29:02 -0000 1.27
+++ java/net/URLConnection.java 23 Apr 2004 20:16:08 -0000
@@ -46,7 +46,6 @@
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
-import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.27
diff -u -r1.27 URLStreamHandler.java
--- java/net/URLStreamHandler.java 20 Apr 2004 16:29:11 -0000 1.27
+++ java/net/URLStreamHandler.java 23 Apr 2004 20:16:08 -0000
@@ -502,12 +502,9 @@
protected String toExternalForm(URL url)
{
String protocol;
- String host;
String file;
String ref;
- String user;
String authority;
- int port;
protocol = url.getProtocol();
authority = url.getAuthority();
- Patch: FYI: more minor cleanups,
Tom Tromey <=