DERReader.java: Call static methods staticly.

2004-05-03  Mark Wielaard  <mark@klomp.org>

	* gnu/java/security/der/DERReader.java: Call static methods staticly.
	* java/awt/TextComponent.java (select): Use selectionEnd parameter.
	* java/net/URL.java
	(set(String, String, int, String, String, String, String, String)):
	Assign this.file to path or path + "?" + query.
	* java/util/Arrays.java: Call static methods staticly.
	* 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.

From-SVN: r81453

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e0d7f94f2f4dd8efbbf66978f3272c48aaf831a3..a93836263a856ab99d3364635962c543c5dc74a9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-03  Mark Wielaard  <mark@klomp.org>
+
+       * gnu/java/security/der/DERReader.java: Call static methods staticly.
+       * java/awt/TextComponent.java (select): Use selectionEnd parameter.
+       * java/net/URL.java
+       (set(String, String, int, String, String, String, String, String)):
+       Assign this.file to path or path + "?" + query.
+       * java/util/Arrays.java: Call static methods staticly.
+       * 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.
+
 2004-05-03  Mark Wielaard  <mark@klomp.org>
 
        * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (minimumSize): Removed

diff --git a/libjava/gnu/java/security/der/DERReader.java b/libjava/gnu/java/security/der/DERReader.java
index 3020b8b2d1aeb0fb706aea5ad3453e0976890cfd..3915b071165b4dcbadf7a368760307d70e5832b3 100644 (file)
--- a/libjava/gnu/java/security/der/DERReader.java
+++ b/libjava/gnu/java/security/der/DERReader.java
@@ -335,7 +335,7 @@ public class DERReader implements DER
               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 @@ public class DERReader implements DER
                 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)));
               }
           }

diff --git a/libjava/java/awt/TextComponent.java b/libjava/java/awt/TextComponent.java
index 2b7317d8519e4663e11b3dd282532a779b4776db..0a410a44b9f99a99f9e6e92d5c7c1ce761eb8745 100644 (file)
--- a/libjava/java/awt/TextComponent.java
+++ b/libjava/java/awt/TextComponent.java
@@ -233,11 +233,11 @@ setSelectionEnd(int selectionEnd)
   * 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;

diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 729d96fa87812ee99944245808e0375bd30989f8..623f6601770b2ca95258a87a3004fb4da4b69b62 100644 (file)
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -743,12 +743,11 @@ public final class URL implements Serializable
     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.
   }

diff --git a/libjava/java/util/Arrays.java b/libjava/java/util/Arrays.java
index 080b4b9cbf95004af5dec0123cf7186fd972dd9f..cc32d153900fd23e514c16571e1e9962a6d6e2a9 100644 (file)
--- a/libjava/java/util/Arrays.java
+++ b/libjava/java/util/Arrays.java
@@ -2400,7 +2400,7 @@ public class Arrays
     {
       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 @@ public class Arrays
     {
       int i = a.length;
       while (--i >= 0)
-        if (this.equals(o, a[i]))
+        if (ArrayList.equals(o, a[i]))
           return i;
       return -1;
     }

diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java
index e2262812b9f1169ad6361c9b75e3649e5e52ff96..3f7f643552944ff3a3696755ca002146be4eab1f 100644 (file)
--- a/libjava/java/util/zip/ZipEntry.java
+++ b/libjava/java/util/zip/ZipEntry.java
@@ -169,12 +169,12 @@ public class ZipEntry implements ZipConstants, Cloneable
     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;

diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.java b/libjava/javax/swing/plaf/basic/BasicArrowButton.java
index e778c5bffa304923b71ac0f57878449306a86e2f..cb2c99baf58c30d47f483db4be1f9a9eb6475cb1 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/libjava/javax/swing/plaf/basic/BasicArrowButton.java
@@ -223,7 +223,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
       setIcon(new arrowIcon(arrow));
     else
       ((arrowIcon) getIcon()).setArrow(arrow);
-    this.direction = direction;
+    this.direction = dir;
   }
 
   /**

diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.java b/libjava/javax/swing/table/DefaultTableCellRenderer.java
index 6bd0ff57f591a4278387caf8918de06801639354..563d9e60af2229bea34174ddc973a721acb290f6 100644 (file)
--- a/libjava/javax/swing/table/DefaultTableCellRenderer.java
+++ b/libjava/javax/swing/table/DefaultTableCellRenderer.java
@@ -54,7 +54,7 @@ public class DefaultTableCellRenderer extends JLabel
 {
   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 class DefaultTableCellRenderer extends JLabel
   public DefaultTableCellRenderer()
   {
     super();
-    this.noFocusBorder = new EmptyBorder(0, 0, 0, 0);
   }
 
   /**