From a4194b135033f824b8a5be5b6ca02639ce7dc9c7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 16 Jun 2009 13:22:43 +0000 Subject: [PATCH] Main.java (getGjdocVersion): Use gnu.classpath.Configuration.CLASSPATH_VERSION as version number. 2009-06-16 Matthias Klose * tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use gnu.classpath.Configuration.CLASSPATH_VERSION as version number. * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java (getDocletVersion): Likewise. * tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate. * tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class: Regenerate. From-SVN: r148530 --- libjava/classpath/ChangeLog.gcj | 10 ++++++++++ .../doclets/htmldoclet/HtmlDoclet$1.class | Bin 1205 -> 1205 bytes .../doclets/htmldoclet/HtmlDoclet$2.class | Bin 1207 -> 1207 bytes .../doclets/htmldoclet/HtmlDoclet$3.class | Bin 1401 -> 1401 bytes .../tools/doclets/htmldoclet/HtmlDoclet.class | Bin 80179 -> 79930 bytes .../gnu/classpath/tools/gjdoc/Main$1.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$10.class | Bin 1221 -> 1221 bytes .../gnu/classpath/tools/gjdoc/Main$11.class | Bin 1728 -> 1728 bytes .../gnu/classpath/tools/gjdoc/Main$12.class | Bin 1799 -> 1799 bytes .../gnu/classpath/tools/gjdoc/Main$13.class | Bin 1800 -> 1800 bytes .../gnu/classpath/tools/gjdoc/Main$14.class | Bin 1002 -> 1002 bytes .../gnu/classpath/tools/gjdoc/Main$15.class | Bin 924 -> 924 bytes .../gnu/classpath/tools/gjdoc/Main$16.class | Bin 1715 -> 1715 bytes .../gnu/classpath/tools/gjdoc/Main$17.class | Bin 828 -> 828 bytes .../gnu/classpath/tools/gjdoc/Main$18.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$19.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$2.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$20.class | Bin 1382 -> 1382 bytes .../gnu/classpath/tools/gjdoc/Main$21.class | Bin 1401 -> 1401 bytes .../gnu/classpath/tools/gjdoc/Main$22.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$23.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$24.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$25.class | Bin 809 -> 809 bytes .../gnu/classpath/tools/gjdoc/Main$3.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$4.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$5.class | Bin 767 -> 767 bytes .../gnu/classpath/tools/gjdoc/Main$6.class | Bin 806 -> 806 bytes .../gnu/classpath/tools/gjdoc/Main$7.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$8.class | Bin 825 -> 825 bytes .../gnu/classpath/tools/gjdoc/Main$9.class | Bin 806 -> 806 bytes .../gnu/classpath/tools/gjdoc/Main.class | Bin 29564 -> 29338 bytes .../tools/doclets/htmldoclet/HtmlDoclet.java | 15 +-------------- .../tools/gnu/classpath/tools/gjdoc/Main.java | 11 +---------- 33 files changed, 12 insertions(+), 24 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index e4d7c2fae3c5..6398644ad7d6 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,13 @@ +2009-06-16 Matthias Klose + + * tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use + gnu.classpath.Configuration.CLASSPATH_VERSION as version number. + * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java + (getDocletVersion): Likewise. + * tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate. + * tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class: + Regenerate. + 2009-03-16 Matthias Klose * configure.ac: Detect xulrunner-1.9. diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class index 5bcba7c4e0aff896856baa986e9d073c1b92e6ae..4db03df8d4136a69c3fc50465d7202aaa86c92b9 100644 GIT binary patch delta 14 Vc-q^_xs`LnWM)Q%%~O~a8386u1W*6~ delta 14 Vc-q^_xs`LnWM)Q#%~O~a8387(1YiIF diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class index cfecc2eeb96f803583429fdd0fe39f7d99e8378e..b2ef23465e097ad2d8dce401e08f81535321bfa4 100644 GIT binary patch delta 14 Vc-q^}xt(*vWM)Q%%~P0_8387R1Xch5 delta 14 Vc-q^}xt(*vWM)Q#%~P0_8388c1ZDsL diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class index 620bb15c3b69e27e182d005d564a965ca9f803a9..83886a0a3c62f4edd6e069e3548fe2bd339e115b 100644 GIT binary patch delta 13 Uc-s5P^^-ib2+Pkv~nN zHRCwblt6DY?~F|~Q#nm#1&S{L6a7daMHJDL%*+54KT4xdF|oU>1NrCNbDp{PIp;a& z+BsUa|O8khrp(UG*2)o1{3O9r!{y09WcC`2{V+#MCpH`<@iWAN-n6et0%4B}l z?6LBn)V$WE(pmnq!pHf9y1w;6=XnNWW>%)eFETK%#4o9>t?Qq;uJGUZG=nAdd@xep zBv_VJW+iN^MCk^mET}+)(4w|c@4qF zy1bR)a6@gdQDJU=Q}wsG4g8k6rY+yhZ!0p?SK88CMup$YWR5Y}tYC#~VOXpB1BL2H zTZ%f{kLpWP_r3h)qwlR=1p}C9rpwdG`v<{2EE!E)_sIWdQnl+h1FGF7a#66 z+YDGIyrXf?(}}Nj3mbr4U_)^%$Hk9%je@6}A2%RQle17sfyfJb9}<0lMEVemX*V*( znN1&~)K8zFj6TIG+JndFGt|%**hC$3Io<`DVlm7sdNF4(?vW@Q`kV4P)C>X zB3(ffT@|S(v4gJRb(+>1mb36vzk77^e%;m?o9mw*-Io0&|2r1;8n)HsbQxZ&_WE4> zU!BkTbX#-ByySFPh2$GzkTXK=P0`(3@X{;-bQ>iOX#QfB%$QbL%&M44(~4Qy8iUxE zL7lzj(G9P5$)@(Zr{$1gb||no?BEW9)8Rmpz!qljzB7B_$yP1BgcX|iDY}XEyu>2(y er7Xkfg7hB~W;aX# delta 1539 zc-n1KX>3$g6#nikZ)Wa&b6?wO>2z93Sz6jzTBj`(LP=CWOS8mgbSXgeXL#Hc^q5c*1^&LOhR&IelJ;;k))Z+eZjDA-!_l^;aLh_~ z5#+_9p^|7g7Fik%g=7DdMQ!Wo9@$n%_YyeO^|MEH6wR~J?+NUUixxye#g8izX&x&* zKww$g@aNbw_E4lb67?sOPpG+Fe(9`C&(ZU0Lsy040)eTZxosMw7tL-9 zy+n|so}Q7OHZK@$3cl7H7C8M~rhm{s)g4_EQ?C#h^9u5;^cn&2TImh-e%DL2f6Me9 zy-y&876zkLZGy6}w&+1uq&B2z&lIlpLIUH<} zNftAyeJisJOj7r(e8$YIGP9|qJKG`4bR1z6hZ&bq$rOSH)n8tw)^|JAW!)LJv;^uP zXdFTHv968xyJxNK7=%%LK)rht-7$oj1GaU6xNZGxw=PKzI;2Z-op%U)Kr#j#^t-q% zQs?pNbhq2%p!;`fVK4RxtH4JO+Aaxd7slC6NMm8p zI{n1c@uO)QP6dn(I{ae4ae@)^d&Esp6NuyaIEm@mAeNzc6rU+WUt3A@0C zlbE>Caj#ME^wXaWNYZ$EMc3r`rI5w=>tW@+NaKCT;Tw=AY!TOy>F04w<6H0?@5fxe z6#@Pg7V|-EZYjxRCq~rhp&AM$<;u#;fbz9LEhD11Ecst;U8{VDc^*NYXXBMAsYwsJ` zaITOc6bV+vf^@}-@d|}kVJKH*Oi}EQROS{_Lx?r0GT||*)lVjMBvo58nM^BZLN7x) zS>@IZ@5GtC_utQ_IAK<@ASo_TB^#+q4l)#{X0ITbBt^@wAQc@?6ZqmRwf8^cO%M$E zf}ub#OcV@-f}seb1pZ_^*T{G-mSVIENeR!$VHHdXEM0iU6f4VMqr}-Hf#nOE$TDlk jDoEbw%tTY>WLb~YEJ)_i^%gU&*xsJ7q5db0m1VI1* delta 14 Vc-rgW>)_i^%gSi5xsJ7q5db1x1W^D0 diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class index 5bb6c725956f948beae904e4be0eaa5125126013..211ef8606c8ff015f9ba24a5d715a5d97aa1f58a 100644 GIT binary patch delta 13 Vc-ni#{)&CWKPExCKg78#hY1}03##>WB>pF delta 13 Uc-q^{yP0>xCKg76#hY1}03&n+bN~PV diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class index da2e873908d6ec2e6fd0194b5e7da425fe45aabe..ae88b4f6695fbafa61be3155040426a7f799a4c0 100644 GIT binary patch delta 13 Uc-q^;wufy)6ceMug8%>k delta 13 Uc-q^;wufy)6ceMtWG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class index c2bfa2d442a709be5f740848fb2420aa6878a00b..aa349663be818128dd149cdd14dad014785aad44 100644 GIT binary patch delta 13 Uc-mXZwvugwCljN>WG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class index d294d3c25c5b5d7f6a304da88baa8875fd0aad3a..607d9b7a2a5c6e1d263d921f5e55b7d296ac5332 100644 GIT binary patch delta 13 Uc-s5V`k!@!JQJhBWCf=C03*%>j{pDw delta 13 Uc-s5V`k!@!JQJhAWCf=C03;p+p8x;= diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class index 390bd1b7929851546d119b0ddbe936e93ce31fab..f0201ad301117b60554228f5d254bc2b7d4e8ec6 100644 GIT binary patch delta 14 Vc-ni$^^9wS6APolW@i>WG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class index 1b14a4118b571a16716bd2c1bc132d2d6e4b5958..4c3d30a1c7ad553aceb60a4d46ed522f5f7185bc 100644 GIT binary patch delta 13 Uc-mXZwvugwCljN>WG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class index d38eff9a626b230b822d5e135752a5ac5786f9cb..b6531dae73e4548c0e76eb6946f40f340ba106eb 100644 GIT binary patch delta 13 Uc-mXZwvugwCljN>WG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class index a812e147cd57417bf33c6bad0373879297e9cb76..782a3a38764158a86daebdf3f592568149cd5e37 100644 GIT binary patch delta 13 Uc-mXZwvugwCljN>WG|-s03D(PIRF3v delta 13 Uc-mXZwvugwCljN=WG|-s03GrKNdN!< diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class index 00817dab00b0a231ed108971d6dcea801e3b39e6..ccb4c5cdea755d64324e38a3f01a2acc98c0b447 100644 GIT binary patch delta 13 Uc-s5V`k!@!JQJhBWCf=C03*%>j{pDw delta 13 Uc-s5V`k!@!JQJhAWCf=C03;p+p8x;= diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class index a789799d2313b3683d300c255c111a3e81181b06..7bd4d416eac779cb017679ac58c6b4fe8004629b 100644 GIT binary patch delta 13 Uc-s5V`k!@!JQJhBWCf=C03*%>j{pDw delta 13 Uc-s5V`k!@!JQJhAWCf=C03;p+p8x;= diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class index 09dfcbb61cb4d70feb475ac14bab6c0b9d159685..8a1b9a090714b4a63d510984d1de8b5051e678c8 100644 GIT binary patch delta 13 Uc-s5V`k!@!JQJhBWCf=C03*%>j{pDw delta 13 Uc-s5V`k!@!JQJhAWCf=C03;p+p8x;= diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class index 634155f58af10e24e16bbc01750b57478c4a0bf4..f6f9ff87bbcd4c4eabaddc78c16fb31cae1fd5bd 100644 GIT binary patch delta 13 Uc-mXWwv26q8xy0#WOt_f03A65EdT%j delta 13 Uc-mXWwv26q8xy0!WOt_f03C@0Jpcdz diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class index 91e10b27c7a04dcf4b3b6b2ae510b7c08da207af..8ff1acc7f37fcf094f4a155d809f9aead29037b2 100644 GIT binary patch delta 13 Uc-q^^wv%l`I1{770v@6o${tndByIOjGX-#O7nul1hZ+#!{?qL^Lh5fr9@a+605;-h8+cTCWwp55EdfX8QVq0KHtlTP&>??>{QrR?aHiTQ9EpL0~5UH^3`k{&L>& zsCOqK@tDH7lEfZ8$-NPtSJxI-XP0vzLGU$t>NU3B!&pkkgI#Pn)k{8>u)=E)5I~y- zO`CzBmV`W?1%?{bVTvj68{K*sPPI4xN?s?RUHK>M8HPhXY~UdkEF*EW^M4$kxpC=+ zz7ttj75>03eXvZ0CoE-cgC^~m!k=zoUcz74W%DLmN%o}EDHYwt-}KmyD(s&-TaNPw z2h_AP3QrY0ub3zl&>T}TOBFMMBU>p&+m#r4l}1et`;_19XjJ1k<~~EGrD_7ldCUjZ vEC!e_m=~Czm_e5YMQU-J;Qc}^8wrh`xlK=NG5@6V0qUaCX`}W94JFS2KBIm1 delta 790 zc-n1`%WG3X6vofoGtDG1HEGkvw0Woz)0&h#d?6L7V6rk$?LraU#O79#ruXL6x-1C# z56q&_jms`{VbG*l!G#EdxDi(_T&hsoTHmi2JvWI^wX5&UH|P6(GmEcS<27?UX|6l~ zfH)5bP#E~-v!K5k**rBbaGgP4E1aAwOB>Qr8xtWYGWr7z{xj0G6}w81Et7#tZ+86T0;3Ae&QUQ0|V+$`4<_gL?p zrR4a~`~n~-^zX6IU0i((NAKg>g=O4Gg+q1ag%jV_m6vsV7YaM^V;w)&aCHgz`Sz|g zM z?=)O(r4=K?nXJwn-^|1~=h&1UjfO57#*R11Zd4T_cT zkY{zLY-(Q4ZM?g6i0eMw*_vZ$?|2Kk&+XX0sYgE5z3Ak9Z4!n1xl8&Baoj~U6Qpi> w{dLj-(iPG{(hX7%X`mQKFX_2r-0j=802}f~(QEM=ujjk@9{H&F9QShNH-q@N^#A|> diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java index 837333ddf0f7..e49e1c573410 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java @@ -3736,20 +3736,7 @@ public class HtmlDoclet protected String getDocletVersion() { if (null == docletVersion) { - try { - Properties versionProperties = new Properties(); - InputStream in = getClass().getResourceAsStream("/version.properties"); - if (in == null) { - in = new FileInputStream("src/resources/version.properties"); - } - versionProperties.load(in); - docletVersion = versionProperties.getProperty("gjdoc.version"); - } - catch (IOException ignore) { - } - if (null == docletVersion) { - docletVersion = "unknown"; - } + docletVersion = gnu.classpath.Configuration.CLASSPATH_VERSION; } return docletVersion; } diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java index d1316b341831..cbbc8f4f7ddf 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java @@ -1825,16 +1825,7 @@ public final class Main public String getGjdocVersion() { if (null == gjdocVersion) { - try { - Properties versionProperties = new Properties(); - versionProperties.load(getClass().getResourceAsStream("version.properties")); - gjdocVersion = versionProperties.getProperty("gjdoc.version"); - } - catch (IOException ignore) { - } - if (null == gjdocVersion) { - gjdocVersion = "unknown"; - } + gjdocVersion = gnu.classpath.Configuration.CLASSPATH_VERSION; } return gjdocVersion; } -- 2.47.2