Commit 007265b8 by Mark Wielaard Committed by Michael Koch

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
parent a00d3b3c
2004-05-03 Mark Wielaard <mark@klomp.org> 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 * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (minimumSize): Removed
unused variables hScrollbarHeight and vScrollbarWidth. unused variables hScrollbarHeight and vScrollbarWidth.
(preferredSize): Likewise. (preferredSize): Likewise.
......
...@@ -335,7 +335,7 @@ public class DERReader implements DER ...@@ -335,7 +335,7 @@ public class DERReader implements DER
Integer.parseInt(str.substring( 6, 8)), // hour Integer.parseInt(str.substring( 6, 8)), // hour
Integer.parseInt(str.substring( 8, 10))); // minute Integer.parseInt(str.substring( 8, 10))); // minute
if (date.length() == 12); if (date.length() == 12);
calendar.set(calendar.SECOND, calendar.set(Calendar.SECOND,
Integer.parseInt(str.substring(10, 12))); Integer.parseInt(str.substring(10, 12)));
} }
catch (NumberFormatException nfe) catch (NumberFormatException nfe)
...@@ -362,13 +362,13 @@ public class DERReader implements DER ...@@ -362,13 +362,13 @@ public class DERReader implements DER
case 18: case 18:
case 17: case 17:
case 16: case 16:
calendar.set(calendar.MILLISECOND, calendar.set(Calendar.MILLISECOND,
Integer.parseInt(date.substring(15))); Integer.parseInt(date.substring(15)));
case 14: case 14:
calendar.set(calendar.SECOND, calendar.set(Calendar.SECOND,
Integer.parseInt(date.substring(12, 14))); Integer.parseInt(date.substring(12, 14)));
case 12: case 12:
calendar.set(calendar.MINUTE, calendar.set(Calendar.MINUTE,
Integer.parseInt(date.substring(10, 12))); Integer.parseInt(date.substring(10, 12)));
} }
} }
......
...@@ -233,11 +233,11 @@ setSelectionEnd(int selectionEnd) ...@@ -233,11 +233,11 @@ setSelectionEnd(int selectionEnd)
* specified start and end positions. Illegal values for these * specified start and end positions. Illegal values for these
* positions are silently fixed. * positions are silently fixed.
* *
* @param startSelection The new start position for the selected text. * @param selectionStart The new start position for the selected text.
* @param endSelection The new end position for the selected text. * @param selectionEnd The new end position for the selected text.
*/ */
public synchronized void public synchronized void
select(int selectionStart, int endSelection) select(int selectionStart, int selectionEnd)
{ {
if (selectionStart < 0) if (selectionStart < 0)
selectionStart = 0; selectionStart = 0;
......
...@@ -743,12 +743,11 @@ public final class URL implements Serializable ...@@ -743,12 +743,11 @@ public final class URL implements Serializable
this.host = host; this.host = host;
this.userInfo = userInfo; this.userInfo = userInfo;
this.port = port; this.port = port;
this.file = path;
this.authority = authority; this.authority = authority;
if (query == null) if (query == null)
this.file = file; this.file = path;
else else
this.file = file + "?" + query; this.file = path + "?" + query;
this.ref = ref; this.ref = ref;
hashCode = hashCode(); // Used for serialization. hashCode = hashCode(); // Used for serialization.
} }
......
...@@ -2400,7 +2400,7 @@ public class Arrays ...@@ -2400,7 +2400,7 @@ public class Arrays
{ {
int size = a.length; int size = a.length;
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
if (this.equals(o, a[i])) if (ArrayList.equals(o, a[i]))
return i; return i;
return -1; return -1;
} }
...@@ -2409,7 +2409,7 @@ public class Arrays ...@@ -2409,7 +2409,7 @@ public class Arrays
{ {
int i = a.length; int i = a.length;
while (--i >= 0) while (--i >= 0)
if (this.equals(o, a[i])) if (ArrayList.equals(o, a[i]))
return i; return i;
return -1; return -1;
} }
......
...@@ -169,12 +169,12 @@ public class ZipEntry implements ZipConstants, Cloneable ...@@ -169,12 +169,12 @@ public class ZipEntry implements ZipConstants, Cloneable
synchronized (cal) synchronized (cal)
{ {
cal.setTime(new Date(time*1000L)); cal.setTime(new Date(time*1000L));
dostime = (cal.get(cal.YEAR) - 1980 & 0x7f) << 25 dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25
| (cal.get(cal.MONTH) + 1) << 21 | (cal.get(Calendar.MONTH) + 1) << 21
| (cal.get(cal.DAY_OF_MONTH)) << 16 | (cal.get(Calendar.DAY_OF_MONTH)) << 16
| (cal.get(cal.HOUR_OF_DAY)) << 11 | (cal.get(Calendar.HOUR_OF_DAY)) << 11
| (cal.get(cal.MINUTE)) << 5 | (cal.get(Calendar.MINUTE)) << 5
| (cal.get(cal.SECOND)) >> 1; | (cal.get(Calendar.SECOND)) >> 1;
} }
dostime = (int) (dostime / 1000L); dostime = (int) (dostime / 1000L);
this.known |= KNOWN_TIME; this.known |= KNOWN_TIME;
......
...@@ -223,7 +223,7 @@ public class BasicArrowButton extends JButton implements SwingConstants ...@@ -223,7 +223,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
setIcon(new arrowIcon(arrow)); setIcon(new arrowIcon(arrow));
else else
((arrowIcon) getIcon()).setArrow(arrow); ((arrowIcon) getIcon()).setArrow(arrow);
this.direction = direction; this.direction = dir;
} }
/** /**
......
...@@ -54,7 +54,7 @@ public class DefaultTableCellRenderer extends JLabel ...@@ -54,7 +54,7 @@ public class DefaultTableCellRenderer extends JLabel
{ {
static final long serialVersionUID = 7878911414715528324L; 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 public static class UIResource extends DefaultTableCellRenderer
implements javax.swing.plaf.UIResource implements javax.swing.plaf.UIResource
...@@ -70,7 +70,6 @@ public class DefaultTableCellRenderer extends JLabel ...@@ -70,7 +70,6 @@ public class DefaultTableCellRenderer extends JLabel
public DefaultTableCellRenderer() public DefaultTableCellRenderer()
{ {
super(); super();
this.noFocusBorder = new EmptyBorder(0, 0, 0, 0);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment