Commit 32efd4cd by Michael Koch Committed by Michael Koch

Button.java, [...]: Fixed formatting issues all over.

2005-02-21  Michael Koch  <konqueror@gmx.de>

	* 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.

From-SVN: r95333
parent 40cd9e66
2005-02-21 Michael Koch <konqueror@gmx.de>
* 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-21 Mark Wielaard <mark@klomp.org> 2005-02-21 Mark Wielaard <mark@klomp.org>
* java/io/FileDescriptor.java (sync): Add real exception to * java/io/FileDescriptor.java (sync): Add real exception to
......
...@@ -96,7 +96,10 @@ private transient ActionListener action_listeners; ...@@ -96,7 +96,10 @@ private transient ActionListener action_listeners;
protected class AccessibleAWTButton extends AccessibleAWTComponent protected class AccessibleAWTButton extends AccessibleAWTComponent
implements AccessibleAction, AccessibleValue implements AccessibleAction, AccessibleValue
{ {
protected AccessibleAWTButton() { } protected AccessibleAWTButton()
{
// Do nothing here.
}
/* (non-Javadoc) /* (non-Javadoc)
* @see javax.accessibility.AccessibleAction#getAccessibleActionCount() * @see javax.accessibility.AccessibleAction#getAccessibleActionCount()
......
...@@ -1686,26 +1686,42 @@ public class Container extends Component ...@@ -1686,26 +1686,42 @@ public class Container extends Component
static class GfxPaintVisitor extends GfxVisitor static class GfxPaintVisitor extends GfxVisitor
{ {
public void visit(Component c, Graphics gfx) { c.paint(gfx); }
public static final GfxVisitor INSTANCE = new GfxPaintVisitor(); public static final GfxVisitor INSTANCE = new GfxPaintVisitor();
public void visit(Component c, Graphics gfx)
{
c.paint(gfx);
}
} }
static class GfxPrintVisitor extends GfxVisitor static class GfxPrintVisitor extends GfxVisitor
{ {
public void visit(Component c, Graphics gfx) { c.print(gfx); }
public static final GfxVisitor INSTANCE = new GfxPrintVisitor(); public static final GfxVisitor INSTANCE = new GfxPrintVisitor();
public void visit(Component c, Graphics gfx)
{
c.print(gfx);
}
} }
static class GfxPaintAllVisitor extends GfxVisitor static class GfxPaintAllVisitor extends GfxVisitor
{ {
public void visit(Component c, Graphics gfx) { c.paintAll(gfx); }
public static final GfxVisitor INSTANCE = new GfxPaintAllVisitor(); public static final GfxVisitor INSTANCE = new GfxPaintAllVisitor();
public void visit(Component c, Graphics gfx)
{
c.paintAll(gfx);
}
} }
static class GfxPrintAllVisitor extends GfxVisitor static class GfxPrintAllVisitor extends GfxVisitor
{ {
public void visit(Component c, Graphics gfx) { c.printAll(gfx); }
public static final GfxVisitor INSTANCE = new GfxPrintAllVisitor(); public static final GfxVisitor INSTANCE = new GfxPrintAllVisitor();
public void visit(Component c, Graphics gfx)
{
c.printAll(gfx);
}
} }
/** /**
......
/* Font.java -- Font object /* 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. This file is part of GNU Classpath.
...@@ -247,7 +247,10 @@ private static final long serialVersionUID = -4206021311591459213L; ...@@ -247,7 +247,10 @@ private static final long serialVersionUID = -4206021311591459213L;
{ {
tokenval = Integer.parseInt(token); tokenval = Integer.parseInt(token);
} }
catch(NumberFormatException e) { ; } catch(NumberFormatException e)
{
// Ignored.
}
if (tokenval != 0) if (tokenval != 0)
size = tokenval; size = tokenval;
......
/* Frame.java -- AWT toplevel window /* 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. This file is part of GNU Classpath.
...@@ -403,10 +403,15 @@ remove(MenuComponent menu) ...@@ -403,10 +403,15 @@ remove(MenuComponent menu)
/** /**
* Notifies this frame that it should create its native peer. * Notifies this frame that it should create its native peer.
*/ */
private static void fireDummyEvent() private static void fireDummyEvent()
{ {
EventQueue.invokeLater(new Runnable() { public void run() { } }); EventQueue.invokeLater(new Runnable()
{
public void run()
{
// Do nothing here.
}
});
} }
public void public void
......
...@@ -369,8 +369,9 @@ public final class CollationElementIterator ...@@ -369,8 +369,9 @@ public final class CollationElementIterator
idx_idx += idxToMove; idx_idx += idxToMove;
idxToMove = 0; idxToMove = 0;
} }
} else }
idx_idx += prefix.key.length(); else
idx_idx += prefix.key.length();
} }
} }
......
/* RuleBasedCollator.java -- Concrete Collator Class /* 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. This file is part of GNU Classpath.
...@@ -435,56 +435,57 @@ main_parse_loop: ...@@ -435,56 +435,57 @@ main_parse_loop:
continue; continue;
} }
switch (c) { switch (c)
case '!': {
throw new ParseException case '!':
("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 throw new ParseException
("unquoted punctuation character '"+c+"'", i+base_offset); ("Modifier '!' is not yet supported by Classpath", i + base_offset);
case '<':
//type = ignoreChars ? CollationSorter.IGNORE : -1; type = CollationSorter.GREATERP;
sb.append(c); break;
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;
}
if (type < 0) if (type < 0)
continue; continue;
......
/* PropertyPermission.java -- permission to get and set System properties /* 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. This file is part of GNU Classpath.
...@@ -154,17 +154,18 @@ public final class PropertyPermission extends BasicPermission ...@@ -154,17 +154,18 @@ public final class PropertyPermission extends BasicPermission
actions = WRITE; actions = WRITE;
else if ("read,write".equals(str) || "write,read".equals(str)) else if ("read,write".equals(str) || "write,read".equals(str))
actions = READ | WRITE; actions = READ | WRITE;
else { else
String lstr = str.toLowerCase(); {
if ("read".equals(lstr)) String lstr = str.toLowerCase();
actions = READ; if ("read".equals(lstr))
else if ("write".equals(lstr)) actions = READ;
actions = WRITE; else if ("write".equals(lstr))
else if ("read,write".equals(lstr) || "write,read".equals(lstr)) actions = WRITE;
actions = READ | WRITE; else if ("read,write".equals(lstr) || "write,read".equals(lstr))
else actions = READ | WRITE;
throw new IllegalArgumentException("illegal action " + str); else
} throw new IllegalArgumentException("illegal action " + str);
}
} }
/** /**
......
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