From d70bd7fff0dc91c22ce7e118b90dc91bfa1e935a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 5 May 2004 06:52:56 +0000 Subject: [PATCH] Format.java: Cleaned up imports. 2004-05-05 Tom Tromey * java/text/Format.java: Cleaned up imports. * java/text/DecimalFormat.java: Cleaned up imports. * java/security/SecureRandom.java: Cleaned up imports. (SecureRandom): Removed unused variable. * java/security/UnresolvedPermission.java: Cleaned up imports. * java/util/Date.java (parse): Removed unused variable. * java/util/ResourceBundle.java: Cleaned up imports. (getBundle): Removed unused variable. (tryBundle): Likewise. * java/util/regex/Pattern.java (Pattern): Removed unused constructor. From-SVN: r81503 --- libjava/ChangeLog | 13 +++++++++++++ libjava/java/security/SecureRandom.java | 9 ++++----- libjava/java/security/UnresolvedPermission.java | 1 - libjava/java/text/Format.java | 5 ----- libjava/java/util/Date.java | 1 - libjava/java/util/ResourceBundle.java | 3 --- libjava/java/util/regex/Pattern.java | 6 ------ 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3e419de7c66..20362a972c4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,16 @@ +2004-05-05 Tom Tromey + + * java/text/Format.java: Cleaned up imports. + * java/text/DecimalFormat.java: Cleaned up imports. + * java/security/SecureRandom.java: Cleaned up imports. + (SecureRandom): Removed unused variable. + * java/security/UnresolvedPermission.java: Cleaned up imports. + * java/util/Date.java (parse): Removed unused variable. + * java/util/ResourceBundle.java: Cleaned up imports. + (getBundle): Removed unused variable. + (tryBundle): Likewise. + * java/util/regex/Pattern.java (Pattern): Removed unused constructor. + 2004-05-05 Guilhem Lavaux * java/text/SimpleDateFormat.java: diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java index 56f4b22672c..d7fda7ba744 100644 --- a/libjava/java/security/SecureRandom.java +++ b/libjava/java/security/SecureRandom.java @@ -37,12 +37,11 @@ exception statement from your version. */ package java.security; -import java.io.Serializable; -import java.util.Random; -import java.util.Enumeration; - import gnu.java.security.Engine; +import java.util.Enumeration; +import java.util.Random; + /** * An interface to a cryptographically secure pseudo-random number * generator (PRNG). Random (or at least unguessable) numbers are used @@ -94,7 +93,7 @@ public class SecureRandom extends Random String key; String classname = null; - int i, flag = 0; + int i; Enumeration e; for (i = 0; i < p.length; i++) { diff --git a/libjava/java/security/UnresolvedPermission.java b/libjava/java/security/UnresolvedPermission.java index 954b562c773..7efb35582fc 100644 --- a/libjava/java/security/UnresolvedPermission.java +++ b/libjava/java/security/UnresolvedPermission.java @@ -37,7 +37,6 @@ exception statement from your version. */ package java.security; -import java.io.Serializable; // All uses of Certificate in this file refer to the one in the listed // package, not this one. import java.security.cert.Certificate; diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java index 0cef00a8d07..7bc389eb71e 100644 --- a/libjava/java/text/Format.java +++ b/libjava/java/text/Format.java @@ -39,11 +39,6 @@ exception statement from your version. */ package java.text; import gnu.java.text.FormatCharacterIterator; - -import java.util.Set; -import java.util.Map; -import java.util.HashSet; -import java.util.HashMap; import java.io.Serializable; /** diff --git a/libjava/java/util/Date.java b/libjava/java/util/Date.java index c25b503dcde..43ae9699082 100644 --- a/libjava/java/util/Date.java +++ b/libjava/java/util/Date.java @@ -460,7 +460,6 @@ public class Date implements Cloneable, Comparable, java.io.Serializable int curYear = 1900 + new Date().getYear(); int firstYear = curYear - 80; year = firstYear / 100 * 100 + num; - int yx = year; if (year < firstYear) year += 100; } diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java index 6663bd4533e..264152a8cb7 100644 --- a/libjava/java/util/ResourceBundle.java +++ b/libjava/java/util/ResourceBundle.java @@ -42,7 +42,6 @@ import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.io.InputStream; import java.io.IOException; -import gnu.classpath.Configuration; /** * A resource bundle contains locale-specific data. If you need localized @@ -345,7 +344,6 @@ public abstract class ResourceBundle else if (cache.containsKey(name)) { Reference ref = (Reference) cache.get(name); - ResourceBundle result = null; // If REF is null, that means that we added a `null' value to // the hash map. That means we failed to find the bundle // previously, and we cached that fact. The JDK does this, so @@ -440,7 +438,6 @@ public abstract class ResourceBundle if (cache.containsKey(localizedName)) { Reference ref = (Reference) cache.get(localizedName); - ResourceBundle result = null; // If REF is null, that means that we added a `null' value to // the hash map. That means we failed to find the bundle // previously, and we cached that fact. The JDK does this, so diff --git a/libjava/java/util/regex/Pattern.java b/libjava/java/util/regex/Pattern.java index 779103bdcb5..174bdae5878 100644 --- a/libjava/java/util/regex/Pattern.java +++ b/libjava/java/util/regex/Pattern.java @@ -67,12 +67,6 @@ public class Pattern implements Serializable private final RE re; - private Pattern (String regex) - throws PatternSyntaxException - { - this (regex, 0); - } - private Pattern (String regex, int flags) throws PatternSyntaxException { -- 2.30.2