diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/examples/gnu/classpath/examples/swing/Demo.java updated/classpath/examples/gnu/classpath/examples/swing/Demo.java --- CVS/classpath/examples/gnu/classpath/examples/swing/Demo.java 2006-12-07 01:02:26.000000000 +0300 +++ updated/classpath/examples/gnu/classpath/examples/swing/Demo.java 2010-04-11 20:02:18.000000000 +0300 @@ -1,5 +1,5 @@ /* SwingDemo.java -- An example of using the javax.swing UI. - Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath examples. @@ -225,7 +225,7 @@ Method m = null; try { - m = MetalLookAndFeel.class.getMethod("getCurrentTheme", null); + m = MetalLookAndFeel.class.getMethod("getCurrentTheme"); } catch (NoSuchMethodException nsme) { diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/gnu/javax/print/PrinterDialog.java updated/classpath/gnu/javax/print/PrinterDialog.java --- CVS/classpath/gnu/javax/print/PrinterDialog.java 2008-01-09 23:42:38.000000000 +0300 +++ updated/classpath/gnu/javax/print/PrinterDialog.java 2010-03-22 22:18:56.000000000 +0300 @@ -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 @@ 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. diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/resource/gnu/javax/print/MessagesBundle_de.properties updated/classpath/resource/gnu/javax/print/MessagesBundle_de.properties --- CVS/classpath/resource/gnu/javax/print/MessagesBundle_de.properties 1970-01-01 03:00:00.000000000 +0300 +++ updated/classpath/resource/gnu/javax/print/MessagesBundle_de.properties 2010-03-22 22:03:42.000000000 +0300 @@ -0,0 +1,91 @@ +# 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 +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# 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.color=Farbe +rbt.low=Entwurf +rbt.normal=Normal +rbt.high=Hoch +rbt.all=Alle +rbt.pages=Seiten +rbt.portrait=Hochformat +rbt.landscape=Querformat +rbt.revportrait=Umgekehrtes Hochformat +rbt.revlandscape=Umgekehrtes Querformat +cb.cover=Deckblatt +cb.sort=Sortieren +cb.output=Ausgabe in Datei umleiten +lb.size=Gro?e: +lb.source=Quelle: +lb.left=links (mm) +lb.right=rechts (mm) +lb.top=oben (mm) +lb.bottom=unten (mm) +lb.name=Name: +lb.status=Status: +lb.typ=Typ: +lb.info=Info: +lb.to=Bis +lb.copies=Anzahl der Kopien: +lb.jobname=Job-name: +lb.username=Benutzername: +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 +bt.OK=OK +bt.cancel=Abbrechen +title.medias=Medien +title.printservice=Druckdienst +title.orientation=Ausrichtung +title.color=Farbdarstellung +title.sides=Seiten +title.copies=Kopien +title.quality=Qualitat +title.jobattributes=Job-Attribute +title.margins=Rander +title.printdialog=Drucken +title.pagedialog=Seite einrichten +title.printrange=Druckbereich +tab.general=Allgemein +tab.pagesetup=Seite einrichten +tab.appearance=Aussehen diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/resource/gnu/javax/print/MessagesBundle.properties updated/classpath/resource/gnu/javax/print/MessagesBundle.properties --- CVS/classpath/resource/gnu/javax/print/MessagesBundle.properties 1970-01-01 03:00:00.000000000 +0300 +++ updated/classpath/resource/gnu/javax/print/MessagesBundle.properties 2010-03-22 22:03:58.000000000 +0300 @@ -0,0 +1,93 @@ +# 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 +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# 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 +rbt.blackwhite=Black&White +rbt.color=Color +rbt.low=Low +rbt.normal=Normal +rbt.high=High +rbt.all=All +rbt.pages=Pages +rbt.portrait=Portrait +rbt.landscape=Landscape +rbt.revportrait=Reversed Portrait +rbt.revlandscape=Reversed Landscape +cb.cover=Cover page +cb.sort=Sort +cb.output=Redirect output in file +lb.size=Size: +lb.source=Source: +lb.left=left (mm) +lb.right=right (mm) +lb.top=top (mm) +lb.bottom=bottom (mm) +lb.name=Name: +lb.status=Status: +lb.typ=Typ: +lb.info=Info: +lb.to=to +lb.copies=Number of copies: +lb.jobname=Job name: +lb.username=User name: +lb.priority=Priority: +lb.acceptingjobs=Printer is accepting jobs +lb.notacceptingjobs=Printer is not accepting jobs +lb.automatically=Automatically Select +bt.attributes=Attributes... +bt.print=Print +bt.OK=OK +bt.cancel=Cancel +# names of the panel titles +title.medias=Medias +title.printservice=Printservice +title.orientation=Orientation +title.color=Color +title.sides=Sides +title.copies=Copies +title.quality=Quality +title.jobattributes=Job-Attributes +title.margins=Margins +title.printdialog=Printing +title.pagedialog=Printing +title.printrange=Printrange +# names of the main tabs +tab.general=General +tab.pagesetup=Page setup +tab.appearance=Appearance diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/resource/gnu/javax/print/PrinterDialog_de.properties updated/classpath/resource/gnu/javax/print/PrinterDialog_de.properties --- CVS/classpath/resource/gnu/javax/print/PrinterDialog_de.properties 2006-03-13 21:56:16.000000000 +0300 +++ updated/classpath/resource/gnu/javax/print/PrinterDialog_de.properties 1970-01-01 03:00:00.000000000 +0300 @@ -1,91 +0,0 @@ -# PrinterDialog_de.properties -- German property file for PrinterDialog -# Copyright (C) 2006 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 -# modules, and to copy and distribute the resulting executable under -# terms of your choice, provided that you also meet, for each linked -# independent module, the terms and conditions of the license of that -# module. An independent module is a module which is not derived from -# or based on this library. If you modify this library, you may extend -# 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.color=Farbe -rbt.low=Entwurf -rbt.normal=Normal -rbt.high=Hoch -rbt.all=Alle -rbt.pages=Seiten -rbt.portrait=Hochformat -rbt.landscape=Querformat -rbt.revportrait=Umgekehrtes Hochformat -rbt.revlandscape=Umgekehrtes Querformat -cb.cover=Deckblatt -cb.sort=Sortieren -cb.output=Ausgabe in Datei umleiten -lb.size=Größe: -lb.source=Quelle: -lb.left=links (mm) -lb.right=rechts (mm) -lb.top=oben (mm) -lb.bottom=unten (mm) -lb.name=Name: -lb.status=Status: -lb.typ=Typ: -lb.info=Info: -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.automatically=Automatische Auswahl -bt.attributes=Eigenschaften... -bt.print=Drucken -bt.OK=OK -bt.cancel=Abbrechen -title.medias=Medien -title.printservice=Druckdienst -title.orientation=Ausrichtung -title.color=Farbdarstellung -title.sides=Seiten -title.copies=Kopien -title.quality=Qualität -title.jobattributes=Job-Attribute -title.margins=Ränder -title.printdialog=Drucken -title.pagedialog=Seite einrichten -title.printrange=Druckbereich -tab.general=Allgemein -tab.pagesetup=Seite einrichten -tab.appearance=Aussehen diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/resource/gnu/javax/print/PrinterDialog.properties updated/classpath/resource/gnu/javax/print/PrinterDialog.properties --- CVS/classpath/resource/gnu/javax/print/PrinterDialog.properties 2006-03-13 21:56:16.000000000 +0300 +++ updated/classpath/resource/gnu/javax/print/PrinterDialog.properties 1970-01-01 03:00:00.000000000 +0300 @@ -1,93 +0,0 @@ -# PrinterDialog.properties -- Default property file for PrinterDialog -# Copyright (C) 2006 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 -# modules, and to copy and distribute the resulting executable under -# terms of your choice, provided that you also meet, for each linked -# independent module, the terms and conditions of the license of that -# module. An independent module is a module which is not derived from -# or based on this library. If you modify this library, you may extend -# 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 -rbt.blackwhite=Black&White -rbt.color=Color -rbt.low=Low -rbt.normal=Normal -rbt.high=High -rbt.all=All -rbt.pages=Pages -rbt.portrait=Portrait -rbt.landscape=Landscape -rbt.revportrait=Reversed Portrait -rbt.revlandscape=Reversed Landscape -cb.cover=Cover page -cb.sort=Sort -cb.output=Redirect output in file -lb.size=Size: -lb.source=Source: -lb.left=left (mm) -lb.right=right (mm) -lb.top=top (mm) -lb.bottom=bottom (mm) -lb.name=Name: -lb.status=Status: -lb.typ=Typ: -lb.info=Info: -lb.to=to -lb.copies=Number of copies: -lb.jobname=Job name: -lb.username=User name: -lb.priority=Priority: -lb.acceptingjobs=Printer is accepting jobs -lb.notacceptingjobs=Printer is not accepting jobs -lb.automatically=Automatically Select -bt.attributes=Attributes... -bt.print=Print -bt.OK=OK -bt.cancel=Cancel -# names of the panel titles -title.medias=Medias -title.printservice=Printservice -title.orientation=Orientation -title.color=Color -title.sides=Sides -title.copies=Copies -title.quality=Quality -title.jobattributes=Job-Attributes -title.margins=Margins -title.printdialog=Printing -title.pagedialog=Printing -title.printrange=Printrange -# names of the main tabs -tab.general=General -tab.pagesetup=Page setup -tab.appearance=Appearance diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/Parser_Test.java updated/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/Parser_Test.java --- CVS/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/Parser_Test.java 2005-07-02 23:33:04.000000000 +0300 +++ updated/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/Parser_Test.java 2010-03-23 16:48:12.000000000 +0300 @@ -1,5 +1,5 @@ /* Parser_Test.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -138,12 +138,12 @@ protected void dumpAttributes(AttributeSet atts) { - Enumeration enum = atts.getAttributeNames(); + Enumeration en = atts.getAttributeNames(); // Sort them to ensure the same order every time: TreeSet t = new TreeSet(); - while (enum.hasMoreElements()) - t.add(enum.nextElement().toString()); + while (en.hasMoreElements()) + t.add(en.nextElement().toString()); Iterator iter = t.iterator(); diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/ParserTest.java updated/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/ParserTest.java --- CVS/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/ParserTest.java 2005-07-02 23:33:04.000000000 +0300 +++ updated/classpath/testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/ParserTest.java 2010-03-23 16:47:58.000000000 +0300 @@ -1,5 +1,5 @@ /* ParserTest.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -139,10 +139,10 @@ private void dumpAttributes(AttributeSet atts) { - Enumeration enum = atts.getAttributeNames(); - while (enum.hasMoreElements()) + Enumeration en = atts.getAttributeNames(); + while (en.hasMoreElements()) { - String a = enum.nextElement().toString(); + String a = en.nextElement().toString(); String v = (String) atts.getAttribute(a); out.print(" " + a + "='" + v + "'"); } diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/gnu/classpath/tools/common/Messages.java updated/classpath/tools/gnu/classpath/tools/common/Messages.java --- CVS/classpath/tools/gnu/classpath/tools/common/Messages.java 2006-09-22 04:01:26.000000000 +0300 +++ updated/classpath/tools/gnu/classpath/tools/common/Messages.java 2010-03-22 22:06:12.000000000 +0300 @@ -1,5 +1,5 @@ /* Messages.java -- i18n support for tools common code - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ class Messages { private static final String BUNDLE_NAME - = "gnu.classpath.tools.common.Messages"; //$NON-NLS-1$ + = "gnu.classpath.tools.common.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/gnu/classpath/tools/getopt/Messages.java updated/classpath/tools/gnu/classpath/tools/getopt/Messages.java --- CVS/classpath/tools/gnu/classpath/tools/getopt/Messages.java 2006-09-22 04:01:26.000000000 +0300 +++ updated/classpath/tools/gnu/classpath/tools/getopt/Messages.java 2010-03-22 22:05:40.000000000 +0300 @@ -1,5 +1,5 @@ /* Messages.java -- i18n support for getopt - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ class Messages { private static final String BUNDLE_NAME - = "gnu.classpath.tools.getopt.Messages"; //$NON-NLS-1$ + = "gnu.classpath.tools.getopt.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties updated/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties --- CVS/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties 2008-04-17 03:22:16.000000000 +0300 +++ updated/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties 1970-01-01 03:00:00.000000000 +0300 @@ -1,40 +0,0 @@ -# MessagesBundle.properties -- English language messages -# Copyright (C) 2006, 2008 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 -# modules, and to copy and distribute the resulting executable under -# terms of your choice, provided that you also meet, for each linked -# independent module, the terms and conditions of the license of that -# module. An independent module is a module which is not derived from -# or based on this library. If you modify this library, you may extend -# 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. - -ClasspathToolParser.JArgument=pass argument to the Java runtime -ClasspathToolParser.JName=OPTION -ClasspathToolParser.VersionFormat={0} (GNU Classpath) {1}\n\nCopyright 2008 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions. There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/resource/gnu/classpath/tools/common/messages.properties updated/classpath/tools/resource/gnu/classpath/tools/common/messages.properties --- CVS/classpath/tools/resource/gnu/classpath/tools/common/messages.properties 1970-01-01 03:00:00.000000000 +0300 +++ updated/classpath/tools/resource/gnu/classpath/tools/common/messages.properties 2010-03-23 22:05:56.000000000 +0300 @@ -0,0 +1,40 @@ +# messages.properties -- English language messages +# Copyright (C) 2006, 2008, 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 +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# 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. + +ClasspathToolParser.JArgument=pass argument to the Java runtime +ClasspathToolParser.JName=OPTION +ClasspathToolParser.VersionFormat={0} (GNU Classpath) {1}\n\nCopyright 2008 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions. There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties updated/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties --- CVS/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties 2008-02-21 13:39:28.000000000 +0300 +++ updated/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties 1970-01-01 03:00:00.000000000 +0300 @@ -1,46 +0,0 @@ -# MessagesBundle.properties -- English language messages -# Copyright (C) 2006 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 -# modules, and to copy and distribute the resulting executable under -# terms of your choice, provided that you also meet, for each linked -# independent module, the terms and conditions of the license of that -# module. An independent module is a module which is not derived from -# or based on this library. If you modify this library, you may extend -# 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. - -Parser.StdOptions=Standard options -Parser.PrintHelp=print this help, then exit -Parser.PrintVersion=print version number, then exit -Parser.ArgReqd=option ''{0}'' requires an argument -Parser.Unrecognized=unrecognized option ''{0}'' -Parser.NoArg=option ''{0}'' doesn''t allow an argument -Parser.UnrecDash=unrecognized option ''-{0}'' -Parser.TryHelpShort=Try ''{0} -help'' for more information -Parser.TryHelpLong=Try ''{0} --help'' for more information diff -ruN --ignore-tab-expansion --ignore-space-change CVS/classpath/tools/resource/gnu/classpath/tools/getopt/messages.properties updated/classpath/tools/resource/gnu/classpath/tools/getopt/messages.properties --- CVS/classpath/tools/resource/gnu/classpath/tools/getopt/messages.properties 1970-01-01 03:00:00.000000000 +0300 +++ updated/classpath/tools/resource/gnu/classpath/tools/getopt/messages.properties 2010-03-23 22:05:32.000000000 +0300 @@ -0,0 +1,46 @@ +# messages.properties -- English language messages +# 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 +# modules, and to copy and distribute the resulting executable under +# terms of your choice, provided that you also meet, for each linked +# independent module, the terms and conditions of the license of that +# module. An independent module is a module which is not derived from +# or based on this library. If you modify this library, you may extend +# 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. + +Parser.StdOptions=Standard options +Parser.PrintHelp=print this help, then exit +Parser.PrintVersion=print version number, then exit +Parser.ArgReqd=option ''{0}'' requires an argument +Parser.Unrecognized=unrecognized option ''{0}'' +Parser.NoArg=option ''{0}'' doesn''t allow an argument +Parser.UnrecDash=unrecognized option ''-{0}'' +Parser.TryHelpShort=Try ''{0} -help'' for more information +Parser.TryHelpLong=Try ''{0} --help'' for more information