From 32fccd359a00bcfcfef4c9ab4a08eb722aee13b7 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 14 Feb 2006 14:06:36 +0000
Subject: [PATCH] Bugette: annotation value of primitive type 'char' wasnt
 working !

---
 .../annotation/SimpleElementValue.java        |   2 +-
 .../testdata/ComplexAnnotatedClass.java       |   2 +-
 bcel-builder/testdata/testcode.jar            | Bin 17736 -> 17737 bytes
 ...RuntimeVisibleAnnotationAttributeTest.java |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
index 71eed6a1b..7f1affe33 100644
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
@@ -133,7 +133,7 @@ public class SimpleElementValue extends ElementValue {
     		return Integer.toString(b.getBytes());
     	  case PRIMITIVE_CHAR:
     		ConstantInteger ch = (ConstantInteger)cpool.getConstant(idx,Constants.CONSTANT_Integer);
-    		return Integer.toString(ch.getBytes());
+    		return new Character((char)ch.getBytes()).toString();
     	  case PRIMITIVE_BOOLEAN:
     		ConstantInteger bo = (ConstantInteger)cpool.getConstant(idx,Constants.CONSTANT_Integer);
     		if (bo.getBytes() == 0) return "false";
diff --git a/bcel-builder/testdata/ComplexAnnotatedClass.java b/bcel-builder/testdata/ComplexAnnotatedClass.java
index 155e531d0..1e6214a4a 100644
--- a/bcel-builder/testdata/ComplexAnnotatedClass.java
+++ b/bcel-builder/testdata/ComplexAnnotatedClass.java
@@ -1,3 +1,3 @@
-@ComplexAnnotation(ival=4,bval=2,cval=5,fval=3.0f,dval=33.4,zval=false,jval=56,sval=99)
+@ComplexAnnotation(ival=4,bval=2,cval='5',fval=3.0f,dval=33.4,zval=false,jval=56,sval=99)
 public class ComplexAnnotatedClass {
 }
diff --git a/bcel-builder/testdata/testcode.jar b/bcel-builder/testdata/testcode.jar
index 6bac0c9fb2eeb0259d2ee8c2560b7daedcbcecfa..985cd3884ada096737831517ab3cdd1e7bd1ca5c 100644
GIT binary patch
delta 1448
zcmX@n#dxxdkuSiTnT3mifq{d8&)L&tBcCoK3y87Vp3x4<YGiVUvd%EeFhOMBu-Ze#
z^x6HPtR@a;DC;CAFO+qQiwDYj#mxt0{o$#BvTFF8psYju%23uzfdVKiR%jQLB`snC
zWd(~~g|c+S+o7!O5=@LjAUE5ToSW#v$iVOph@}}O^E$}Z=lVN(GdW7sE`A-AmN_dj
zY|7PzRvLni0Y|R21$a2NvFC5z9o)NS^TTyQe^<W{D0#vDW$~i?YqqV$6`$|@zGt)V
z=g+^t*a|xC%3NBJzH#nRzUE4`sXgZ;FIE4JWjoAgb1)#oTQ$#}*_}sz$K%PtS?qe>
zch_ia_484#nx^QyHMgF<Sv-DEoQ9~2jnKTepABqMPn0%YydbK(^77V|E8XVzTONM(
z*Tc0)VVBXAD|1s)7OdF+XZ`$`S7uLU{LcI}$?=Y7Mc0nmACe#SAK^XC)KPuJ_w+A|
zOYL8xCtcob_mM~Kc}vNRGk0uwQY5s3%hNSpy`60r?tj*Lx&9rF(j@}hgF<vK_jCFN
zosD3g+3dfee6QA~mb9E@2F^3)vlw*8yg7Sx#&Mgwyt8xzRu%LriRlMA-8?3wrK_{J
zs#Ww#Rm9<6yk;A29=s-xnnpHTO4~q#zEZ{#%GxG76Ph%F71SYOlj{_pfK$ulG^J0F
zWD}$OoEgG$SJ#B<EYW~P{cKG+sMubuIZ)GLb>Bn90`wc9Vpk1eN$I(f2UOPBgb^xh
zVRjEHCS{QdWi?weLs*l$tn46eI%8!IVenf!Kp4T+&Je~dYj+6askJ|ZVPWG2VKl)Q
zXKY*{BBHiX#R;}95Rnxy#s?U~!p;dIRcGf3VVt&u8YpV-0TD^Ghl;GWcjAPn=E>je
zp{}!XkmA;nW?*p6&n?JFt(bh#UIwDE-a(2nXYwou6?u@ZY=J8>`AiH9*(?kU0>Eqy
z14|lLPQL3P57sitQHs%Rva}<FH`&fnim6a>a*v|K<a`Gnuqlj}?l0a6)M^UMN%Alw
zfb^2a$jNgZ^&l3X2O8r)`IVz4M9az2*<XQ5GJ#s8P_$T0HgeL0Xo+`{VoaZ0<)jMM
z(p)7i{28dU0;ok0MN8l0eNGBsH9d##n->B7lYrr$4U_*mL4Ba$EX5cw+1go40Tcw{
z^X)G90ks$bwMe2E>#RRHPG5TR0%snGb2b3=otS*uSsTLr1?1kEEb1Z;HpW@TQTGba
zWem&=48kbJsF_T5G!dPg=>iF?E@lyvjX;I}fp(%Q)Sf)WMG0c|E*B|oUJC|>u*9Oo
oqV(d)8?D5lmbyqWm03=nXelEW;LXYgvPc~WcL2-eYAX;A0M2-;MgRZ+

