From c496dbb3c1b16e1eaa20b50ca5cb7b65b6dcc214 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 24 Jan 2008 18:31:50 +0000
Subject: [PATCH] *
 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
---
 libjava/classpath/ChangeLog                           |   7 +++++++
 .../classpath/tools/native2ascii/messages.properties  |   3 ++-
 .../classpath/tools/native2ascii/Native2ASCII.class   | Bin 4063 -> 4202 bytes
 .../classpath/tools/native2ascii/Native2ASCII.java    |  14 ++++++++++++--
 4 files changed, 21 insertions(+), 3 deletions(-)
 rewrite libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class (67%)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index fbeb438713c..d5dc6142474 100644
--- 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 ab860c8d292..fe2d10ae3f5 100644
--- 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
dissimilarity index 67%
index 7f8ac5100be7954ea9746bae3dd9e1f3c016ad71..f85d91fb7cf9818e8d2997c3ffbc04314bf780dc 100644
GIT binary patch
delta 1842
zcwSXhc~q2D6#u<hzHL5r1R+N)(BmmU+4AT~)D*Fj!qGsXNmNGofFWdX7IJM&NhA}+
zFZU%(bjlr<ZwPXsjk41AY*AZGJN?za9Xru|GuS!JobTQD?(e>P-@Wht-p!;xlI@rO
z>AC<Q8^4P%F{JCQ<{|o3v!i3mN%O$T45CkK(0qPP!lU}1=45%A3LA16iuKLrL_O0o
z%`75MZ#89SjFTWsc$^{0=?-`rw1;zx^78XD3S;{#W@@$ddEO=U?tp^nn5KIzh3YI7
zLy#b1Hp3(RfrsgLEvn?i(>zY0KFB&zn5$wQ#dBJV=Rc!Df*|2ph5?nHS}jAXEB97-
z>Z%l!Vxfoy4E7p#gFCa<U00P^wA>%imZ(^S(G0dKEilLDt=D{k<uVxDDy$G>+E=ck
z0-D}uO=4Agk}zUKB|JQO8aI1Rg%~p<M|JS(B|<V=sxK4n7wX{=5zzMt!&!qK5gw3&
zSjP7)*RKniBmG#(7poZJQwpMI@^~`~HFt&Po0M8C;srfj96DnSL*hMfda$xm^Jx_&
zK2JdNiCD`p>>f5d7^n{hiUK~(y(ES!coB^}!b^Iym?eeK#1|X%9&zY^)o4=S$3_*e
zV3U4Z9L+ZCHfeaM6}pJ6|F2QNN99xTDz-5QwOU<Opqjy)lA5oe1v|LUoeY+g{M2Fv
zt=O$%5B8E}d9~Y@8;Bu!yiog9$WXXVn~DQ?ok8{o7yF~`Dan-l{8asrG(>2}VG)P)
zi&COFj5qXa(t}b9j;J__W4a)x+D|Z;N`pN3DX#3$r^?y)ogrmbmV|Q*EK5N<A}TuZ
zmfj?%%x^)rinp<eK?-<d=_pu@3o0%mjT*R~G=bVWUXUIY??7d+me+dy8n=2+#rsiB
zWo^)3%{4s=KE!1aAJN6>%ocA}@$s2t#ma<VRXmBO^f9(G@?L5R6VYa_e#bUGG^G<s
z5ll5OeoQx}yVBxj#61>OJ;7C{$j$^ijl&?&SV|>bKz+XmV^NK%@SzYZFqn|Um`}tZ
zo}>-=m`NX{&f}6CK#uMb0aSoBr$taOYb*tHhFmnCW1uMQEJ}Kzrp38BG5;J&XkFF|
z`7{=XF|ZqzF0P26+DWn|3e-k{dJfb?;LEXe!|&=w(3Q@8MeuwCD{`#eSWU_heJ{Ek
zmKd@wg7pzJ=LimK$iT}vqC@P35XOyew749ifi3nq6l;5qWS$_0ampbk$Od*zP-y$U
zU2rDIcA+e4cM!S#puMyW<N4fD##g~MJj7SlvZ%3v*X;IA9GqZtNC~#B2Hq@bl&xVD
zh7uHes2%;D2NJ4qFpP-~Deky|lO+ktVDug2P~2(04kMmagGfcb;?8mv-_;3&Pa9>H
zAV-gOps&CoI3xpI2F{2391g32OAf)nyL|W{49S^pAk^DImotj3Ve6=MVpn|y<7f=g
z6SIb{b1fWLhf!FMOf(^f<RomM%WXyx$$8j_g~U{iWDPdaE7L+vu^A26f@Q>~RWuKg
zZY^O=MAQ~+gO2U=-+?f8B6J+PVGu9RV=pdaAHKnU+(H}v!U1L?CQ4{$i8#zg;s{H{
zQI?HkY%-3s892cTaFUe}#Vc@{)zRCq6lYlj@oXgwN~e=GqKj=Hdhz~j<Q>SG`}>p6
zKEbD8lqH#6p;k3v5}S#ul!+PhSOz}B=dhrLIq(I(q*^rLZ+wNXi3TnBiH<1{jl$@~
zx41@aeFR<j4&T!=V$cKf1Ac@;DGb7O(%C421vhY$Jj=AVpAJ+@6FiJ2YB!iGf}e>B
xzjXY^I3>!cOT?v~Xa*{xw$XEQn_JQGH{2#UiUN#5>^HGrPVbja+II)0e*rDcyf**<

delta 1886
zcwTK(X>e0j6#j0uxAYZ4A%zFd6cDAflu{i!Qb1&Hv6R{hHCmvdeQg6F2_dOvO`(Od
zZ%^3-Z7CXLZCPGwBPecFR1k4T0cZT>Uw=3*1D>0-Iyz=1@7#O7@0@$ix#!%Uhu%rE
zU%l6L89)wx6kuY=()XAL=-16^$E34nizH%_{=0doZL)$SJfRP@IQ3hW5@n`>0dNS&
zXLzi~VDP|vm$%BJ&2)P-8M82(TRh3|h`!65${p&bt%7Zif+Eb-yR7qvJ*7Z|O++a}
zay1!^(Y%$uDz~>r#ype>n6Ky991lH%5e!K+TCh0a^J{_NN(l_lDzL&P5wBdq0xZ;*
z+R|8szRmVPco7!!gEKg-N`a7|RV%1LErZz?3Nknfm$>R&*=}EUalq{jmIecwYuN+=
zOBe?AB0P<`p`bt11Iut@v4CX^slAk`q3UWapjDM<t|~1cz{j9I*b5eT|29qFGQ3#M
zLks8yLbm8ZkZ(eIgD@!fd4~S~3aKpM4sw?(|L3?~Y_)z(NK0OYwcO7-hRpOr{f00=
z?;{Qr>(Riq>-8*gP;wm_WO&e|U?Vo^CE|$i=3ciRm$xRHqNJ)P+{@UC?E<zj*#ApV
zumd|8Y#z;96Xdl_A5|cu8N2yOdl)R~1*7J3dtJc`c#)WuwXVRFU;>%OFJ!+039>8^
z>7ar`cuBt}j!Zj(R|LGw(C?oU3%o(CMhhrtL90GpdN{QiZ3>RzRr2cc`!#PB!;ti8
z`W0!2J;Gor5AjG|=adurNhxRGDN>FdE8+|T8!O`o+7)!*oc@cH9&W}31sAc2K@9p5
zxyh(QR6!>)7z97R0gsp0tV=-*3WK%M<6EI|)+Gg(<C<zuXhkj8bji4acLluDdx`N3
zX4F?|{-E3ERq!6?_w^@Q%~h!%l7F>*uV5Oc>-&?=OB<<4O*Da1^ipM9cw#5gqIlfE
zxXgA^nqa4IDz!UMPIX>DbGHbiQH#m&qhB108zTk%NhTqe)>En0CVl|PWODKcO_~C*
zEg4bFm@_&vhFMNp78oeZxPanrC>bdwop|~p!o{R;c0)Rc=OXA6!y+eFMByqTSs4ek
zIN;_$WfV*EEHQYTF?gL>+*uU<C|2ZIW2hr#J^fcXRZ9X{6Gb?R4S6=zYM?PsP=#*T
zBDftxvr`oeY_W%nE27wyCz^Am2-;P_AsN`4E0g)YgD7%Hc3VZ9*oG-RpuM~W<M`TA
z!FQn+jO06OMVxHlfZg7S!?{VS=t$aY;AmNsWR0N2A=|^p(BrrdfilM;VT@PBl-CR#
zFLTKKaKDXXDJS_pg8roHODgh}a+<5SStri&Ws}4lQarTQ`-Q4a6%Cv>U_|b#Jl8i=
zn}Ij^=dB3DqAUY%chKDoXAP{8x+ihV*YGI9K!`58j;^yFDpq1R)*u^ekw<a@)*+uL
zr6lKJJr-gEG?GiuNRLYs0yN-t*hH4i#NJ5ECSo+wZYy?T8+2^PKAPeP?M`Di4D7)r
z?8Q|=zM`4^3H!qM4f~l12bhRMEER{@Fto5yXk|G#$|j<XO~)}-NP}2Lk3kiVGcPu?
z<v79WaFVUYDaz*zYeGBQjC1k+Y~mfrw)FHTU%ihHD0eHdx~Wr5n85P!AthtRJQf~<
zk0>4sy~Qd%#wS#ZX8egysW>)@`Yx`M6expke1;p;)+f+~&vBF96$7pK0$)O=6#7y=
zH<3g~SnxHzA=eVV?HvcIrHNL65(A^w{*FfBR!3skW|NTP6J^jWMdKML335DcPWmDK
Wy^T902b1eeB!1(2<SgRfh3PMEe9TG!

diff --git a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java
index 35e9f481f94..0667befc6c5 100644
--- 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
       {
-- 
2.11.4.GIT