From aab175428401b9ab51e99f673fc648479e228197 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 1 Feb 2007 21:36:01 +0000 Subject: [PATCH] * java/util/logging/LogManager.java (loggers): Genericized. (addLogger): Merged. (findAncestor): Likewise. (getLogger): Likewise. (getLoggerNames): Genericized. (reset): Merged. (getLevelProperty): Likewise. * java/lang/reflect/Method.java (getDeclaringClass): Genericized. * java/lang/reflect/Constructor.java (getParameterTypes): Genericized. (getExceptionTypes): Likewise. (newInstance): Likewise. * java/lang/reflect/Array.java (newInstance): Genericized. * java/lang/Object.java (getClass): Genericized. * java/nio/charset/spi/CharsetProvider.java (charsets): Genericized. * java/text/Collator.java: Implement Comparable. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121473 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 20 ++++++++++++ libjava/classpath/lib/java/lang/Object.class | Bin 1670 -> 1733 bytes .../classpath/lib/java/lang/reflect/Array.class | Bin 2431 -> 2548 bytes .../lib/java/lang/reflect/Constructor.class | Bin 6252 -> 6329 bytes .../classpath/lib/java/lang/reflect/Method.class | Bin 6176 -> 6184 bytes .../lib/java/nio/charset/spi/CharsetProvider.class | Bin 821 -> 894 bytes libjava/classpath/lib/java/text/Collator.class | Bin 3454 -> 3558 bytes .../lib/java/util/logging/LogManager$1.class | Bin 2265 -> 2265 bytes .../lib/java/util/logging/LogManager.class | Bin 13097 -> 13496 bytes libjava/java/lang/Object.java | 4 +-- libjava/java/lang/reflect/Array.java | 6 ++-- libjava/java/lang/reflect/Constructor.java | 12 +++---- libjava/java/lang/reflect/Method.java | 4 +-- libjava/java/nio/charset/spi/CharsetProvider.java | 4 +-- libjava/java/text/Collator.java | 10 ++---- libjava/java/util/logging/LogManager.java | 36 +++++++++++---------- 16 files changed, 57 insertions(+), 39 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a19a97c..6e62fff 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,25 @@ 2007-02-01 Tom Tromey + * java/util/logging/LogManager.java (loggers): Genericized. + (addLogger): Merged. + (findAncestor): Likewise. + (getLogger): Likewise. + (getLoggerNames): Genericized. + (reset): Merged. + (getLevelProperty): Likewise. + * java/lang/reflect/Method.java (getDeclaringClass): Genericized. + * java/lang/reflect/Constructor.java (getParameterTypes): + Genericized. + (getExceptionTypes): Likewise. + (newInstance): Likewise. + * java/lang/reflect/Array.java (newInstance): Genericized. + * java/lang/Object.java (getClass): Genericized. + * java/nio/charset/spi/CharsetProvider.java (charsets): + Genericized. + * java/text/Collator.java: Implement Comparable. + +2007-02-01 Tom Tromey + * java/util/Calendar.java: Implement Comparable. Update comments. (clear): Call complete. diff --git a/libjava/classpath/lib/java/lang/Object.class b/libjava/classpath/lib/java/lang/Object.class index 40563bf154986ad9d85d4fe2e6d98c79e3b3ff8f..a2755d819b60458db08a8715116525f9b3daece4 100644 GIT binary patch delta 624 zcmZXQ-%b-j6vn^V*}8Nym39^X6zEpKQkH6^(psTH6;M!U!TKk?T+L=vf*UQ1k6_}J z+045vq$CZ z+{CP`DTT?3KnjMAD&{oYW=Nfgta-lUI$eQz)Z_;xPlF55;G+DblnfJh1xAt4!LTGS zgbR}M3VSH$c!M?Md!9{gGVqR<)nVdsG}w|oUg8@l${+j&Ozmywo%T8|Gy(1~G0epRa#%0c}AaSd?lfQdtxZ7al;5aS2P@8f#1 z9%6=W$_Ka=;!cRVT#e<%he%pEWf6&#`*wh4#d(N(GKg8kE&s~=lQGof(WtzIL1-Ex`bg2S95 zbqqFpJDZ)hN5DlhYE=e(<~_!^WY(=QNiKV0p=`QVVfL!WFe#TR*B!1Y(#IkzonEWm z+VQwS&3v)ur0`Z;c-wrp${C*pk8vhq%Xd9S7&SFrRS(U!Zm7rRlg_0Z3ccCMx%fPd z3)jszUDm72o4mbULdk5TK&44z_haTy6g81e$XD4CPs+}6+8o*S;$XBr%p{0J{0%_P95=;V$Ev2@$ z^%IJFQ@wSZz44|u+Z{X8sh9T3EB^+s9j~?T9wrlUoXq6O{&Jq@yze>h{!{zcUhDqf zKi>s9`F7L#y|Fs!q_cK$DW6irTgT4X%XUY`&Zay1Gj^fSlQ_2dYw!NV|NU|6&m$FU zPitC?-^ER*ET$ zF1j@@)1#=K5in_ImbRRIq4SvL6^<)nu|ldS26sJDKhhVUjM2BPhU9!MU$p3DK=Uet z3ab#3a#}J>8`2CjqNtKE<8U`3bwkN8ZcI^AE^RnlOr=wKi&4fkuX9p7PWE4M!(rT; znj~*2q7o;LFzo1X7&f`B&#_!KZ85=V%@k*(&y0X_Wg}tKJDPWS&%IaK-2MKx#s)Jv zTN;~YMl;KtG8O`Zz`~?`G}9D+}U|MUtZoHF8@Sxo(t|Dk!E$#-5ov9xXLBXr{M(X znOrWDva`k!uDzo9jH~WoG_J0@i_sQ!&Al1DyC!AIa8^*Gs@X-YEZlnDE6@Ab526RC zGg{BXMjxTU=%YMl^dOHLJw&6?Cpc`hi6@OV(;{kxlWSClQ1+~rVQgEI4Pyf5sgw`= zmS_lQA8+^R_@0Ln4Q=fK&wJcy`-QIWs1K+5BUP^Uy4pAQ0Z9$i8UC0g)V3Rv-I6uMfX zt3GQ1mpyjg;o8(~K6ihp$}N1sm(rRv$5(tU4TrzJ5mrHz`>eCU4moAH9dlapq8XK& cH7c))QJHb0GN49f(u~T$NTT9~d{?mf0M{4%T>t<8 delta 1032 zcmY+DNlz3(7>1vMu?O060Tf4ZU)Tf@#a&SrkwI|*#SNE1S=4bF1ypdseOF@oq<7N? z4<1a~jwD8}p1kO9@CSHx`MS(xB%Sorc~bROeN|uoEclaefBF64BT&uQ3;VkpQ|0d* zRg|@Cxn>!~HkDLGS)rJAHgPFYl}x01s~VDtfdS1*s@=EQv2Ck0C6q>4qnMf*R6jh} zZBxTK&3ZN{a=S!yB$7kjitN&|dK<+i&1SZ^(Ma*etrJ#g?{h8=+SF2~si#3<4}>N& zy*-@1UDL!4w>MIv;_g_aaCtL3HM?k4VJs3~97b3A8@v@F6 z?Gv`W%SrXxv~fVw!9m$}QbcCmmN4nC<_Jd>QArBNyLpjW@s=>_*n}#Yl1@UZ=;Vav zBnhdaCp4L~rZDZ4<}`9BIg%F62zOT36sGkmre_Yc(HZJW%8~YPMst>Pipi&q%H%bM zdFM4L9QVhhQgy-2vtl{@$Yl*OPsHUM9ZYagyDMl+6g&H8-eM z=&paxED%QD)ZF5>`^G9$cinGRiMr$dvObQYa+%6>LgtZgSilU!nG_n%B4#+7Ifg~d zHJrzM!v!ofT*P9-B`g)%VGkNghe?y>N~e{{Mxx^Sh{yw9N6U)>%6C`#RJ>wJc~M1W zz$%aNiqF)%BwxfQYJAoPZ1i|7wl-~ReYOQOdW?x}PTOXmmVn(J!(!Xgw#{dMz#)%Q zVms5e)93h}fG&?#(LHJ1L8jmsx3AzxtDXUw!pg+vh^4W&OG5xz=8Lopbj6C3)W%?bxOL zJpjhw$32=u$rEsUeH8`sDw``u*HzZnjLxmAY--B%XJ>>%V1kY)I5qCwtRo#R0kx(& zSh{pkwT4V&sc`DZ#x0bmOc0Z(Me&Qtv{M;lE5I}rg>*rQ9y|pB0ef&^NwBfDzDC6z z0xmjeb;W5YMy#YR)o~*N8m8lJ6=ec(^piD;rdq@8MJN{->&>SgYYYXg@q;P^M4|-V zqvKxOM{U-0TP0?zm__HU9;FJ^bjg|nLrTA6Mj%R3q-Z~vGVLc_;vuqo6yv*IX zc2DGHwka_4A!HmvCQWkWB(omg{$HSpS3nc{K)W0{N-l1ti;h58 zUSKcsXh>vw(rvh%BMn3x^5J2^AskgVV|$T+p*#|pLM@T;Vk&KjOlvK|NS2lTY3F*Ds<6~lqh}+md;E^f5EhpySvwG$&<4%#2*|PDNJt6c!LpSWkzn++U;f$e zYzd*2#z*D0K8h8LX9ldqV;px7Thn016?nYglDs}kHg}`BJQB+~@q}pwoA9(FQN}RX znP|P& zZeptIApZ#rp^b6}*A0~kadE>Oyn-!k*JQ++2`OlmJvuqqUA`Rc*vf0Ka^f1F^)_tB zPVDNtbZ;`ApLoC3Z<$uN@IGm^hp+701;!EBl>^wbyBi(lexnob6|&V`lp38@u@C#r z0}Mkq-e;C8H_y|1^Mpk{TILe6K=4<-jDPd9lLxNlKS)QT(*|6_PXk@<(OhxpCpPNBFou=fkF^%{-PbA&I4YQYf#rE8t1lhhucsRUCbaUzb1_SH92j1@BZj zy9UZ}$9qq~!7D=6jy_$pxV12ogWdb`Z}*PV3U_M8X$Fg{Omg%;&u?(14_?J!33oF5 tTM5?`GZh>d!rUpS$AD|FWRx;^x5s*8RFt8d zdt;^zT1ue-CzjC?a$-3xsUopT#T>pW=2u5OR?Aq$BMzUm2y1wgV~DdJ4+_|axZz0C z)-%|$sa8E2#O6l+yJN@TdOW5g9$OgffxOiDg5wheh$k7w2lDtBIguZi2RoWnJdLgV zvYegtjEY*+iMF_k6bup8P8H8$7oXzH8rQ614|WlGQgl{060WN(o3W-WTobLVjtGTU zI`KRyl@eW6SG{_rNvDeMcdlSBbDwJjdzDY6=WBeKYZQBfZ*z@ddHjkzlwWb_-nUh} zgOLm>K^Ik4L`tLebzvF%d9E_d{vLzQ|4?*AK|2nLp5Esz%0#IhP5iu4l=Oj$DHtbS zHVeids<^G!-N|RhZgrhd@dn+_$iWVz3)4X6QB2|uT26qN zP{_@}IoE=7tl(d?9BC@1@wB*5%=FMfOy^~BnYlADi_&jF5@y2>8wOJ~)vOtS56R>) zaUiV{B3AH;B@)97j52ULzZ93zFb5-hBbW>cc8aLIj&TOS-xgyKD`t3 zigkC1frZ7o!0NY9ZkVbzho+wZ)A#=F_{|u3iqh*BRJQ+|Jhx$Zgn!hY5i&uo;cS zra#FjIM~R3q)(_BmQXESs4t1b#tuAc3PjR8uBC`7I_dRPC$@=oyD9btEnt>6u%jT< z-HMTVNHU4oNwfjFNiLM{@8w1^g^1hFx|V7s?KYEi-TfSq{fEq(6AiTREd#5}h8WVZ z6s>rH+L(z%OVoxw>)N?#>6Mo;yofexc`r$!(3yA%uV5curyUyqKH1+iWnWM4h3tMh z;BV#YJ#b1#@b3ODw3h^RX9o@xknRTG9G|hU1DyonMGOw%Fu`0a?6(Tr#Ap*36SoIF z#cce&0EyaV6|nG+aE~XW=s)oZkuIoz!|lEi_b6}kWEB1%+>daqPnhE-?-ugKIE^5> z9~X$(@Pzznhwv#6B+QLJO@qrwi4=T+FDX(c1!{Ox!l1xuX!M4Oi^yWSgjO3NX(aKP zza&1%&m>Hkbe59YbwX;^fG~W6b5?peC5v=7rGG2Z6-hdQ^E}s^o_iJ-Zpe4{eF(bW Y=sVcNurQS=1Rh)EF5UlNcE!CLd%Io_wE$b#oKzZ)Qfd&2^kCjEn}Go4InC7($?K|==5tP_a&O!1tFBuL>yk-Q`0afHICL5%TNF%tTlC{c@hRYX5&aM6_ zR(=&`tl$SDnyLN2v#B$}Yi2H8r+JBm(m;a)z&VAq;T?j`8 diff --git a/libjava/classpath/lib/java/nio/charset/spi/CharsetProvider.class b/libjava/classpath/lib/java/nio/charset/spi/CharsetProvider.class index cdf4cbb912a02df720d899139e2ab89488812856..2b9736833732968fd4e2cff762395dd3325aeb7d 100644 GIT binary patch delta 93 zcmdnW_K%J0)W2Q(7#J7~8FV*tX)!5t24|+{C6<&Hr7|)YX=wUnC6*=XmzHGa=zEr= s7A2PC7uigXVv=ICn{3GRQJRrK9jKRyL4$>nL6boX$Yx~F28-wb04SOkUjP6A delta 43 wcmeyzwv~i!Omt(Gs}yJ-tLb@8Y_%{0pM&$MF6W zO+jlzlNIz2G&Myvv}U7pSXmb4rCy3sOgUjA2nuW9Ker@b#-={auUf3Nu09BoUMW1G^j%sj6}`mtk#Z~}o- z#L?q9QK4(z69=(A#&I9`L*S46DYogE%W74;VhnExhoW4y&E20CHxPX_4g+`(qMv0`G_)`Xp$=@5OGW<5PRf5rA zGSJ2ah@FTVz|c73^Vyz{YJbdk`wx#mM(55iC3cfMrET(ba9mL0($3t9?yctz(q{&F ziQbLgvt_@ocf0mY_sIZX6!^9zG~7?DUjl!&78)wsRj6y+-okz@Bd2K!%J7<@tXV3W zV^s6hRA*9))+%ml)n1Fu$`*NTpIp%ef_p{}( zZU(B@I@yRlNp=^IwHv5*4^Zu1pxS*5qRjglB$*E|$S@zAypesX;xV9#;|$!)CxEgi d88nzrGw3j%VK8Do$6&#Hp242^!sK+0A^>%*A#?x$ diff --git a/libjava/classpath/lib/java/util/logging/LogManager.class b/libjava/classpath/lib/java/util/logging/LogManager.class index 7f93b8af931f706f1fad1414fc3a806ddb8ea86b..92da8e3a249b735b445851d5f7247296e3318fd3 100644 GIT binary patch literal 13496 zcmb7K34B!5x&OX%C%Kc!4P;>(HYb2WcH9sW7DHr-CIJCS5h)JIO)@Z=o zwQ5zYV70atV_VxIY6zunt%60Z-L#w5R=ZeV`?{!4t=s#5=iZsQ0|Wg%`2BM4J_Vr?Ty5G8`|Q%?crFs*G`z^V=C1vqG8Oe z*tFU1N-)}DjZ9#4MzuU zKNT@em1XsUvff46nA$O5F92S_&lJG0O956pP>(|)FciB$7Te(%Q)T|;0vN<%33iyW z!%ifbMtfGbhX*iMv^vro3#SGXHq%A9v-6!#EeV%D&q%`VY3Q`WTUOaUcEXNz+3xbA z2?ye)h4>FP2NLlCJCTampk$l}*UHQ|Rv80bn4acLZvq3!26ui(OCOYCuO1v2h$m85 zTH4;+(Y$QQs*NjGtysBa)tYsFn!pr1M%?xNj(Wj=%ZiSrt;;+cCgsyleOElz6X~t* ziiVRQrVO8{L_E6EPV`5T$w(Y>KiNaSs}M0Hk$ZL-X!OtTibi6Q)IxAJt73ASx;CF<%jmSR4>?0GHEtbNK<7Vi&_;_!(P#)O)fa&RN_y=Sgq!h^(5$Nb z;&)dx35-P+1*kZHw`PkL(*mYZ{oyTk7LH7vW6=^i2~#3X@6>y(5{j`?CgX(YbUUd=dnvt(55$FZXE$9IGY4-)>O{tpNV6gdI-VtvYseK_RVq zV0b{Zh-Ef;2J)bBtGMzaGTti|8Wys7V``#^-@$Z?&TqZKR6@@~?TO;r~LXtU^jOHLMW zbS?nV2)bPpegMtI*dDJBcA#(i;@Hd z`lA^{(;Wqz5D%oDu>0d%?fldV6TpE(0SjYTWJ@T+m{T6qli~|!yk-`={AeLBolSvuB!=f+KoiLW3NUXaV*)*w*WzLDLHJ`sYhAd2;CX9T|qPu91B-KI4aIQC| zxa>MWydumaRZ-@UMfcFx;YmX(*DP^G!KS+rr`v}$bOx zuza&xt6F9H8H;{I&x$q&Hzl>u{F0KcIZO?m-wH5)t9vljhU+}szlw<8|y zq~BTedwLm#C<^pMD%lxHAvxsus!P2jf}QjSi~dM|0{u}t)+Tz0Kv^w+R6WRf;@hO=i3+EJi*`9^P?(dccVn>Ev6V$5f9~$w>tvr-Yoc6sIP) zUY&O$(Vg%l0&2yFv_6DngzI3AZ7qon_KVdad4qzw-HMsb1! zr~r@RQj<~Bj?Finw787R;dyozJ5z%zFCAX9u+oW759g9wkgySIVd9wrBx&-voRqlQ z?ix%)Qads$Ovb6nL$n)Oa7+vEcwLY4B#X+a0#40SES}0pV1+uCLUe3xZVW-h4)-G^r6nU3VGJ4AnE-ufGR?=+7+A+y>;sDR#1;}cQ zGikxB^^2?4ntXOTg96@C2*?YH7lBD)Zb9|S=ZMA~g&oBfN>E1&k0=ofdzDi?GSn><%3Tiuppm$mI1o{^{{8i#JFvDVAKaBx?7g{t+2( zwD@94);^@eesPypKX*aoY3-VfbC&K%I6WsP!K{gIv15^sp*rDiF`#blvp6DfiUhu% zHW{Z7&rYNO-K}zMLfom};uyzabvQk^!#J>dW5!XNJ3)n$TNdg9#LrhiikrgS zAzd?tX8QRm87D3K||??r&=w%Q_pXeKGcC_U^)VQa8SwJu`oGxA4=p~x-wp6n{EW#@Bh+MFU$bZNkK81& zE#1kJ#Xq+AC(<7XM3SCiy4vKQql1=(v1%}uiuBtV;RN`3{-w#k$dRK1Ar;XDYG$d$ zzmoJ3fDGEvQovJGU_U5y#z@!VbAv=kb0`ih5;@oJP4={Z6DgKwmuk#!5z(}$gR|B|9 zK}K4dh-2#*ujy$~qQmIt|Anc>;;B$L7K*s--cYbQW81??H}CSJcnb7EA)v8Yfu-Oo}A=#+sn_y3D7 z7kB|;0j^KBz@9^PA`wrR%0%?dx(qHdWO9kjAx&z=oh;^)J2uHAPW_IcJ;B3+cONW~ zCDC}Mvs56M^(TA%suT+}1+LPx1IBt$zbG8rN@s>}N^$PNxcBN)VL*$YRk<`MGAD2CU!E!PEp@7; zPE$BlnLTm0G+B_xoG$d}%?rUxk{$;|XR5PIH3#%$Ey%OQQgemaF$khg&)+kL@Z`bc zvZxz74kvCUcMKm+ZfR0-ELa5Y{;K`Nj^e3|%Ci06NK{o*J<#LyY=R_Lk**_lNLC^O@eB;^?>!twqR5}TeLilPVAN~@J zI!Kl4%BS;wI{AL8x(_3YYVfyQ=8Z{IXiO#(&l2jVT0Kjc!M&slXFa~qpQkC+`>C$_ zAT_Kj2dq;cq%-g_XWf39`ykEBf}IG`h;GBCTfz3NV1E~t(d{7d4h`ONfKihcL6uyK zxri3&8KR1PwD2%lBXsutv~Yx4@VQshm7$vU0Lc)fcMs(DjSSTRxrcOt^+EOuyF%sT zM`-DJ)#WTNZI2SS)f}ecgT$bGWm`=avP1ZNfP6nl+XwkP0J%R1i4JQF;{dM^vOZrk zSdJUiRagh3kSk6X>rF1!h7nqQ-afiuAFUsza5dhB$?hzlI6{$fLmq9Kit1sC4w0|( zK5U;x)l^4uS2^`sIuAjL4?{7JzziM->L(z@Lm=pJtUf}g&{Np)4As+5G6eddS|N+D zqJ%D?1Rz(+Rg_EMxqvTX8C5e(gPqk6&>48yk=5QPZL+_H=3c=57c+3N!_}C)T}qc} zxVVUN;kLSPOKJ{Lu?zN!qrtukcK!mbz2*U1k^x(i0gGEj2dvrxLIOnG4l1u|2i$qJ z2k06_kJ7arb%$tt-7tOb5EU5r%2eF}x?WLd?I9|yEx&P?Zr)8MB)q%2W+hv~^V{;_^_7nKGJjj{e=db+W2h)nD*3>F-w zl3-!b1Wmg>JWvxX5TgLa2k6I42MA?qqko7t%23dMfPO854wvBXQCizr6f8PKi-JWp zd$6JiGzWcffg!4ukE?2j>80KBIVJu1$}s)8wEoL7hOOZ18v++~-0lx=_uZRurd#M_ z2zL|}a4A)A8I4C1XDW}O5C^G-r_fxUO7l5HEnJEA#5CH-)5+#KT;SHDSB1Mso=qR; z)97|So$lr{=w3dP4)9s@5XPV8dGu3mray8Ez0K#)2i$@}UtU0#e zE^3=H*1U_B*2>^ZyJ$h}SQrCTbSIsb)_RV@3xkC)?_gog-J-)$4lEd2qfbz1Mcxwh zWrJ6TBn<8aS$z~huWK}KrgDx`kOycI+EI<1qGsNTpImIC4&IKRAnc$`d?{|TFT=s+ za@-DINuTGd=nGhT8(*U}a1mqz38XcExAz!LojROMWFM{D+FofMO-P_Rqyj>F>a)4zBuha&E`VFB=3`Vh}C`m+mgz?KYkmKhf zJWDa7U``=C8?iz%Uuj0uk8<${mt@5*S)JI)Ku%&Sb+J}TKNOJ0U_bIFj}?eq0?H&S z_v^THkjJmv&%pZMc#&qT^>LsALAG+x4y1L7uY?;hg90=lPhk4)P*o0d8)ut{vvZ zLlo%1b4lGJ^7lT_QA=|nhjS4}`tUzpFrAB%fcOnE`AzuNTlkIH+xV&2TU5*MV)gro zlpoSUWzb?(K+6<<=A(+~Vl|rjR5?Y|Sn5~fD2``Rjn`6Kt_#AHD@Bv~xecCy-w{A+ z?c4!67Q%y^w~J|v`&J8Wt-v~imQe|>#G4Np9ybTa%2Cb3oTN{k23>1wudNy8^Q(t> zO?53S4=k_k7^0uo9pH6hZ##$iqm8~=kyaR)t>Cc4pJ8My3>Q@JCdrC7@1nB~a`(Dm z!G7+MELRyU9Om9eGiX-u=AcjNEZ*Gchxs9Jaa3jpc7OO{(1*my$z6z(K0^S#Qd-!p z6J@n5*(v}IQyH=>Z*MfKC12W|j7VBA!aF2GPHQZ3^nW>$uw>DPD)>q_6&H>0)j>ZD zC1^^t41=LhO1`UtZ=J!+!~7X3vmQnf^(21|!j)?BI+_mcotZ|g3G+h*Ygc9f!Xu}{(?4vxpa_k#9IMvpenwJZ^nBsqT)_G zP1=e?cMGDW9|>+X--@w9)XwK=7d0W1GZ95E#_SRNd~r7-X%S2czr2IILXeV}q7;qg z)erE*LuAPVMih49u_H-cI4YY=)kCGKPjez}FXs%W)R#9&+-Mp|TiAuY%7r}&6*G+T zjuHOyy`7Wp#jKoiQw$c4WR`z4eFt0#@{ zJ#&0xeUraJMPq$a?xMm;@|mrM^npm-3Ko!3)NUH5ZqsPaZ~$b`1YI-$iqQYIW-`d% z#G3(8m-D@N^MQzO@wZ(fE^wJF%P{$!VSXUPX9+0J<@4J#O6{f5YM+PCvJ3%byay*R z@F_o9aZy|W6bAU5?4ppgk(KF=y)}C~an=!ij04%{q7a&(pN@3(*+(5Fzj_kV{UME4 zPf<`k13!3HQ{ZIO$vgu6$-l`E!Nr<_GHrDVzYIp})}`fUP$F4wHcoD$Q=#SL+7Uju zw?o{wIvu$mf$Ji(N%XFR_kupL@=_|}$3Ut0r$g88LDwsw>re2{SE*dRM)m4%nl2|1 z&Cbv@8 zWE+JPG4QKPqnHMa5=t1O=}M!Ft~M&P44pFXx{M63mXVQsA7wyBm74vyYHi_Vg5_@ z#OQPIFaA6K16U@?4}I|rA$Er0u;TNB+)<5$fLaTcgB0vA z!Hybe@SnTLFWTN)ix!5|6K^7)AfmaN9pSfzXdbd)bp`($>5ShSqH5>!L-%u%eBxap z(2Uko%BQDLqWVz{hwy{w#}Gst^;5pvpgj4Or+lx6QsrBo^4+Tn^|w47CF^RNZ~)3Q1d z+)YEu+E+WGX7BABQD>yzK`uH62(LLo+qfRCdjpjjH$gBvDQJ9= zrWm(sfjHWl;ifZ$63{YFL#a@WstHV2srf41$eXW)Ks08bLRYZlpgMcqezo|1wGiLg mgP1NqjIW`Yxra)P=QJJ>o>DFP?>TA-p17$|XXA-dO0rTBTOOYVEFVZEb5?Te~l|R%_Mof9`uT^8x{XA3uJ1@7?9x zv;5C;@13XL{>r07bf!ArB*k>vmhkp){a`8*t&hfgdn2*l`j&WaYd99}wG$@!n2Pm? zXc#?fH*c}KQcPtnYgesmZd-ME>&44gG`3yd*4Vm&sk9|Ga(yZRQj3_1n&Po!DjZ8~ z3`YlTKNT=dmtl3XWSzTYLu%)My#(vZ`b+^dyBuJ&L-iyaVueDN$Z|UzW2zW?xDW=j z7=jt5%&-$lrtzN9t>FRm1qKrF0Xvb3*yx_*>0Xy@$0%c<3*9rE?#-Z@tatl&HuXVM z_WHqrfp{W?p~bC@ZH=o|v|qlieeJpx?HfA%G>IvAf)48X9i4-zrnPM=n^$=z1jkZZ zT~|ET6X~t%iiVS5rUaj zKumKjno85eHj$X!HrT(}PHYHoj@kmScvm>OF`S6Vw{8rOK{c{kxk+_QAUT#h5*kY^3Q%DHZ_6w?pJ0n|{o$>4j*fIKx2TEA(IwjScCDaQCanZG zdSiq28V3X6RA2r2oynBlp98E#tEm}|0tPcEWjezvy=xMeVXu{B{R=E=p;oNlm9WDp zyIDJQ7Yx!o1`Ur{n*^DQJPl(kRW#az^o+`lB2%|THuW$SguA<8TQJ2`KISCdxv27z z0QHI8BcnpIV{;+6)uO1Nr3A+6M)XCD7)*py2nZ%2CX{J8Bk}s?wJUaX*#pwSWI4e^ z2FAgFHKI zi;(j~kh?AV9DQDr>L7Huz#CIsaUCM>qE#{Gy%ya^LvSVubz$fd1W(JDbF>R)nAkuM zSo8(@Urd76W+t7|0|Da=^hJxlL|=Ab?E3n&u~*X0ZqkF97^CHIV6}WO679Bu!#(tn zMGw;>z~Oc&l-435WPIvma=XY3&;dFmDQ);Tn`WZzMn8Q8cCU*HBQpA{7JZE#MN@cS zz>ak@)p~WFndVXYC}t7q4$u*czAj$lPsN>1!N)f&dV-z=^q_sMl8pZ`tsG;8v7q4u z#*_AlqK;Yg6n#_bzHliQKm%ayGY_)f;7auMeWkfVBDx@FKb0+<8l>$xRNqPL3SZqrzq07p^c(OW zwPU?96a}2t!*4D69le5%uD)=h5rT<^nuL`w;2HmRf;@hOt!r%EFkyG!&AfUNh&$1Ah2L|vQS544UU4rir8Sk00enaG}Wo*m|t) zq{S8&0rYl`8dJT?s*Y?qTA7@qo4w0JlL;G94(Q6}{-ntzqq5O@yK68JN$t#zFu80L z)2>%zhZNvaT?+Fgi;AfP{=`!(4)RpMLWeOZW6CIHc$h5Ye0mOejtvB zIFsihlWASY>{R_l?JWVGLx=E(t1YhKS||xS!5CtN9qvc$&d4F9Qw*uf=~(3FdZxwL z^mRwEr3@|6TaeMLq6kaIqxNcNOehozII(z%)Rdus$!BKv;h?>IXUc9&B*HsAi@?$O zEQ`-(Y)GVRk}*)NZ*JwLW4f8qiw_1$jyFLI_FB*m*=5 z8@?$nhK>^pwHlw#%S~?dmW(;ME!JC-ysl_GX`8$vGfF3`EOfx5SOd6?{jn zB;pVZhA7)@_k;(dDW`S?#<<1eR^inbjfcC1`L!0017y&3p~dZ-he@twcWNIj=^uU8;$lL;-)nInqo@y{%yyfxv-5hm z#Aj^X>)l?dr?J>pi=z_GixAFR;|W`@hk9)f$1ILZD)A%9>qH`|+h(z1Ll)c?pi4Mq z@gSob&qI_>g2z*o0;B6EovHndSYEg}+#S-zMQDznuR?I2BMZIH;%j&plzC-1fgMKG z7-7|uS~m10;#bPH9#V<*-f!`>BGq_TD%VPotCl}t@dx=s$fiA!#Bnt~)524)bMlH3 zctJHiLq`OS;%3C=-f*-r(Te~cOL;(D6tl0)ML~#&;sO3R*^|jUU_**9FaSE%F%hsx zWe|hF>zQ*LoG`D@MV^zkkg#=>89nQGQ~*KJWG9?SdD=2C3XD6;qwteS=O(n~nCGlu z(il3`g z`v+{~@Jz7Mi#Y09)Qs8=6%X_0Exv`Z!}0e=VlEwje|U%cYC!pbj6}~kf^j(J8W46F zOT0_4&*m@iev`2?a1Md=qV8lA>-523G{1t!~NzLT1 zvU|FwSud2We#%V}S7wg9Wbo4#KO-CIKqTpDrrjog8%Iq! z8tsFzRHWa|Dks3-$9r5;XMD^3%-iZ57#s1;Te4@^r(g!g@LDVrH%70ALCW5NlPUhC z#V_%%98b%XlG!uS@=Ot>*E_BoUh*6Mt;sKEGUZr zbDc;jU@wUx&W*NX5yt9I@}DgJGyer17)dtb481od8EIuAj;Ry8(9^2KQJkOu2B^m3 zsZcl;in!;Zp?FV7@bwQ#fUmx5MsmZL2eocXVkzIc0Vb6$)n#e)zw#+*>Gf|G&$PCjJg$0qz;L0?#2kk%%Wu#fZK+ zm%)j@bgqy-q)9Eflf`^;LnN8RsoxQ_r+8%W&I1xz5{;)j#|45}f3nxFWSgZqaE+!N zFxHFuMOm=^oDg=p&QV-z9Y@$3Dd7y{GVN1rTDHONb5n51{%T7MK@6|key2Q6swWVrQEd=d}yQRsJG2nEG$8KHYN16I6`2YM)mNaScLE^lhRIoH22_LGh6L8f2NPYk?BHPX+<-cf7ga-Z z3}^3JDmzIPIDj*7v0Fev%A$-dS3~hiK+QH0MFID5}KYQt3B>ly6KW z6VD>*rz+h`=)uLEOJ@_laDYwaRfnj$YJ_S#OF^st5t@&WvpWybxsT9!IkHp18qsZ- zbSuQY6=Ls&Fn55l&ua3PLyQ(`(JSTN$X#fe?jb5WNQ;k=HB3t%qQ%41h|dF>uPoPe zFBTbs*6xSCzL4cQAQyEmu|DWrVOFSg;xN7Ef~r!Mmo-O-TdI#y;RrD}Z)>T}QFa)A z5R@MRYX_m9hiMW$0$rx{3X?!DADUjP1uVrC<2sB37~~GnU3HJUYW*->c)>whe~>!U zba@rt($v*aI%Sx8OAUFf(OgueY0D7#Iv&LI8CawiCUA^Xr?vAnXz@`P<}sRx1Kg?f zB(!)G3_XF-PtzIn3}!q_b@aU~gFdR(Y!OBjQJe-qxkB!0Tn5*GzNlqfb()eLRS(mA zyj+>H-Z%}_7ht)cVg8F*x|rcwOx||VRhlktYFxU_F5RN)qg3dUec$n9Ux7Hkht>Yz zAzPFsTa+b>Yd43i+6G1fM7$nc?rH_y^J)&$b&8JA4fx+ydz2>Ers*R`DbLt1y|stw zEjpC&LuH+16j&ck$0$alQ-gnq zHcL~`f0%wOjafk<;t|@=P!KFQO3Q);)%ViEU;)?;`rrsdR3jg|YSQ%LKKU%qe7=;X zmy7G}lr~I-X!i^0-!tudXP<9>)}?NNvlEVO^0*kkfGDA*+e4M<3$(bQhmR5AfNzdpU=`%IDD$w0{SuTF-GK z&byoFZGI2?xQX*|C{@BMc^a?c>DGa$j+ zpXp+NBahqYFK|Q!j+fA1>2JX8N-m@REPxY0?7- zpZ}uQ5G-HDh3voSb@JoHvytAw+yeLwuF@R%@ix#0{OE2CKPdR6rEuj2pK)$pHD2xm z8wZXvV!;qaf(6=uM`%xjDHeZ8U@fozk)NAN!-bL5*Zd`(1OE>X#xU5X#R`Ggmh#p4~8AH(B^dH9% zbUVEXwThxXL;rIUf@wB;kJup04RXy7)0<95LL4*U$} zPAx^qp_i3nmIe_@T?91&k;3{u&U4pqz*90`an{C1IDeS^xwRyl6Ytlwoy1n`(yowm zQ2dTd@;UM+TuXBDKe4`KQX<*}9v=n>VRs3yWX-J>Y6-PvJQJ->xGm$^ zPP}a!;W?ePhqyA$Rjosm-@&al$Ec!=>l%C`Jg*ZWo97?mbJ1sw@Ipj-UesDuljg-k z6llY9S?y!;_d)PcLkkex-a}X5cN=}+!%4kskok#UBa{CP&v^sb`47#-vxeWo=yzzb zVp^*5Xt^?Jl`5bPRYX^)66`=GP()3pel>;ScqXxZka}vhuJ=-|rc6k`66nW$IvEIc ztFh`*c&GDr1x;|@YN(oRK#oW<`X^g(i8Ql7NSqGq)v4%s9I~P(|kcyn%k;s z05FKWu5E~ZSbLb)3#|5}`Qip&jc98VvRB?Qi7shmB{b)i@p~on-Mp918{x}3gL#Me z3dv*@!TdCbC8m{echD#06n8iH0kNPz%{|h)W#2n527O45+`pH4f<8kCy;Pjvt&?Gu z3>gpt$EXCEloJhRm4vje4sP%xm2y(D;EaX>$NpC$(MqNqDdU}Px-A&ytAl<3C1_$% zx*P)SmV{Ob7n;vFRO9QUntBwq(o+asj!AE%nXqmJ`P2-u)J!T-vuL84O;gnwbh?^L zGgKALQ`NLU)zT7GN9U_~FztM5S7+0u>KvH&JnDs-x2XlR9b151XuDo5rJL0GbeC$R z`&AQtQLUhd)k+#stLag70X?N!>1nl=ey1*^KdJTfD%Sb0x}5XX6&e;FM12L5WkM0| z9|Z!~JkXnb11e^PpXJEeX>e)SSK_zisSw^XWLp*r

P zLXw+~lqt_9exA0<{tMso+>LJs;VWfpul`Q?>K_zPuR=FSGwOAkrrx0G>P-r%x2Q?I zLn{m>+wf7u$fK=B0Sy?1lrV~Dw=tfsHA=J&-wO{Wx-qN68~Mjthtl>Fyvc_327Uo= z2DEAMPq82LQHVm&>(B7ELchI;w*->R&vo0i`c2vpRxSWk;>Ux?TL|(flTZyv zl?@2CRl|aR+)IA3_JJClK1hx5SL6spDc7>Y{C5;j$ZS<*{7dvO90{u)T#26?-m$OzU3+3n_yJ=mZyC8LLc%iPshl*$}*Zr z87rvBSP2!Zp$WzXbehpZ6-Fy9G1k&D<3egN)>E5t5p6O$=u)GTdW}sm_@$IIoFvf> zj-U)BhLnGU%5V)lsC?Q<6eV2)FGIaA?&3ormp3utrKn;YQ%9r?Rf`YxFpi8Jb<-Mr zONH&Ps%E&;YdIqZ#K?w?lc64MJg0K@>s5slKfi$WS>9AWDj}umzIr0v8eDOmKz9r1 zZhcp}el4N!`?^baFZh-4v_#up6=>U|JWz#jY=C71{^~EiX^18`1Bx)f4O6*bl@n6O zC}V)87~AL^JQv`(5YNR%LNn*Ys3lpUmt=)rq8#SHiWc9{;_q_V>;jYGBQp=G@eU(p zU_|&syiBW!y3j>mT20L{)+%4ku&O%HF|6t`?_jqCo8c*=gSPQ;xbBTqVtf*c z*+W6&(^PKU;<1*qYm$9U2)vx7sg$X+Q4|6F>Rc2{PC>C)D}iXjLA3zKA0w)v^N?En qkXnH6+#X7&eB*AMLw=r$jUVWBM0rXr(SMh!Wq9Ip1%;RVEB!y6YQFIR diff --git a/libjava/java/lang/Object.java b/libjava/java/lang/Object.java index e81a48a..740a7c7 100644 --- a/libjava/java/lang/Object.java +++ b/libjava/java/lang/Object.java @@ -1,5 +1,5 @@ /* java.lang.Object - The universal superclass in Java - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -129,7 +129,7 @@ public class Object * * @return the class of this Object */ - public final native Class getClass(); + public final native Class getClass(); /** * Get a value that represents this Object, as uniquely as diff --git a/libjava/java/lang/reflect/Array.java b/libjava/java/lang/reflect/Array.java index 32bed06..639cc0e 100644 --- a/libjava/java/lang/reflect/Array.java +++ b/libjava/java/lang/reflect/Array.java @@ -1,5 +1,5 @@ /* java.lang.reflect.Array - manipulate arrays by reflection - Copyright (C) 1998, 1999, 2001, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2005, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,7 +104,7 @@ public final class Array * @throws NegativeArraySizeException when length is less than 0 * @throws OutOfMemoryError if memory allocation fails */ - public static native Object newInstance(Class componentType, int length); + public static native Object newInstance(Class componentType, int length); /** * Creates a new multi-dimensioned array. The new array has the same @@ -130,7 +130,7 @@ public final class Array * than 0 * @throws OutOfMemoryError if memory allocation fails */ - public static native Object newInstance(Class elementType, int[] dimensions); + public static native Object newInstance(Class elementType, int[] dimensions); /** * Gets the array length. diff --git a/libjava/java/lang/reflect/Constructor.java b/libjava/java/lang/reflect/Constructor.java index 83aae3b..adebc60 100644 --- a/libjava/java/lang/reflect/Constructor.java +++ b/libjava/java/lang/reflect/Constructor.java @@ -1,5 +1,5 @@ /* java.lang.reflect.Constructor - reflection of Java constructors - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -155,11 +155,11 @@ public final class Constructor extends AccessibleObject * * @return a list of the types of the constructor's parameters */ - public Class[] getParameterTypes () + public Class[] getParameterTypes () { if (parameter_types == null) getType (); - return (Class[]) parameter_types.clone(); + return (Class[]) parameter_types.clone(); } /** @@ -169,11 +169,11 @@ public final class Constructor extends AccessibleObject * * @return a list of the types in the constructor's throws clause */ - public Class[] getExceptionTypes () + public Class[] getExceptionTypes () { if (exception_types == null) getType(); - return (Class[]) exception_types.clone(); + return (Class[]) exception_types.clone(); } /** @@ -305,7 +305,7 @@ public final class Constructor extends AccessibleObject * @throws ExceptionInInitializerError if construction triggered class * initialization, which then failed */ - public native Object newInstance (Object[] args) + public native T newInstance (Object... args) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException; diff --git a/libjava/java/lang/reflect/Method.java b/libjava/java/lang/reflect/Method.java index fc0bf10..6fa2956 100644 --- a/libjava/java/lang/reflect/Method.java +++ b/libjava/java/lang/reflect/Method.java @@ -1,6 +1,6 @@ // Method.java - Represent method of class or interface. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -68,7 +68,7 @@ public final class Method * is a non-inherited member. * @return the class that declared this member */ - public Class getDeclaringClass() + public Class getDeclaringClass() { return declaringClass; } diff --git a/libjava/java/nio/charset/spi/CharsetProvider.java b/libjava/java/nio/charset/spi/CharsetProvider.java index e15153f..d56723c 100644 --- a/libjava/java/nio/charset/spi/CharsetProvider.java +++ b/libjava/java/nio/charset/spi/CharsetProvider.java @@ -1,5 +1,5 @@ /* CharsetProvider.java -- charset service provider interface - Copyright (C) 2002, 2006 Free Software Foundation + Copyright (C) 2002, 2006, 2007 Free Software Foundation This file is part of GNU Classpath. @@ -83,7 +83,7 @@ public abstract class CharsetProvider * @return the iterator * @see Charset#availableCharsets() */ - public abstract Iterator charsets(); + public abstract Iterator charsets(); /** * Returns the named charset, by canonical name or alias. diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java index c1ba87e..aa64316 100644 --- a/libjava/java/text/Collator.java +++ b/libjava/java/text/Collator.java @@ -1,5 +1,5 @@ /* Collator.java -- Perform locale dependent String comparisons. - Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,11 +68,7 @@ import java.util.ResourceBundle; * @author Aaron M. Renn (arenn@urbanophile.com) * @date March 18, 1999 */ -/* Written using "Java Class Libraries", 2nd edition, plus online - * API docs for JDK 1.2 from http://www.javasoft.com. - * Status: Mostly complete, but parts stubbed out. Look for FIXME. - */ -public abstract class Collator implements Comparator, Cloneable +public abstract class Collator implements Comparator, Cloneable { /** * This constant is a strength value which indicates that only primary @@ -292,7 +288,7 @@ public abstract class Collator implements Comparator, Cloneable * specified locale. If no Collator exists for the desired * locale, a Collator for the default locale will be returned. * - * @param loc The desired localed to load a Collator for. + * @param loc The desired locale to load a Collator for. * * @return A Collator for the requested locale */ diff --git a/libjava/java/util/logging/LogManager.java b/libjava/java/util/logging/LogManager.java index b8b31c4..1e0192e 100644 --- a/libjava/java/util/logging/LogManager.java +++ b/libjava/java/util/logging/LogManager.java @@ -1,6 +1,6 @@ /* LogManager.java -- a class for maintaining Loggers and managing configuration properties - Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -129,7 +129,7 @@ public class LogManager * The registered named loggers; maps the name of a Logger to * a WeakReference to it. */ - private Map loggers; + private Map> loggers; /** * The properties for the logging framework which have been @@ -269,7 +269,7 @@ public class LogManager */ name = logger.getName(); - ref = (WeakReference) loggers.get(name); + ref = loggers.get(name); if (ref != null) { if (ref.get() != null) @@ -286,7 +286,7 @@ public class LogManager checkAccess(); Logger parent = findAncestor(logger); - loggers.put(name, new WeakReference(logger)); + loggers.put(name, new WeakReference(logger)); if (parent != logger.getParent()) logger.setParent(parent); @@ -362,15 +362,13 @@ public class LogManager int bestNameLength = 0; Logger cand; - String candName; int candNameLength; if (child == Logger.root) return null; - for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();) + for (String candName : loggers.keySet()) { - candName = (String) iter.next(); candNameLength = candName.length(); if (candNameLength > bestNameLength @@ -378,7 +376,7 @@ public class LogManager && childName.startsWith(candName) && childName.charAt(candNameLength) == '.') { - cand = (Logger) ((WeakReference) loggers.get(candName)).get(); + cand = loggers.get(candName).get(); if ((cand == null) || (cand == child)) continue; @@ -403,14 +401,14 @@ public class LogManager */ public synchronized Logger getLogger(String name) { - WeakReference ref; + WeakReference ref; /* Throw a NullPointerException if name is null. */ name.getClass(); - ref = (WeakReference) loggers.get(name); + ref = loggers.get(name); if (ref != null) - return (Logger) ref.get(); + return ref.get(); else return null; } @@ -423,7 +421,7 @@ public class LogManager * @return an Enumeration with the names of the currently * registered Loggers. */ - public synchronized Enumeration getLoggerNames() + public synchronized Enumeration getLoggerNames() { return Collections.enumeration(loggers.keySet()); } @@ -446,16 +444,16 @@ public class LogManager properties = new Properties(); - Iterator iter = loggers.values().iterator(); + Iterator> iter = loggers.values().iterator(); while (iter.hasNext()) { - WeakReference ref; + WeakReference ref; Logger logger; - ref = (WeakReference) iter.next(); + ref = iter.next(); if (ref != null) { - logger = (Logger) ref.get(); + logger = ref.get(); if (logger == null) iter.remove(); @@ -710,7 +708,11 @@ public class LogManager { try { - return Level.parse(getLogManager().getProperty(propertyName)); + String value = getLogManager().getProperty(propertyName); + if (value != null) + return Level.parse(getLogManager().getProperty(propertyName)); + else + return defaultValue; } catch (Exception ex) { -- 2.7.4