I'm checking this in to Classpath and libgcj.

Sun's native2ascii accepts -reverse, while we accept -reversed.
This changes Classpath to conform.

This bug came from the IcedTea build:

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=103

Tom

ChangeLog:
2008-01-24  Tom Tromey  <[EMAIL PROTECTED]>

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

Index: resource/gnu/classpath/tools/native2ascii/messages.properties
===================================================================
RCS file: 
/cvsroot/classpath/classpath/resource/gnu/classpath/tools/native2ascii/messages.properties,v
retrieving revision 1.1
diff -u -r1.1 messages.properties
--- resource/gnu/classpath/tools/native2ascii/messages.properties       20 May 
2006 22:10:31 -0000      1.1
+++ resource/gnu/classpath/tools/native2ascii/messages.properties       24 Jan 
2008 14:27:37 -0000
@@ -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.EncodingArgName=NAME
 Native2ASCII.EncodingSpecified=encoding already specified
 Native2ASCII.ReversedHelp=convert from encoding to native
+Native2ASCII.ReversedHelpCompat=alias for -reverse (deprecated)
Index: tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java,v
retrieving revision 1.5
diff -u -r1.5 Native2ASCII.java
--- tools/gnu/classpath/tools/native2ascii/Native2ASCII.java    8 Jan 2007 
17:00:49 -0000       1.5
+++ tools/gnu/classpath/tools/native2ascii/Native2ASCII.java    24 Jan 2008 
14:27:37 -0000
@@ -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 @@
         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
       {

Reply via email to