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/30 19:36:06 UTC
cvs commit: xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile Java2Schema.java Java2SchemaTask.java
pcal 2004/06/30 10:36:06
Modified: v2/jam/src15/org/apache/xmlbeans/impl/jam/internal/java15
Javadoc15DelegateImpl.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile
Java2Schema.java Java2SchemaTask.java
Log:
jam/j2s: temporarily disable some assertions which are causing grief
Revision Changes Path
1.6 +6 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Javadoc15DelegateImpl.java 29 Jun 2004 20:23:11 -0000 1.5
+++ Javadoc15DelegateImpl.java 30 Jun 2004 17:36:05 -0000 1.6
@@ -39,6 +39,11 @@
*/
public class Javadoc15DelegateImpl implements Javadoc15Delegate {
+
+//temporary
+private static boolean DEFAULTS_ENABLED = false;
+public static final void setDefaultsEnabled(boolean b) { DEFAULTS_ENABLED = b; }
+
// ========================================================================
// Variables
@@ -101,7 +106,7 @@
setAnnotationValue(name,jmt,aval,dest,sp);
}
}
-if (true) return;
+if (!DEFAULTS_ENABLED) return;
{ // also set values for the type's defaults
AnnotationTypeDoc atd = src.annotationType();
AnnotationTypeElementDoc[] elements = atd.elements();
1.56 +11 -5 xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2Schema.java
Index: Java2Schema.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2Schema.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Java2Schema.java 28 Jun 2004 21:11:38 -0000 1.55
+++ Java2Schema.java 30 Jun 2004 17:36:06 -0000 1.56
@@ -109,13 +109,19 @@
if (classesToBind == null) {
throw new IllegalArgumentException("null classes");
}
- /*
+/*
for(int i=0; i<classesToBind.length; i++) {
if (classesToBind[i].isUnresolvedType()) {
- throw new IllegalArgumentException(classesToBind[i].getQualifiedName()+
- " is unresolved.");
+ throw new IllegalArgumentException
+ (classesToBind[i].getQualifiedName()+
+ " is unresolved. Please check that your include- and sourcepaths "+
+ " are correct.");
}
- } */
+ }
+ if (classesToBind.length == 0) {
+ throw new IllegalArgumentException("No input classes found.");
+ }
+ */
mClasses = classesToBind;
}
@@ -749,7 +755,7 @@
public int compare(Object o, Object o1) {
JSourcePosition p1 = ((JElement)o).getSourcePosition();
- JSourcePosition p2 = ((JElement)o).getSourcePosition();
+ JSourcePosition p2 = ((JElement)o1).getSourcePosition();
if (p1 == null) return (p2 == null) ? 0 : -1;
if (p2 == null) return 1;
return (p1.getLine() < p2.getLine()) ? -1 :
1.24 +1 -0 xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2SchemaTask.java
Index: Java2SchemaTask.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2SchemaTask.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Java2SchemaTask.java 28 Jun 2004 21:11:38 -0000 1.23
+++ Java2SchemaTask.java 30 Jun 2004 17:36:06 -0000 1.24
@@ -122,6 +122,7 @@
protected BindingCompiler getCompilerToExecute() throws BuildException {
//FIXME refactor this so the functionality is shared and consistent with
//Both2BindTask
+ if (mSrcDir == null) throw new BuildException("srcDir attribute required");
if (mIncludes == null) {
//FIXME we need to improve/expand the ways in which the input source set
//is passed to us
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org