From 32efd4cd48e9286e750083fe6afab87c6204d9b2 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 21 Feb 2005 16:12:17 +0000 Subject: [PATCH] Button.java, [...]: Fixed formatting issues all over. 2005-02-21 Michael Koch * 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 --- libjava/ChangeLog | 11 ++ libjava/java/awt/Button.java | 5 +- libjava/java/awt/Container.java | 24 ++++- libjava/java/awt/Font.java | 7 +- libjava/java/awt/Frame.java | 11 +- .../java/text/CollationElementIterator.java | 5 +- libjava/java/text/RuleBasedCollator.java | 101 +++++++++--------- libjava/java/util/PropertyPermission.java | 25 ++--- 8 files changed, 115 insertions(+), 74 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e44fc6d4197..3407bf91d2c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2005-02-21 Michael Koch + + * 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 * java/io/FileDescriptor.java (sync): Add real exception to diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java index 1d1a30aa8de..eb0fe3b7a20 100644 --- a/libjava/java/awt/Button.java +++ b/libjava/java/awt/Button.java @@ -96,7 +96,10 @@ private transient ActionListener action_listeners; protected class AccessibleAWTButton extends AccessibleAWTComponent implements AccessibleAction, AccessibleValue { - protected AccessibleAWTButton() { } + protected AccessibleAWTButton() + { + // Do nothing here. + } /* (non-Javadoc) * @see javax.accessibility.AccessibleAction#getAccessibleActionCount() diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java index 64d60abf40f..cd7fec02ecb 100644 --- a/libjava/java/awt/Container.java +++ b/libjava/java/awt/Container.java @@ -1686,26 +1686,42 @@ public class Container extends Component 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); + } } /** diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index 4b2ad5a4f9f..c43297759ca 100644 --- a/libjava/java/awt/Font.java +++ b/libjava/java/awt/Font.java @@ -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 @@ private static final long serialVersionUID = -4206021311591459213L; { tokenval = Integer.parseInt(token); } - catch(NumberFormatException e) { ; } + catch(NumberFormatException e) + { + // Ignored. + } if (tokenval != 0) size = tokenval; diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index 465a26814e3..d180984ab9d 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -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 @@ remove(MenuComponent menu) /** * 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 diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index 9bace068559..481b286c479 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -369,8 +369,9 @@ public final class CollationElementIterator idx_idx += idxToMove; idxToMove = 0; } - } else - idx_idx += prefix.key.length(); + } + else + idx_idx += prefix.key.length(); } } diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java index c2cff5a0c8c..afb766ff8ae 100644 --- a/libjava/java/text/RuleBasedCollator.java +++ b/libjava/java/text/RuleBasedCollator.java @@ -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 @@ main_parse_loop: 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); - - //type = ignoreChars ? CollationSorter.IGNORE : -1; - sb.append(c); - break; - } + ("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; + } if (type < 0) continue; diff --git a/libjava/java/util/PropertyPermission.java b/libjava/java/util/PropertyPermission.java index ec2ca7abab6..7b2667a39dd 100644 --- a/libjava/java/util/PropertyPermission.java +++ b/libjava/java/util/PropertyPermission.java @@ -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 @@ public final class PropertyPermission extends BasicPermission 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); + } } /** -- 2.30.2