FYI: Fixed some static field/method accesses and wrong assignments

[Mark Wielaard]

Hi,

Played with the eclipse compiler for java and fixed some of the warnings
it pointed out. Some are just code cleanups, but there are actually some
subtle bugs fixed by this.

2004-04-23  Mark Wielaard  <address@hidden>

       * gnu/java/security/der/DERReader.java: Call static methods staticly.
       * java/awt/TextComponent.java (select): Use selectionEnd parameter.
       * java/lang/System.java (runFinalizersOnExit): Call static
       Runtime.runFinalizersOnExit staticly.
       * java/net/URL.java
       (set(String, String, int, String, String, String, String, String)):
       Assign this.file to path or path + "?" + query.
       * java/text/RuleBasedCollator.java: Call static methods staticly.A
       * java/util/Arrays.java: Likewise.
       * java/util/zip/ZipEntry.java: Likewise.
       * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Assign
       dir to this.direction.
       * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder):
       Assign static field only once.
       (DefaultTableCellRenderer): Don't reassign noFocusBorder each time.

Committed.

Cheers,

Mark

Index: gnu/java/security/der/DERReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/der/DERReader.java,v
retrieving revision 1.1
diff -u -r1.1 DERReader.java
--- gnu/java/security/der/DERReader.java        23 Apr 2003 22:51:46 -0000      
1.1
+++ gnu/java/security/der/DERReader.java        23 Apr 2004 16:39:32 -0000
@@ -335,7 +335,7 @@
               Integer.parseInt(str.substring( 6,  8)),    // hour
               Integer.parseInt(str.substring( 8, 10)));   // minute
             if (date.length() == 12);
-              calendar.set(calendar.SECOND,
+              calendar.set(Calendar.SECOND,
                 Integer.parseInt(str.substring(10, 12)));
           }
         catch (NumberFormatException nfe)
@@ -362,13 +362,13 @@
                 case 18:
                 case 17:
                 case 16:
