You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2003/12/17 02:30:37 UTC
cvs commit: xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile Both2Bind.java
davidbau 2003/12/16 17:30:37
Modified: v2/src/binding/org/apache/xmlbeans/impl/binding/bts
BindingProperty.java
v2/src/binding/org/apache/xmlbeans/impl/binding/compile
Both2Bind.java
Log:
Added BindingProperty.toString, and fixed the root-element binding case in
the start-from-both binder, so that uniqueness of Java class bindings isn't
enforced for the top-level element case.
CR: scott
DRT: passed
Revision Changes Path
1.7 +5 -0 xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/bts/BindingProperty.java
Index: BindingProperty.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/bts/BindingProperty.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindingProperty.java 16 Dec 2003 09:55:05 -0000 1.6
+++ BindingProperty.java 17 Dec 2003 01:30:37 -0000 1.7
@@ -224,4 +224,9 @@
registerClassAndType(QNameProperty.class, org.apache.xml.xmlbeans.bindingConfig.QnameProperty.type);
registerClassAndType(ParticleProperty.class, org.apache.xml.xmlbeans.bindingConfig.ParticleProperty.type);
}
+
+ public String toString()
+ {
+ return getClass().getName() + " [" + getGetterName().getSimpleName() + "]";
+ }
}
1.4 +13 -9 xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Both2Bind.java
Index: Both2Bind.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Both2Bind.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Both2Bind.java 16 Dec 2003 09:55:05 -0000 1.3
+++ Both2Bind.java 17 Dec 2003 01:30:37 -0000 1.4
@@ -350,17 +350,21 @@
"Both " + scratch.getJavaName() + " and " + ((Scratch)scratchFromXmlName.get(scratch.getXmlName())).getJavaName() + " match Schema " + scratch.getXmlName());
}
- if (!scratchFromJavaName.containsKey(scratch.getJavaName()))
- scratchFromJavaName.put(scratch.getJavaName(), scratch);
- else
+ // only non-document types are uniquified
+ if (!scratch.getSchemaType().isDocumentType())
{
- skip = true;
- addError(new Object[] { scratch.getSchemaType(),
- ((Scratch)scratchFromJavaName.get(scratch.getJavaName())).getSchemaType(),
- scratch.getJClass() },
- "Both " + scratch.getXmlName() + " and " + ((Scratch)scratchFromJavaName.get(scratch.getJavaName())).getXmlName() + " match Java " + scratch.getJavaName());
+ if (!scratchFromJavaName.containsKey(scratch.getJavaName()))
+ scratchFromJavaName.put(scratch.getJavaName(), scratch);
+ else
+ {
+ skip = true;
+ addError(new Object[] { scratch.getSchemaType(),
+ ((Scratch)scratchFromJavaName.get(scratch.getJavaName())).getSchemaType(),
+ scratch.getJClass() },
+ "Both " + scratch.getXmlName() + " and " + ((Scratch)scratchFromJavaName.get(scratch.getJavaName())).getXmlName() + " match Java " + scratch.getJavaName());
+ }
}
-
+
if (!skip)
queueToResolve(scratch);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org