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

4 files changed, 13 insertions, 14 deletions

diff --git a/libjava/java/awt/TextComponent.java b/libjava/java/awt/TextComponent.java
index 2b7317d..0a410a4 100644
--- 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 729d96f..623f660 100644
--- 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 080b4b9..cc32d15 100644
--- 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 e226281..3f7f643 100644
--- 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;