PatchSet 5592
Date: 2005/02/23 19:09:21
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleanups
Members:
ChangeLog:1.3636->1.3637
libraries/javalib/java/awt/Button.java:1.10->1.11
libraries/javalib/java/awt/Container.java:1.31->1.32
libraries/javalib/java/awt/Font.java:1.23->1.24
libraries/javalib/java/awt/Frame.java:1.24->1.25
libraries/javalib/java/lang/SecurityManager.java:1.26->1.27
libraries/javalib/java/net/URL.java:1.52->1.53
libraries/javalib/java/text/CollationElementIterator.java:1.21->1.22
libraries/javalib/java/text/RuleBasedCollator.java:1.25->1.26
libraries/javalib/java/util/PropertyPermission.java:1.4->1.5
ChangeLog:1.3637->1.3638
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3636 kaffe/ChangeLog:1.3637
--- kaffe/ChangeLog:1.3636 Wed Feb 23 19:02:35 2005
+++ kaffe/ChangeLog Wed Feb 23 19:09:21 2005
@@ -1,5 +1,20 @@
2005-02-23 Dalibor Topic <[EMAIL PROTECTED]>
+ Resynced with GNU Classpath.
+
+ 2005-02-21 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/awt/Button.java,
+ java/awt/Container.java,
+ java/awt/Font.java,
+ java/awt/Frame.java,
+ java/text/CollationElementIterator.java,
+ java/text/RuleBasedCollator.java,
+ java/util/PropertyPermission.java:
+ Fixed formatting issues all over.
+
+2005-02-23 Dalibor Topic <[EMAIL PROTECTED]>
+
* test/regression/SecureRandomTest.java (SecureRandomTest):
Improved error message slightly.
Index: kaffe/libraries/javalib/java/awt/Button.java
diff -u kaffe/libraries/javalib/java/awt/Button.java:1.10
kaffe/libraries/javalib/java/awt/Button.java:1.11
--- kaffe/libraries/javalib/java/awt/Button.java:1.10 Fri Feb 18 15:13:39 2005
+++ kaffe/libraries/javalib/java/awt/Button.java Wed Feb 23 19:09:24 2005
@@ -96,7 +96,10 @@
protected class AccessibleAWTButton extends AccessibleAWTComponent
implements AccessibleAction, AccessibleValue
{
- protected AccessibleAWTButton() { }
+ protected AccessibleAWTButton()
+ {
+ // Do nothing here.
+ }
/* (non-Javadoc)
* @see javax.accessibility.AccessibleAction#getAccessibleActionCount()
Index: kaffe/libraries/javalib/java/awt/Container.java
diff -u kaffe/libraries/javalib/java/awt/Container.java:1.31
kaffe/libraries/javalib/java/awt/Container.java:1.32
--- kaffe/libraries/javalib/java/awt/Container.java:1.31 Fri Feb 18
15:13:39 2005
+++ kaffe/libraries/javalib/java/awt/Container.java Wed Feb 23 19:09:24 2005
@@ -1686,26 +1686,42 @@
static class GfxPaintVisitor extends GfxVisitor
{
- public void visit(Component c, Graphics gfx) { c.paint(gfx); }
public static final GfxVisitor INSTANCE = new GfxPaintVisitor();
+
+ public void visit(Component c, Graphics gfx)
+ {
+ c.paint(gfx);
+ }
}
static class GfxPrintVisitor extends GfxVisitor
{
- public void visit(Component c, Graphics gfx) { c.print(gfx); }
public static final GfxVisitor INSTANCE = new GfxPrintVisitor();
+
+ public void visit(Component c, Graphics gfx)
+ {
+ c.print(gfx);
+ }
}
static class GfxPaintAllVisitor extends GfxVisitor
{
- public void visit(Component c, Graphics gfx) { c.paintAll(gfx); }
public static final GfxVisitor INSTANCE = new GfxPaintAllVisitor();
+
+ public void visit(Component c, Graphics gfx)
+ {
+ c.paintAll(gfx);
+ }
}
static class GfxPrintAllVisitor extends GfxVisitor
{
- public void visit(Component c, Graphics gfx) { c.printAll(gfx); }
public static final GfxVisitor INSTANCE = new GfxPrintAllVisitor();
+
+ public void visit(Component c, Graphics gfx)
+ {
+ c.printAll(gfx);
+ }
}
/**
Index: kaffe/libraries/javalib/java/awt/Font.java
diff -u kaffe/libraries/javalib/java/awt/Font.java:1.23
kaffe/libraries/javalib/java/awt/Font.java:1.24
--- kaffe/libraries/javalib/java/awt/Font.java:1.23 Fri Nov 26 18:08:54 2004
+++ kaffe/libraries/javalib/java/awt/Font.java Wed Feb 23 19:09:24 2005
@@ -1,5 +1,5 @@
/* Font.java -- Font object
- Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -247,7 +247,10 @@
{
tokenval = Integer.parseInt(token);
}
- catch(NumberFormatException e) { ; }
+ catch(NumberFormatException e)
+ {
+ // Ignored.
+ }
if (tokenval != 0)
size = tokenval;
Index: kaffe/libraries/javalib/java/awt/Frame.java
diff -u kaffe/libraries/javalib/java/awt/Frame.java:1.24
kaffe/libraries/javalib/java/awt/Frame.java:1.25
--- kaffe/libraries/javalib/java/awt/Frame.java:1.24 Thu Jan 13 08:02:26 2005
+++ kaffe/libraries/javalib/java/awt/Frame.java Wed Feb 23 19:09:24 2005
@@ -1,5 +1,5 @@
/* Frame.java -- AWT toplevel window
- Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -403,10 +403,15 @@
/**
* Notifies this frame that it should create its native peer.
*/
-
private static void fireDummyEvent()
{
- EventQueue.invokeLater(new Runnable() { public void run() { } });
+ EventQueue.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ // Do nothing here.
+ }
+ });
}
public void
Index: kaffe/libraries/javalib/java/lang/SecurityManager.java
diff -u kaffe/libraries/javalib/java/lang/SecurityManager.java:1.26
kaffe/libraries/javalib/java/lang/SecurityManager.java:1.27
--- kaffe/libraries/javalib/java/lang/SecurityManager.java:1.26 Sat Feb 19
15:04:18 2005
+++ kaffe/libraries/javalib/java/lang/SecurityManager.java Wed Feb 23
19:12:19 2005
@@ -1027,13 +1027,15 @@
String permission)
{
if (packageName == null)
- throw new NullPointerException();
+ throw new NullPointerException();
- String list = (String)AccessController.doPrivileged(new PrivilegedAction()
{
- public Object run() {
- return Security.getProperty(restriction);
+ String list = (String)AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Security.getProperty(restriction);
}
- });
+ });
if (list == null || list.equals(""))
return;
@@ -1051,4 +1053,4 @@
}
}
}
-} // class SecurityManager
+}
Index: kaffe/libraries/javalib/java/net/URL.java
diff -u kaffe/libraries/javalib/java/net/URL.java:1.52
kaffe/libraries/javalib/java/net/URL.java:1.53
--- kaffe/libraries/javalib/java/net/URL.java:1.52 Thu Jan 13 08:05:06 2005
+++ kaffe/libraries/javalib/java/net/URL.java Wed Feb 23 19:12:20 2005
@@ -1,5 +1,5 @@
/* URL.java -- Uniform Resource Locator Class
- Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+ Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -882,7 +882,8 @@
{
systemClassLoader = (ClassLoader) AccessController.doPrivileged
(new PrivilegedAction() {
- public Object run() {
+ public Object run()
+ {
return ClassLoader.getSystemClassLoader();
}
});
@@ -904,7 +905,10 @@
{
throw death;
}
- catch (Throwable t) { /* ignored */ }
+ catch (Throwable t)
+ {
+ // Ignored.
+ }
}
while (ph == null && pkgPrefix.hasMoreTokens());
}
Index: kaffe/libraries/javalib/java/text/CollationElementIterator.java
diff -u kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.21
kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.22
--- kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.21
Sat Feb 19 15:04:22 2005
+++ kaffe/libraries/javalib/java/text/CollationElementIterator.java Wed Feb
23 19:09:24 2005
@@ -369,8 +369,9 @@
idx_idx += idxToMove;
idxToMove = 0;
}
- } else
- idx_idx += prefix.key.length();
+ }
+ else
+ idx_idx += prefix.key.length();
}
}
Index: kaffe/libraries/javalib/java/text/RuleBasedCollator.java
diff -u kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.25
kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.26
--- kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.25 Sun Oct
24 17:20:10 2004
+++ kaffe/libraries/javalib/java/text/RuleBasedCollator.java Wed Feb 23
19:09:24 2005
@@ -1,5 +1,5 @@
/* RuleBasedCollator.java -- Concrete Collator Class
- Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation,
Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software
Foundation, Inc.
This file is part of GNU Classpath.
@@ -435,56 +435,57 @@
continue;
}
- switch (c) {
- case '!':
- throw new ParseException
- ("Modifier '!' is not yet supported by Classpath", i+base_offset);
- case '<':
- type = CollationSorter.GREATERP;
- break;
- case ';':
- type = CollationSorter.GREATERS;
- break;
- case ',':
- type = CollationSorter.GREATERT;
- break;
- case '=':
- type = CollationSorter.EQUAL;
- break;
- case '\'':
- eatingChars = !eatingChars;
- doubleQuote = true;
- break;
- case '@':
- if (ignoreChars)
- throw new ParseException
- ("comparison list has not yet been started. You may only use"
- + "(<,;=&)", i+base_offset);
- // Inverse the order of secondaries from now on.
- nextIsModifier = true;
- type = CollationSorter.INVERSE_SECONDARY;
- break;
- case '&':
- type = CollationSorter.RESET;
- if (stop_on_reset)
- break main_parse_loop;
- break;
- default:
- if (operator < 0)
- throw new ParseException
- ("operator missing at " + (i+base_offset), i+base_offset);
- if (!eatingChars &&
- ((c >= 0x21 && c <= 0x2F)
- || (c >= 0x3A && c <= 0x40)
- || (c >= 0x5B && c <= 0x60)
- || (c >= 0x7B && c <= 0x7E)))
+ switch (c)
+ {
+ case '!':
throw new ParseException
- ("unquoted punctuation character '"+c+"'", i+base_offset);
+ ("Modifier '!' is not yet supported by Classpath", i +
base_offset);
+ case '<':
+ type = CollationSorter.GREATERP;
+ break;
+ case ';':
+ type = CollationSorter.GREATERS;
+ break;
+ case ',':
+ type = CollationSorter.GREATERT;
+ break;
+ case '=':
+ type = CollationSorter.EQUAL;
+ break;
+ case '\'':
+ eatingChars = !eatingChars;
+ doubleQuote = true;
+ break;
+ case '@':
+ if (ignoreChars)
+ throw new ParseException
+ ("comparison list has not yet been started. You may only use"
+ + "(<,;=&)", i + base_offset);
+ // Inverse the order of secondaries from now on.
+ nextIsModifier = true;
+ type = CollationSorter.INVERSE_SECONDARY;
+ break;
+ case '&':
+ type = CollationSorter.RESET;
+ if (stop_on_reset)
+ break main_parse_loop;
+ break;
+ default:
+ if (operator < 0)
+ throw new ParseException
+ ("operator missing at " + (i + base_offset), i + base_offset);
+ if (! eatingChars
+ && ((c >= 0x21 && c <= 0x2F)
+ || (c >= 0x3A && c <= 0x40)
+ || (c >= 0x5B && c <= 0x60)
+ || (c >= 0x7B && c <= 0x7E)))
+ throw new ParseException
+ ("unquoted punctuation character '" + c + "'", i + base_offset);
- //type = ignoreChars ? CollationSorter.IGNORE : -1;
- sb.append(c);
- break;
- }
+ //type = ignoreChars ? CollationSorter.IGNORE : -1;
+ sb.append(c);
+ break;
+ }
if (type < 0)
continue;
Index: kaffe/libraries/javalib/java/util/PropertyPermission.java
diff -u kaffe/libraries/javalib/java/util/PropertyPermission.java:1.4
kaffe/libraries/javalib/java/util/PropertyPermission.java:1.5
--- kaffe/libraries/javalib/java/util/PropertyPermission.java:1.4 Thu Apr
22 11:40:44 2004
+++ kaffe/libraries/javalib/java/util/PropertyPermission.java Wed Feb 23
19:09:25 2005
@@ -1,5 +1,5 @@
/* PropertyPermission.java -- permission to get and set System properties
- Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -154,17 +154,18 @@
actions = WRITE;
else if ("read,write".equals(str) || "write,read".equals(str))
actions = READ | WRITE;
- else {
- String lstr = str.toLowerCase();
- if ("read".equals(lstr))
- actions = READ;
- else if ("write".equals(lstr))
- actions = WRITE;
- else if ("read,write".equals(lstr) || "write,read".equals(lstr))
- actions = READ | WRITE;
- else
- throw new IllegalArgumentException("illegal action " + str);
- }
+ else
+ {
+ String lstr = str.toLowerCase();
+ if ("read".equals(lstr))
+ actions = READ;
+ else if ("write".equals(lstr))
+ actions = WRITE;
+ else if ("read,write".equals(lstr) || "write,read".equals(lstr))
+ actions = READ | WRITE;
+ else
+ throw new IllegalArgumentException("illegal action " + str);
+ }
}
/**
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3637 kaffe/ChangeLog:1.3638
--- kaffe/ChangeLog:1.3637 Wed Feb 23 19:09:21 2005
+++ kaffe/ChangeLog Wed Feb 23 19:12:11 2005
@@ -4,6 +4,16 @@
2005-02-21 Michael Koch <[EMAIL PROTECTED]>
+ * java/lang/SecurityManager.java,
+ java/net/URL.java:
+ Formatting cleanups.
+
+2005-02-23 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
+ 2005-02-21 Michael Koch <[EMAIL PROTECTED]>
+
* java/awt/Button.java,
java/awt/Container.java,
java/awt/Font.java,
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
