Author: tcurdt
Date: Tue Aug 15 18:14:25 2006
New Revision: 431754
URL: http://svn.apache.org/viewvc?rev=431754&view=rev
Log:
GSoC: latest changes from Dmitriy Khayredinov
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
(original)
+++
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
Tue Aug 15 18:14:25 2006
@@ -5,8 +5,10 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.bcel.classfile.AnnotationElementValue;
import org.apache.bcel.classfile.AnnotationEntry;
import org.apache.bcel.classfile.ArrayElementValue;
+import org.apache.bcel.classfile.ClassElementValue;
import org.apache.bcel.classfile.ElementValue;
import org.apache.bcel.classfile.EnumElementValue;
import org.apache.bcel.classfile.SimpleElementValue;
@@ -104,15 +106,17 @@
case '@': // Annotation
// TODO: isRuntimeVisible ??????????
// FIXME
- return new AnnotationElementValueGen(ANNOTATION, new
AnnotationEntryGen(AnnotationEntry.read(
- dis, cpGen.getConstantPool(), true),
cpGen, false), cpGen);
+ return new AnnotationElementValueGen(ANNOTATION,
+ new
AnnotationEntryGen(AnnotationEntry.read(dis, cpGen
+ .getConstantPool(),
true), cpGen, false), cpGen);
case '[': // Array
int numArrayVals = dis.readUnsignedShort();
List arrayVals = new ArrayList();
ElementValue[] evalues = new ElementValue[numArrayVals];
for (int j = 0; j < numArrayVals; j++)
{
- evalues[j] = ElementValue.readElementValue(dis,
cpGen.getConstantPool());
+ evalues[j] = ElementValue.readElementValue(dis,
cpGen
+ .getConstantPool());
}
return new ArrayElementValueGen(ARRAY, evalues, cpGen);
default:
@@ -149,15 +153,15 @@
case 'e': // Enum constant
return new EnumElementValueGen((EnumElementValue)
value, cpool,
copyPoolEntries);
- // case '@': // Annotation
- // return new AnnotationElementValueGen(
- // (AnnotationElementValue) value, cpool,
copyPoolEntries);
- // case '[': // Array
- // return new ArrayElementValueGen((ArrayElementValue)
value, cpool,
- // copyPoolEntries);
- // case 'c': // Class
- // return new ClassElementValueGen((ClassElementValue)
value, cpool,
- // copyPoolEntries);
+ case '@': // Annotation
+ return new AnnotationElementValueGen(
+ (AnnotationElementValue) value, cpool,
copyPoolEntries);
+ case '[': // Array
+ return new ArrayElementValueGen((ArrayElementValue)
value, cpool,
+ copyPoolEntries);
+ case 'c': // Class
+ return new ClassElementValueGen((ClassElementValue)
value, cpool,
+ copyPoolEntries);
default:
throw new RuntimeException("Not implemented yet! ("
+ value.getElementValueType() + ")");
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
(original)
+++
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
Tue Aug 15 18:14:25 2006
@@ -37,4 +37,4 @@
assertTrue("anonymous inner classes are anonymous",
clazz.isAnonymous());
assertTrue("anonymous inner classes are anonymous",
clazz.isNested());
}
-}
+}
\ No newline at end of file
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
(original)
+++
jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
Tue Aug 15 18:14:25 2006
@@ -220,4 +220,4 @@
fail("Unexpected exception whilst checking
serialization: " + ioe);
}
}
-}
+}
\ No newline at end of file
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
(original)
+++
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
Tue Aug 15 18:14:25 2006
@@ -86,4 +86,4 @@
.equals("org/apache/bcel/data/AttributeTestClassEM02"));
tfile.deleteOnExit();
}
-}
+}
\ No newline at end of file
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
(original)
+++
jakarta/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
Tue Aug 15 18:14:25 2006
@@ -20,4 +20,4 @@
"Expected SimpleClass class to say it was not
an enum - but it didn't !",
!clazz.isEnum());
}
-}
+}
\ No newline at end of file
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java?rev=431754&r1=431753&r2=431754&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java
(original)
+++
jakarta/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java
Tue Aug 15 18:14:25 2006
@@ -251,10 +251,10 @@
+ innerValue,
innerValue instanceof
AnnotationElementValueGen);
AnnotationElementValueGen innerAnnotationValue =
(AnnotationElementValueGen) innerValue;
- assertTrue("Should be called LSimpleAnnotation; but is called: "
+ assertTrue("Should be called
Lorg/apache/bcel/data/SimpleAnnotation; but is called: "
+
innerAnnotationValue.getAnnotation().getTypeName(),
innerAnnotationValue.getAnnotation().getTypeSignature().equals(
- "LSimpleAnnotation;"));
+
"Lorg/apache/bcel/data/SimpleAnnotation;"));
}
/**
@@ -606,4 +606,4 @@
AnnotationEntryGen a = new AnnotationEntryGen(t, elements,
false, cp);
return a;
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