delta 1403
zcmX@v#dxBNkuSiTnT3mifq{czrca9TMm}9e77$~zJ)<3z)yU)yWu0M`VS>oMVYP>f
z>9hMoSxp?yP}WIKUMTAp7Y~&6iklD0`omKLW!3OGL0O0Rm7%Pc0tHZ3tk5nfOIpMP
z$_f^}3T5etw?kRmC72k6KyJ?Ymv_;bk%8eI5KA*m=5vs(&-Fj(cgR6xPHT`zpn!{r
zX;)PMzrf?8F3GD*RiqYmO7Pv=mU>n7?X?TjB>tbOF!=a@{YT)j?Mu}U%cZ41JL`Av
z-=Df#W{V?vjFBdvZ=6eRKWH=6%PpPf=H9<{&57*H2LoPtspci!7hGKZuHs3^uEx`Q
z?c_bz24C)&mwF=L{jK`O|BpJa7cXt<a8F98w&C%Y;M%Jow{wwl=`KUlt5Tl~(<AnF
zhpN<GoW5|$I}>GQ*S}Zm|2_%Yu6X>;=}Xgj9{HUzK5}=;^A39<a~*C4JB7TcYsV+r
zExCVb&OF}E=LVL?mmDs6CYJbO(XA_YB~MlT-gf+I@b7DqT;@)~k}7LMP6vNUcA6Yw
zeR0dxgX%YS$B9-t85<hUP}K2bn&GPW@tKfL(!6(KXT>x^cR5LRi?3LamCU)7Z(88~
zBV1Da5r==7nr*mw_?kRw64`7eZ37MYDj7>y9LUauri>5;b%@yHdc`N;#4<Tu=@TT?
z#40~$hOj);HK967HDED6M^g?ewohvg)U-I=_fWAw{YI$RHA7fRdST=Nl{GP8gvwf)
z-GhorTcko+Etbp>*5qz0JBXXkTG>Mw0@e-?Mu@dDgfZLN9m05K?GIsC+PFa&%`nDU
z8&`;km@QOsqOA)=WF?I85yr5zbAm|K+j&A5XY8N`irITWM3U^GB5UlOIN^zT@^^cv
z>#QB57_}#dIjBLDHvqZWlV>}q$b-~o3tW-OXJTN;W?^6u0On;FSkky+@;wK6h!#di
zDMr`HGLBHLy`vOUf#T#|MTyA;4m@CE7%$ylyc4L`6qtYHVP*j7C5;i2=Q-*@jJW_b
z#&7a#M@@*9lclr20+nO}wMe08v7Bt|qzTcI;3UPEHo4kK6|AMXN?Q0cP-z8Fiy(@Y
z-pTu&6u@eF4&OH~0(vL`!$a#Q|8s)+K+#!>(SNdyvlhgbEN3YuC;iFs`qBac-i%Bl
z%!pEL@<yQ2<CD)gYeSU&26Ass7ITpYTjng|sCxzI7zSnr24NHjsZI`YQG#fxa*<-x
znmiT8-R&a9&11p95SCb!Sd?BoS;0XZYP5?KN2w)HBDJV;a-EZe2rC=NNOd6G0d!E6
H6^I7_fY{YR

diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
index 644c3e8da..7a1925dde 100644
--- a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
@@ -202,7 +202,7 @@ public class RuntimeVisibleAnnotationAttributeTest extends BcelTestCase {
 		checkValue(ann,"dval","33.4");
 		checkValue(ann,"sval","99");
 		checkValue(ann,"bval","2");
-		checkValue(ann,"cval","5");
+		checkValue(ann,"cval",new Character('5').toString());
 		checkValue(ann,"zval","false");
 		
 	}
-- 
2.39.5