diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-06-21 21:00:58 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-06-21 21:00:58 +0000 |
| commit | e4756346237f272db431173cc701944f800052b1 (patch) | |
| tree | c8b429b7c54cbebc6b95a02d49df27bd2be2778f /gnu | |
| parent | 385d358858ce713a78e80b4422b67b92b8a0d0cb (diff) | |
| download | classpath-e4756346237f272db431173cc701944f800052b1.tar.gz | |
Cleanup warning in Demo.java and rename message bundles to avoid class name collisions.
2010-06-21 Andrew John Hughes <ahughes@redhat.com>
* tools/Makefile.am:
Fix patch to message bundles.
2010-04-12 Ivan Maidanski <ivmai@mail.ru>
* examples/gnu/classpath/examples/swing/Demo.java:
(mkMenuBar): Don't pass null as a second argument to getMethod() (to suppress
a warning).
* resource/gnu/javax/print/PrinterDialog.properties: Rename to
"MessagesBundle.properties" (to prevent class name collision
in case the properties file is converted to a class).
* resource/gnu/javax/print/PrinterDialog_de.properties: Likewise.
* gnu/javax/print/PrinterDialog.java (messages): Get resources from
"gnu.javax.print.MessagesBundle" bundle instead of
"gnu/javax/print/PrinterDialog" one.
* tools/gnu/classpath/tools/common/Messages.java (BUNDLE_NAME):
Convert "gnu.classpath.tools.common.Messages" to lowercase (to be
consistent with other tools resource bundle names and to prevent class
name collision in case the properties file is converted to a class).
* tools/resource/gnu/classpath/tools/common/Messages.properties:
Rename to "messages.properties".
* tools/resource/gnu/classpath/tools/getopt/Messages.properties:
Likewise.
* testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/Parser_Test.java:
Rename "enum" local variable to "en".
* testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/ParserTest.java:
Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/javax/print/PrinterDialog.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gnu/javax/print/PrinterDialog.java b/gnu/javax/print/PrinterDialog.java index 6557baf4f..16ca7edc0 100644 --- a/gnu/javax/print/PrinterDialog.java +++ b/gnu/javax/print/PrinterDialog.java @@ -1,5 +1,5 @@ /* PrinterDialog.java -- - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -1452,12 +1452,8 @@ public final class PrinterDialog extends JDialog implements ActionListener private boolean onlyPageDialog; private PrintRequestAttributeSet atts; - private final static ResourceBundle messages; - - static - { - messages = ResourceBundle.getBundle("gnu/javax/print/PrinterDialog"); - } + private final static ResourceBundle messages + = ResourceBundle.getBundle("gnu.javax.print.MessagesBundle"); // TODO LowPriority: Include checks so that if a specific value formerly // selected is no more supported by the new service changes to the default. |