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/05/17 20:59:33 UTC
cvs commit: xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc JavadocClassBuilder.java
pcal 2004/05/17 11:59:33
Modified: v2/jam/src/org/apache/xmlbeans/impl/jam JClass.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements
ClassImpl.java ElementImpl.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc
JavadocClassBuilder.java
Log:
jam: minor tweaks to javedoc processing
Revision Changes Path
1.8 +17 -0 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JClass.java
Index: JClass.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JClass.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JClass.java 12 May 2004 23:14:18 -0000 1.7
+++ JClass.java 17 May 2004 18:59:32 -0000 1.8
@@ -24,6 +24,23 @@
* returns the outer class. Otherwise, it returns the containing
* package.</p>
*
+ * <p><b>Important Note:</b> Because JAM's classloading machinery may swap
+ * instances of JClass out of memory at any time, you should never rely on
+ * instance equality (i.e., '==') when comparing two JClasses. To illustrate:
+ * it is possible (though rather unlikely) that that the following expression
+ * will evaluate to false</p>
+ *
+ * <code>
+ * JMethod myJMethod = ...
+ * myJMethod.getReturnType() == myJMethod.getReturnType()
+ * </code>
+ *
+ * <p>Instead, you should always use equals()</p>
+
+ * <code>
+ * myJMethod.getReturnType().equals(myJMethod.getReturnType())
+ * </code>
+ *
* <p>REVIEW a bunch of these methods (getMethods, getConstructors...)
* could throw SecurityException if the JClass is backed by
* java.lang.Class (see javadocs for Class). We're currently ignoring
1.17 +1 -1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ClassImpl.java
Index: ClassImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ClassImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ClassImpl.java 14 May 2004 00:40:42 -0000 1.16
+++ ClassImpl.java 17 May 2004 18:59:33 -0000 1.17
@@ -572,7 +572,7 @@
// check all of arg's implemented interfaces, recursively
JClass[] interfaces = arg.getInterfaces();
if (interfaces != null) {
- for (int i = 0; i < interfaces.length; i++) {
+ for (int i=0; i<interfaces.length; i++) {
if (isAssignableFromRecursively(interfaces[i])) return true;
}
}
1.9 +1 -1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ElementImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElementImpl.java 12 May 2004 23:14:18 -0000 1.8
+++ ElementImpl.java 17 May 2004 18:59:33 -0000 1.9
@@ -92,7 +92,7 @@
public void setSimpleName(String name) {
if (name == null) throw new IllegalArgumentException("null name");
- mSimpleName = name;
+ mSimpleName = name.trim();
}
public MSourcePosition createSourcePosition() {
1.24 +3 -1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc/JavadocClassBuilder.java
Index: JavadocClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc/JavadocClassBuilder.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JavadocClassBuilder.java 12 May 2004 23:14:18 -0000 1.23
+++ JavadocClassBuilder.java 17 May 2004 18:59:33 -0000 1.24
@@ -222,7 +222,9 @@
if (s != null) dest.setSuperclass(s.qualifiedName());
// set the interfaces
ClassDoc[] ints = src.interfaces();
- for(int i=0; i<ints.length; i++) dest.addInterface(ints[i].qualifiedName());
+ for(int i=0; i<ints.length; i++) {
+ dest.addInterface(ints[i].qualifiedName());
+ }
// add the fields
FieldDoc[] fields = src.fields();
for(int i=0; i<fields.length; i++) populate(dest.addNewField(),fields[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org