* resource/gnu/classpath/tools/native2ascii/messages.properties

	(Native2ASCII.ReversedHelpCompat): New.
	* tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
	(createParser): Add -reverse.  Update -reversed.

From-SVN: r131801

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index fbeb438713c5c67afbd2e38289999c61fdd5db94..d5dc614247409613d5894bf2e23e3b93d9c91fd8 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24  Tom Tromey  <tromey@redhat.com>
+
+       * resource/gnu/classpath/tools/native2ascii/messages.properties
+       (Native2ASCII.ReversedHelpCompat): New.
+       * tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
+       (createParser): Add -reverse.  Update -reversed.
+
 2008-01-21  Luciano Chavez  <lnx1138@us.ibm.com>
 
        PR libgcj/34369:

diff --git a/libjava/classpath/resource/gnu/classpath/tools/native2ascii/messages.properties b/libjava/classpath/resource/gnu/classpath/tools/native2ascii/messages.properties
index ab860c8d2929f43545513b34fa7e7a4560876492..fe2d10ae3f58bb6da9967790df6878594dfa5030 100644 (file)
--- a/libjava/classpath/resource/gnu/classpath/tools/native2ascii/messages.properties
+++ b/libjava/classpath/resource/gnu/classpath/tools/native2ascii/messages.properties
@@ -1,5 +1,5 @@
 # messages.properties -- English language messages
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Classpath.
 #
@@ -41,3 +41,4 @@ Native2ASCII.EncodingHelp=encoding to use
 Native2ASCII.EncodingArgName=NAME
 Native2ASCII.EncodingSpecified=encoding already specified
 Native2ASCII.ReversedHelp=convert from encoding to native
+Native2ASCII.ReversedHelpCompat=alias for -reverse (deprecated)

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class
index 7f8ac5100be7954ea9746bae3dd9e1f3c016ad71..f85d91fb7cf9818e8d2997c3ffbc04314bf780dc 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
index 35e9f481f941dd37c84cb5ddf65c87c438c3dc3d..0667befc6c5e3b074a7ed5a9cbc165d1afb884e9 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
@@ -1,5 +1,5 @@
 /* Native2ASCII.java - native2ascii program
- Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -101,7 +101,17 @@ public class Native2ASCII
         encoding = argument;
       }
     });
-    result.add(new Option("reversed", Messages.getString("Native2ASCII.ReversedHelp")) //$NON-NLS-1$ //$NON-NLS-2$
+    result.add(new Option("reverse", Messages.getString("Native2ASCII.ReversedHelp")) //$NON-NLS-1$ //$NON-NLS-2$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        reversed = true;
+      }
+    });
+
+    // We mistakenly added the extra "d" in "reversed"; now we don't
+    // want to remove it, for backward compatibility.
+    result.add(new Option("reversed", Messages.getString("Native2ASCII.ReversedHelpCompat")) //$NON-NLS-1$ //$NON-NLS-2$
     {
       public void parsed(String argument) throws OptionException
       {