You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by pc...@apache.org on 2004/06/10 20:15:17 UTC
cvs commit: xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/java15 Javadoc15DelegateImpl.java
pcal 2004/06/10 11:15:17
Modified: v2/jam/src/org/apache/xmlbeans/impl/jam/internal/java15
Javadoc15DelegateImpl.java
Log:
make JAM 1.5 delegate work with (and only with) JDK 1.5 b49 or higher
Revision Changes Path
1.7 +6 -12 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/java15/Javadoc15DelegateImpl.java
Index: Javadoc15DelegateImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/java15/Javadoc15DelegateImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Javadoc15DelegateImpl.java 25 May 2004 20:44:43 -0000 1.6
+++ Javadoc15DelegateImpl.java 10 Jun 2004 18:15:17 -0000 1.7
@@ -28,8 +28,7 @@
import com.sun.javadoc.FieldDoc;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.SourcePosition;
-// import com.sun.javadoc.AnnotationTypeElementDoc;
-import com.sun.javadoc.AnnotationTypeMemberDoc;
+import com.sun.javadoc.AnnotationTypeElementDoc;
import com.sun.javadoc.ExecutableMemberDoc;
@@ -98,14 +97,11 @@
AnnotationDesc src,
SourcePosition sp) {
if (sp != null) JavadocClassBuilder.addSourcePosition(dest,sp);
-// AnnotationDesc.ElementValuePair[] mvps = src.elementValues();
- AnnotationDesc.MemberValuePair[] mvps = src.memberValues();
+ AnnotationDesc.ElementValuePair[] mvps = src.elementValues();
for(int i=0; i<mvps.length; i++) {
-// Type jmt = mvps[i].element().returnType();
- Type jmt = mvps[i].member().returnType();
+ Type jmt = mvps[i].element().returnType();
String typeName = jmt.qualifiedTypeName();
-// String name = mvps[i].element().name();
- String name = mvps[i].member().name();
+ String name = mvps[i].element().name();
AnnotationValue aval = mvps[i].value();
Object valueObj;
try {
@@ -152,8 +148,7 @@
} else if (valueObj instanceof AnnotationValue[]) {
// this is another big chunk of work, just factored into a new
// method to keep things cleaner
-// populateArrayMember(dest,mvps[i].element(),(AnnotationValue[])valueObj,sp);
- populateArrayMember(dest,mvps[i].member(),(AnnotationValue[])valueObj,sp);
+ populateArrayMember(dest,mvps[i].element(),(AnnotationValue[])valueObj,sp);
} else {
mContext.getLogger().error("Value of annotation member "+name+" is " +
"of an unexpected type: "+
@@ -191,8 +186,7 @@
* for the user.</p>
*/
private void populateArrayMember(MAnnotation dest,
-// AnnotationTypeElementDoc memberDoc,
- AnnotationTypeMemberDoc memberDoc,
+ AnnotationTypeElementDoc memberDoc,
AnnotationValue[] annValueArray,
SourcePosition sp)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org