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.

2 files changed, 25 insertions, 25 deletions

diff --git a/resource/gnu/javax/print/PrinterDialog.properties b/resource/gnu/javax/print/MessagesBundle.properties
index 0c04db7a8..1e94e32ef 100644
--- a/resource/gnu/javax/print/PrinterDialog.properties
+++ b/resource/gnu/javax/print/MessagesBundle.properties
@@ -1,28 +1,28 @@
-# PrinterDialog.properties -- Default property file for PrinterDialog
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# 
+# MessagesBundle.properties -- Default property file for PrinterDialog
+# Copyright (C) 2006, 2010  Free Software Foundation, Inc.
+#
 # This file is part of GNU Classpath.
-# 
+#
 # GNU Classpath is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-# 
+#
 # GNU Classpath is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Classpath; see the file COPYING.  If not, write to the
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
-# 
+#
 # Linking this library statically or dynamically with other modules is
 # making a combined work based on this library.  Thus, the terms and
 # conditions of the GNU General Public License cover the whole
 # combination.
-# 
+#
 # As a special exception, the copyright holders of this library give you
 # permission to link this library with independent modules to produce an
 # executable, regardless of the license terms of these independent
@@ -34,7 +34,7 @@
 # this exception to your version of the library, but you are not
 # obligated to do so.  If you do not wish to do so, delete this
 # exception statement from your version.
-#
+
 rbt.onesided=Onesided
 rbt.calendar=Calendar
 rbt.duplex=Duplex
diff --git a/resource/gnu/javax/print/PrinterDialog_de.properties b/resource/gnu/javax/print/MessagesBundle_de.properties
index b476551f1..dfc0a8af7 100644
--- a/resource/gnu/javax/print/PrinterDialog_de.properties
+++ b/resource/gnu/javax/print/MessagesBundle_de.properties
@@ -1,28 +1,28 @@
-# PrinterDialog_de.properties -- German property file for PrinterDialog
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# 
+# MessagesBundle_de.properties -- German property file for PrinterDialog
+# Copyright (C) 2006, 2010  Free Software Foundation, Inc.
+#
 # This file is part of GNU Classpath.
-# 
+#
 # GNU Classpath is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-# 
+#
 # GNU Classpath is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Classpath; see the file COPYING.  If not, write to the
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA.
-# 
+#
 # Linking this library statically or dynamically with other modules is
 # making a combined work based on this library.  Thus, the terms and
 # conditions of the GNU General Public License cover the whole
 # combination.
-# 
+#
 # As a special exception, the copyright holders of this library give you
 # permission to link this library with independent modules to produce an
 # executable, regardless of the license terms of these independent
@@ -34,11 +34,11 @@
 # this exception to your version of the library, but you are not
 # obligated to do so.  If you do not wish to do so, delete this
 # exception statement from your version.
-#
+
 rbt.onesided=Einseitig
 rbt.calendar=Kalenderdruck
 rbt.duplex=Duplex
-rbt.blackwhite=Schwarzweiß
+rbt.blackwhite=Schwarzwei?
 rbt.color=Farbe
 rbt.low=Entwurf
 rbt.normal=Normal
@@ -52,7 +52,7 @@ rbt.revlandscape=Umgekehrtes Querformat
 cb.cover=Deckblatt
 cb.sort=Sortieren
 cb.output=Ausgabe in Datei umleiten
-lb.size=Größe:
+lb.size=Gro?e:
 lb.source=Quelle:
 lb.left=links (mm)
 lb.right=rechts (mm)
@@ -66,9 +66,9 @@ lb.to=Bis
 lb.copies=Anzahl der Kopien:
 lb.jobname=Job-name:
 lb.username=Benutzername:
-lb.priority=Priorität:
-lb.acceptingjobs=Drucker nimmt Aufträge an
-lb.notacceptingjobs=Drucker nimmt keine Aufträge an
+lb.priority=Prioritat:
+lb.acceptingjobs=Drucker nimmt Auftrage an
+lb.notacceptingjobs=Drucker nimmt keine Auftrage an
 lb.automatically=Automatische Auswahl
 bt.attributes=Eigenschaften...
 bt.print=Drucken
@@ -80,9 +80,9 @@ title.orientation=Ausrichtung
 title.color=Farbdarstellung
 title.sides=Seiten
 title.copies=Kopien
-title.quality=Qualität
+title.quality=Qualitat
 title.jobattributes=Job-Attribute
-title.margins=Ränder
+title.margins=Rander
 title.printdialog=Drucken
 title.pagedialog=Seite einrichten
 title.printrange=Druckbereich