You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by pc...@apache.org on 2004/06/29 22:23:11 UTC
cvs commit: xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal Java2SchemaAnnotationHelper.java
pcal 2004/06/29 13:23:11
Modified: v2/jam/src/org/apache/xmlbeans/impl/jam JAnnotation.java
v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15
Javadoc15DelegateImpl.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal
Java2SchemaAnnotationHelper.java
Log:
jam and j2s fixes
Revision Changes Path
1.7 +3 -0 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JAnnotation.java
Index: JAnnotation.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JAnnotation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JAnnotation.java 20 Mar 2004 20:10:45 -0000 1.6
+++ JAnnotation.java 29 Jun 2004 20:23:11 -0000 1.7
@@ -34,6 +34,9 @@
// ========================================================================
// Constants
+ public String getSimpleName();
+
+
public static final String SINGLE_VALUE_NAME = "value";
// ========================================================================
1.5 +3 -0 xml-xmlbeans/v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15/Javadoc15DelegateImpl.java
Index: Javadoc15DelegateImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15/Javadoc15DelegateImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Javadoc15DelegateImpl.java 28 Jun 2004 21:11:01 -0000 1.4
+++ Javadoc15DelegateImpl.java 29 Jun 2004 20:23:11 -0000 1.5
@@ -101,6 +101,7 @@
setAnnotationValue(name,jmt,aval,dest,sp);
}
}
+if (true) return;
{ // also set values for the type's defaults
AnnotationTypeDoc atd = src.annotationType();
AnnotationTypeElementDoc[] elements = atd.elements();
@@ -108,6 +109,8 @@
AnnotationValue value = elements[i].defaultValue();
if (value != null) {
String name = elements[i].name();
+ System.out.println("default value named '"+name+"' = "+
+ " "+value+" "+value.getClass()+" "+dest.getValue(name));
if (dest.getValue(name) == null) {
setAnnotationValue(name,elements[i].returnType(),
value,dest,sp);
1.3 +1 -1 xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal/Java2SchemaAnnotationHelper.java
Index: Java2SchemaAnnotationHelper.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/internal/Java2SchemaAnnotationHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Java2SchemaAnnotationHelper.java 28 Jun 2004 21:11:38 -0000 1.2
+++ Java2SchemaAnnotationHelper.java 29 Jun 2004 20:23:11 -0000 1.3
@@ -160,7 +160,7 @@
public JAnnotation getAnnotation(JAnnotatedElement e, String named) {
JAnnotation[] tags = e.getAllJavadocTags();
for(int i=0; i<tags.length; i++) {
- if (tags[i].getSimpleName().equals(named)) return tags[i];
+ if (tags[i].getQualifiedName().equals(named)) return tags[i];
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org