From 53bd2d42870c92a7c66fc249d620b371a5340b72 Mon Sep 17 00:00:00 2001 From: tromey 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131801 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index fbeb438..d5dc614 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,10 @@ +2008-01-24 Tom Tromey + + * 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 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 ab860c8..fe2d10a 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 index 7f8ac5100be7954ea9746bae3dd9e1f3c016ad71..f85d91fb7cf9818e8d2997c3ffbc04314bf780dc 100644 GIT binary patch delta 1842 zcmY*ac~q2D6#uK*`l_XcKWM-J9eV`&EOw>bH4As_q+Gq``*3x_vTj8pUL(s z|8`vjkc~e?m>AM|t9b~&W_EN;Ib|L=nL+ev^_tJGNqC(9Wlol-sjy)>LowfCPUM-E zX=V|*yw#MQF;0Rk;Yo(10$0FYuRS`wC^s)JqcFCfT41ivTc`N~D`YUZR9GR%w60u5 z1vK7gO=49%NfF$P+}_MW%~hfKCZ!gOc!{TrLuamGNW8C{5v;7#d|E|` z&mGWwBGxesyRVxQ4Acb!MFF4YS{l@)dtd|;3HfS@i7&SGh4h_#V2Qz6)O{dQ}HyO;bUxP<$cr?CZf$ee%CfWG^G0#yt^*o-&}*WM_h%zQZ8Ux0F)4kotZx#-bWi;X@%-VlZhEV?Ggw zc$(RehgtN}(T%ty2auzCL;w|F&1n(j&mKzw3qnpB&(%?sb`B-IP}Aa^omg-lB{VPV zg?t7}!Wh_%N~ZxtP+dT>CaUm66?KN9CIVlMr5k={H-gS|LP{cdF@lvj)^0Qq7@~Kr z(_x8e)<>`*g615-VGZecB}a6Ky%55<*^L&bL)5X=K9^$c$dSww5pv89Ym?ZGxYV$7^%QDYsi+wGk=G{NSO5^URayj9XD zTf-;}B`Ee#JNi8jB&}j7!#&ZAV;@$urJ>sI3yiiIxd9!91g3F%ML-ud&cL(FroE!&kclSbkeq~#RNQ71k(`fBSVTz({VakBf8i|qL|l zb4KtBQQ_APn#anZkOVFhmwKWnP^nO48{M~Ib31DJJMNGiMFGZ;G@gkuL4Q=Sr-0Vo Gh3P*n&Ac}N delta 1886 zcmZvdX>?On5XXNvP4bpLAQV!FdQQQ$6rrGp9xZMN3e^g=6>1fsp?xjInAVU~a0^PI zAh^I&P()?ZAcz8LQd>9N>WcfmpW`RL`oZIJ#JOp!elX`GbMO5BGk0e0%+1f^zAp*A z{a5dcz*K%T@F^yFn+isI?-xW4o%>XQ-!eJZ`@LXX@O+0tF7U?r8@#XmwaqX`?# zQJghsaNL+V(Rg#ry|^vr+RWw>ZE>mM4DarOV(rj75HNz5Im~6A*Be+c{&EMCph=x# zSc@1R$&28~koB7lmEbyiV!>3%y$%?{OH(8Tt?{E{zl@^Mt90CL_;VpEyhDF}B z!4lQzZ3v!_Ud$4GaG9nxI~W7B7Kc`rDhk?DNkzDNS+p}+-qv1TlW2=4>yimKdfjw` zWs0#wh)!c(D%p`5gl*bbVsM?Jc!+Xgs-?wExXrb0wAoDg3& z&=OviQEtXa>P^a9WsI%3K{0B`FdtHVqAjUiuKb_lhOnEwqejWF8@WaMxm7W-wA%a7 z80`%=$CxWvrM0(tlgzQhI$32Cqsw6pYrR_YXGdeZp*78cocQdTV5+zL2dB z7Pf5(=>dmrJm~#po>uY@j~G0x82RssRq>?T>Lwg^u+y7mom$+@ZihWQDqf=<9d5i? zaeV1a?}&ALD5LN#OzB7-*OYzUerxKOCqy}Aipi4-HO1y34mup-u=k5qn(pQqhi6%< zFq7>A$=h_2bLgQ=VRY!Gh{biydL8<36oIB#`*LaPPF`?$F|TQfrIs(%nqHeDylU{u z&?V+;cF~F^wp)+M7&-ZuN!;5QC4ndNOQeA-$gP3n^goZ;0u)6(bk zP?F=kEYl_)6s3=l{1!{Q!$PU^H8OXLIi01PPX{COSl*Z-M#-*_3TAMj)Y_*H5IIbo z{2`O(fLdRcpV-Ij23b~RsV;klntq(JqS_v=c$RdHC>r{)4s&&e;e9M_(25+< zxgwkLfSU)}G|-ge+Dd;Pv4%e44UqF_9#vFH7ngtbBhJz6!Y-QP8VT<{e2bdeSLczv7aW^vt z!O+4TOw((BqfkSs9h|0jfyO*J%l)BH58EpWBWAd8bCzB8T~;7NZP*T__b}*qxPZ3C zGHK3^m_?6e*;^mBM{;a8f)(x8`wXK*H9}P4tLT7MX|o=l(#tMOg{^#OJC9XIf)O*z z(^;~aV-cO}bCF<{=k?D^8O*tpvb=mq?&d_bO0Aae8Mx)6oJkr|a@n17ohyj2k`uX^ za&DngWWTzJCnTRIRTl@eAmqPKNua*J0dIWFN&o-= diff --git a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java index 35e9f48..0667bef 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.7.4