-                  calendar.set(calendar.MILLISECOND,
+                  calendar.set(Calendar.MILLISECOND,
                     Integer.parseInt(date.substring(15)));
                 case 14:
-                  calendar.set(calendar.SECOND,
+                  calendar.set(Calendar.SECOND,
                     Integer.parseInt(date.substring(12, 14)));
                 case 12:
-                  calendar.set(calendar.MINUTE,
+                  calendar.set(Calendar.MINUTE,
                     Integer.parseInt(date.substring(10, 12)));
               }
           }
Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.12
diff -u -r1.12 TextComponent.java
--- java/awt/TextComponent.java 26 Dec 2003 16:37:27 -0000      1.12
+++ java/awt/TextComponent.java 23 Apr 2004 16:39:32 -0000
@@ -234,11 +234,11 @@
   * specified start and end positions.  Illegal values for these
   * positions are silently fixed.
   *
-  * @param startSelection The new start position for the selected text.
-  * @param endSelection The new end position for the selected text.
+  * @param selectionStart The new start position for the selected text.
+  * @param selectionEnd The new end position for the selected text.
   */
 public synchronized void
-select(int selectionStart, int endSelection)
+select(int selectionStart, int selectionEnd)
 {
   if (selectionStart < 0)
     selectionStart = 0;
Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.32
diff -u -r1.32 System.java
--- java/lang/System.java       12 Apr 2004 14:32:59 -0000      1.32
+++ java/lang/System.java       23 Apr 2004 16:39:32 -0000
@@ -632,7 +632,7 @@
    */
   public static void runFinalizersOnExit(boolean finalizeOnExit)
   {
-    Runtime.getRuntime().runFinalizersOnExit(finalizeOnExit);
+    Runtime.runFinalizersOnExit(finalizeOnExit);
   }
 
   /**
Index: java/net/URL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URL.java,v
retrieving revision 1.29
diff -u -r1.29 URL.java
--- java/net/URL.java   23 Apr 2004 16:27:06 -0000      1.29
+++ java/net/URL.java   23 Apr 2004 16:39:32 -0000
@@ -751,12 +751,11 @@
     this.host = host;
     this.userInfo = userInfo;
     this.port = port;
-    this.file = path;
     this.authority = authority;
     if (query == null)
-      this.file = file;
+      this.file = path;
     else
-      this.file = file + "?" + query;
+      this.file = path + "?" + query;
     this.ref = ref;
     hashCode = hashCode(); // Used for serialization.
   }
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/RuleBasedCollator.java,v
retrieving revision 1.22
diff -u -r1.22 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java    23 Apr 2004 16:03:10 -0000      1.22
+++ java/text/RuleBasedCollator.java    23 Apr 2004 16:39:32 -0000
@@ -755,8 +755,8 @@
          }
 
         // Check for primary strength differences
-        int prim1 = cs.primaryOrder(ord1); 
-        int prim2 = ct.primaryOrder(ord2); 
+        int prim1 = CollationElementIterator.primaryOrder(ord1); 
+        int prim2 = CollationElementIterator.primaryOrder(ord2); 
 
         if (prim1 < prim2)
           return -1;
@@ -766,8 +766,8 @@
           continue;
 
         // Check for secondary strength differences
-        int sec1 = cs.secondaryOrder(ord1);
-        int sec2 = ct.secondaryOrder(ord2);
+        int sec1 = CollationElementIterator.secondaryOrder(ord1);
+        int sec2 = CollationElementIterator.secondaryOrder(ord2);
 
         if (sec1 < sec2)
           return -1;
@@ -777,8 +777,8 @@
           continue;
 
         // Check for tertiary differences
-        int tert1 = cs.tertiaryOrder(ord1);
-        int tert2 = ct.tertiaryOrder(ord2);
+        int tert1 = CollationElementIterator.tertiaryOrder(ord1);
+        int tert2 = CollationElementIterator.tertiaryOrder(ord2);
 
         if (tert1 < tert2)
           return -1;
@@ -894,11 +894,11 @@
         switch (getStrength())
           {
             case PRIMARY:
-               ord = cei.primaryOrder(ord);
+               ord = CollationElementIterator.primaryOrder(ord);
                break;
 
             case SECONDARY:
-               ord = cei.secondaryOrder(ord);
+               ord = CollationElementIterator.secondaryOrder(ord);
 
             default:
                break;
Index: java/util/Arrays.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Arrays.java,v
retrieving revision 1.19
diff -u -r1.19 Arrays.java
--- java/util/Arrays.java       10 Sep 2003 18:01:35 -0000      1.19
+++ java/util/Arrays.java       23 Apr 2004 16:39:33 -0000
@@ -2400,7 +2400,7 @@
     {
       int size = a.length;
       for (int i = 0; i < size; i++)
-        if (this.equals(o, a[i]))
+        if (ArrayList.equals(o, a[i]))
           return i;
       return -1;
     }
@@ -2409,7 +2409,7 @@
     {
       int i = a.length;
       while (--i >= 0)
-        if (this.equals(o, a[i]))
+        if (ArrayList.equals(o, a[i]))
           return i;
       return -1;
     }
Index: java/util/zip/ZipEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipEntry.java,v
retrieving revision 1.10
diff -u -r1.10 ZipEntry.java
--- java/util/zip/ZipEntry.java 18 Jun 2003 09:42:57 -0000      1.10
+++ java/util/zip/ZipEntry.java 23 Apr 2004 16:39:33 -0000
@@ -169,12 +169,12 @@
     synchronized (cal)
       {
        cal.setTime(new Date(time*1000L));
-       dostime = (cal.get(cal.YEAR) - 1980 & 0x7f) << 25
-         | (cal.get(cal.MONTH) + 1) << 21
-         | (cal.get(cal.DAY_OF_MONTH)) << 16
-         | (cal.get(cal.HOUR_OF_DAY)) << 11
-         | (cal.get(cal.MINUTE)) << 5
-         | (cal.get(cal.SECOND)) >> 1;
+       dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25
+         | (cal.get(Calendar.MONTH) + 1) << 21
+         | (cal.get(Calendar.DAY_OF_MONTH)) << 16
+         | (cal.get(Calendar.HOUR_OF_DAY)) << 11
+         | (cal.get(Calendar.MINUTE)) << 5
+         | (cal.get(Calendar.SECOND)) >> 1;
       }
     dostime = (int) (dostime / 1000L);
     this.known |= KNOWN_TIME;
Index: javax/swing/plaf/basic/BasicArrowButton.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicArrowButton.java,v
retrieving revision 1.1
diff -u -r1.1 BasicArrowButton.java
--- javax/swing/plaf/basic/BasicArrowButton.java        17 Apr 2004 23:24:46 
-0000      1.1
+++ javax/swing/plaf/basic/BasicArrowButton.java        23 Apr 2004 16:39:33 
-0000
@@ -223,7 +223,7 @@
       setIcon(new arrowIcon(arrow));
     else
       ((arrowIcon) getIcon()).setArrow(arrow);
-    this.direction = direction;
+    this.direction = dir;
   }
 
   /**
Index: javax/swing/table/DefaultTableCellRenderer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/table/DefaultTableCellRenderer.java,v
retrieving revision 1.6
diff -u -r1.6 DefaultTableCellRenderer.java
--- javax/swing/table/DefaultTableCellRenderer.java     12 Jan 2004 20:37:57 
-0000      1.6
+++ javax/swing/table/DefaultTableCellRenderer.java     23 Apr 2004 16:39:33 
-0000
@@ -54,7 +54,7 @@
 {
   static final long serialVersionUID = 7878911414715528324L;
 
-  protected static Border noFocusBorder;
+  protected static Border noFocusBorder = new EmptyBorder(0, 0, 0, 0);
 
   public static class UIResource extends DefaultTableCellRenderer
     implements javax.swing.plaf.UIResource
@@ -70,7 +70,6 @@
   public DefaultTableCellRenderer()
   {
     super();
-    this.noFocusBorder = new EmptyBorder(0, 0, 0, 0);
   }
 
   /**

signature.asc
Description: This is a digitally signed message part