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 2004/08/18 22:45:07 UTC
cvs commit: xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed Abstract.java Block.java
daveremy 2004/08/18 13:45:07
Modified: v2/test/src/scomp/attributes/detailed AttrGroupTest.java
GlobalAttrType.java LocalAttrUse.java
v2/test/src/scomp/common BaseCase.java
v2/test/src/scomp/contentType/complex/detailed
AnonymousTest.java ElementOnlyContentTest.java
v2/test/src/scomp/contentType/complex/modelGroup/detailed
ChoiceTest.java SequenceTest.java
v2/test/src/scomp/contentType/simple/detailed
BuiltInType.java
v2/test/src/scomp/derivation/extension/detailed
AttributeExtensionTest.java
AttributeWCExtension.java
ComplexContentExtensionTest.java
MixedContentExtension.java
v2/test/src/scomp/derivation/restriction/detailed
GroupRestrictionTest.java
MixedContentRestriction.java
v2/test/src/scomp/elements/detailed AnyTest.java
NamedModelGroupsTest.java
v2/test/src/scomp/substGroup/detailed Deep.java
OneLevel.java Wide.java
v2/test/src/scomp/substGroup/restriction/detailed
Abstract.java Block.java
Log:
Contributed by: Yana Kadiyska. Fixing 1.4 compatibility
Revision Changes Path
1.2 +3 -2 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/AttrGroupTest.java
Index: AttrGroupTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/AttrGroupTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttrGroupTest.java 16 Aug 2004 18:01:53 -0000 1.1
+++ AttrGroupTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -22,6 +22,7 @@
import javax.xml.namespace.QName;
import java.math.BigDecimal;
+import java.math.BigInteger;
/**
* @owner: ykadiysk
@@ -39,8 +40,8 @@
XmlDecimal val = XmlDecimal.Factory.newInstance();
elt.xsetGlobalAttr(val);
- elt.setVersion(BigDecimal.TEN);
- elt.setGlobalAttr(BigDecimal.ONE);
+ elt.setVersion(new BigDecimal(new BigInteger("10")));
+ elt.setGlobalAttr(new BigDecimal(BigInteger.ONE));
//add a wildcard attr: ##other, lax
XmlCursor cur = elt.newCursor();
//move to document element
1.3 +6 -4 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/GlobalAttrType.java
Index: GlobalAttrType.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/GlobalAttrType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GlobalAttrType.java 16 Aug 2004 22:57:34 -0000 1.2
+++ GlobalAttrType.java 18 Aug 2004 20:45:06 -0000 1.3
@@ -94,8 +94,10 @@
testDoc.setAttAnyType(ival);
- assertEquals(BigInteger.ZERO,
- testDoc.getAttAnyType().changeType(XmlInteger.type));
+ // assertEquals(BigInteger.ZERO,testDoc.getAttAnyType().changeType(XmlInteger.type));
+assertEquals(BigInteger.ZERO.toString(),
+ testDoc.getAttAnyType().getStringValue());
+
try {
assertTrue(testDoc.validate(validateOptions));
}
@@ -106,7 +108,7 @@
XmlString sval = XmlString.Factory.newInstance();
sval.setStringValue("foobar");
testDoc.setAttAnyType(sval);
- assertEquals("foobar", testDoc.getAttAnyType());
+ assertEquals("foobar", testDoc.getAttAnyType().getStringValue());
try {
assertTrue(testDoc.validate(validateOptions));
}
@@ -118,7 +120,7 @@
XmlDouble fval = XmlDouble.Factory.newInstance();
fval.setDoubleValue(-0.01);
testDoc.setAttAnyType(fval);
- assertEquals("-.01", testDoc.getAttAnyType().getStringValue());
+ assertEquals("-0.01", testDoc.getAttAnyType().getStringValue());
try {
assertTrue(testDoc.validate(validateOptions));
}
1.2 +1 -1 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrUse.java
Index: LocalAttrUse.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrUse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalAttrUse.java 16 Aug 2004 18:01:53 -0000 1.1
+++ LocalAttrUse.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -146,7 +146,7 @@
AttrProhibitedEltDocument.Factory.newInstance();
AttrUseProhibited elt = doc.addNewAttrProhibitedElt();
elt.setAttRequiredFixed("XBeanFix");
- elt.setAttRequired(BigInteger.TEN);
+ elt.setAttRequired(new BigInteger("10"));
elt.setAttRequiredDefault("boo");
try {
assertTrue(elt.validate(validateOptions));
1.2 +1 -0 xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java
Index: BaseCase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseCase.java 16 Aug 2004 18:01:54 -0000 1.1
+++ BaseCase.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -44,6 +44,7 @@
XmlError error = (XmlError) errorList.get(i);
System.out.println("\n");
System.out.println("Message: " + error.getMessage() + "\n");
+ if ( error.getCursorLocation() != null)
System.out.println("Location of invalid XML: " +
error.getCursorLocation().xmlText() + "\n");
}
1.2 +1 -1 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/AnonymousTest.java
Index: AnonymousTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/AnonymousTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnonymousTest.java 16 Aug 2004 18:01:55 -0000 1.1
+++ AnonymousTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -50,7 +50,7 @@
testElt.xsetChild2(
XmlInteger.Factory.parse("<xml-fragment>3</xml-fragment>"));
- ival.setBigIntegerValue(BigInteger.TEN);
+ ival.setBigIntegerValue(new BigInteger("10"));
testElt.xsetChild1(ival);
assertEquals("<xml-fragment><child1>10</child1><child2>3</child2>" +
"<child3>1</child3></xml-fragment>",
1.2 +2 -2 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java
Index: ElementOnlyContentTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementOnlyContentTest.java 16 Aug 2004 18:01:55 -0000 1.1
+++ ElementOnlyContentTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -47,7 +47,7 @@
testElt = doc.addNewEltType();
assertEquals(null, testElt.getChild1());
assertEquals(null, testElt.xgetChild1());
- testElt.setChild1(BigInteger.TEN);
+ testElt.setChild1(new BigInteger("10"));
testElt.setChild2(new BigInteger("5"));
testElt.setChild3(new BigInteger("1"));
assertEquals("<xml-fragment><child1>10</child1><child2>5</child2>" +
@@ -79,7 +79,7 @@
testElt = doc.addNewEltType();
assertEquals(null, testElt.getChild1());
assertEquals(null, testElt.xgetChild1());
- testElt.setChild1(BigInteger.TEN);
+ testElt.setChild1(new BigInteger("10"));
testElt.setChild2(new BigInteger("5"));
testElt.setChild3(new BigInteger("1"));
assertTrue(testElt.validate());
1.2 +3 -3 xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java
Index: ChoiceTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChoiceTest.java 16 Aug 2004 18:01:55 -0000 1.1
+++ ChoiceTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -35,7 +35,7 @@
public void testValidCase() throws Throwable{
ChoiceEltDocument doc=ChoiceEltDocument.Factory.newInstance();
ChoiceT elt=doc.addNewChoiceElt();
- elt.addChild3(BigInteger.TEN);
+ elt.addChild3(new BigInteger("10"));
elt.addChild3(BigInteger.ZERO);
try {
assertTrue(doc.validate());
@@ -52,7 +52,7 @@
ChoiceEltDocument doc=ChoiceEltDocument.Factory.newInstance();
ChoiceT elt=doc.addNewChoiceElt();
elt.addChild2("foobar");
- elt.addChild3(BigInteger.TEN);
+ elt.addChild3(new BigInteger("10"));
elt.addChild3(BigInteger.ZERO);
assertTrue( !doc.validate(validateOptions));
@@ -63,7 +63,7 @@
MixedChoiceEltDocument doc=MixedChoiceEltDocument.Factory.newInstance();
MixedChoiceT elt=doc.addNewMixedChoiceElt();
assertTrue ( !elt.isSetChild1() );
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
XmlCursor cur=elt.newCursor();
assertEquals(XmlCursor.TokenType.START,cur.toFirstContentToken());
cur.toEndToken(); //past child one
1.2 +1 -1 xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java
Index: SequenceTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SequenceTest.java 16 Aug 2004 18:01:55 -0000 1.1
+++ SequenceTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -49,7 +49,7 @@
elt.xsetChild2Array(new XmlString[]{});
elt.setChild3Array(new BigInteger[]{valueInt});
elt.addChild3(valueInt);
- elt.setChild3Array(1,BigInteger.TEN);
+ elt.setChild3Array(1,new BigInteger("10"));
assertEquals("<xml-fragment><child3>-3</child3>" +
"<child3>10</child3></xml-fragment>",elt.xmlText());
assertTrue( !elt.validate(validateOptions) );
1.2 +3 -2 xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/BuiltInType.java
Index: BuiltInType.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/BuiltInType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BuiltInType.java 16 Aug 2004 18:01:55 -0000 1.1
+++ BuiltInType.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -166,8 +166,9 @@
" xmlns=\"http://xbean/scomp/contentType/builtIn/Number\"" +
">12.34</DecimalElt>");
assertTrue(decDoc.validate(validateOptions));
- decDoc.setDecimalElt(BigDecimal.TEN);
- assertTrue(BigDecimal.TEN == decDoc.getDecimalElt());
+ BigDecimal bdval=new BigDecimal(new BigInteger("10"));
+ decDoc.setDecimalElt(bdval);
+ assertTrue(bdval == decDoc.getDecimalElt());
IntegerEltDocument integerDoc =
IntegerEltDocument.Factory.parse("<IntegerElt " +
1.2 +3 -3 xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/AttributeExtensionTest.java
Index: AttributeExtensionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/AttributeExtensionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeExtensionTest.java 16 Aug 2004 18:01:56 -0000 1.1
+++ AttributeExtensionTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -44,7 +44,7 @@
}
elt.setTestattribute("foo");
elt.setTestattribute2("bar");
- elt.setTestattributeInt(BigInteger.TEN);
+ elt.setTestattributeInt(new BigInteger("10"));
try{
assertTrue(doc.validate());
}
@@ -54,8 +54,8 @@
throw t;
}
//make sure attr w/ value foo is in the imported NS
- assertEquals("<att:ExtendedElement glob:testattributeInt=\"10\" " +
- "testattribute=\"bar\" glob:testattribute=\"foo\" " +
+ assertEquals("<att:ExtendedElement glob:testattribute=\"foo\" " +
+ "testattribute=\"bar\" glob:testattributeInt=\"10\" " +
"xmlns:att=\"http://xbean/scomp/derivation/AttributeExtension\" " +
"xmlns:glob=\"http://xbean/scomp/attribute/GlobalAttrDefault\"/>"
,doc.xmlText());
1.2 +9 -4 xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/AttributeWCExtension.java
Index: AttributeWCExtension.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/AttributeWCExtension.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeWCExtension.java 16 Aug 2004 18:01:56 -0000 1.1
+++ AttributeWCExtension.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -25,14 +25,18 @@
public class AttributeWCExtension extends BaseCase {
/**
- * Strict wildcard any
+ * Strict wildcard ##local
+ * Base type didn't have wildcards
* @throws Throwable
*/
public void testRestrictBaseWOWC() throws Throwable {
- String input = "<foo:BaseNoWC " +
- " xmlns:foo=\"http://xbean/scomp/derivation/AttributeWCExtension\"" +
- " testAttr=\"val1\"/>";
+ String input = "<pre:BaseNoWC " +
+ " xmlns:pre=\"http://xbean/scomp/derivation/AttributeWCExtension\"" +
+ " xmlns:base=\"http://xbean/scomp/attribute/GlobalAttrDefault\" " +
+ " base:testattribute=\"val\"" +
+ " base:testattributeInt=\"3\"" +
+ " pre:testAttr=\"val1\"/>";
BaseNoWCDocument doc = BaseNoWCDocument.Factory.parse(input);
if ( !doc.validate(validateOptions) )
showErrors();
@@ -46,6 +50,7 @@
public void testAnyStrict() throws Throwable {
String input = "<foo:AnyStrict " +
" xmlns:foo=\"http://xbean/scomp/derivation/AttributeWCExtension\"" +
+
" testAttr=\"val1\"/>";
AnyStrictDocument doc = AnyStrictDocument.Factory.parse(input);
if ( !doc.validate(validateOptions) )
1.2 +2 -2 xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
Index: ComplexContentExtensionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexContentExtensionTest.java 16 Aug 2004 18:01:56 -0000 1.1
+++ ComplexContentExtensionTest.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -67,13 +67,13 @@
ChoiceExtensionEltDocument doc = ChoiceExtensionEltDocument.Factory
.newInstance();
ChoiceExtensionT elt = doc.addNewChoiceExtensionElt();
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
elt.addChild2("foobar");
elt.setChild3Array(new BigInteger[]{BigInteger.ONE, BigInteger.ZERO});
elt.addExtraEltInt(3);
elt.setExtraEltStrArray(new String[]{"extra1", "extra2"});
assertTrue(!doc.validate());
- assertEquals(BigInteger.TEN, elt.getChild1());
+ assertEquals(new BigInteger("10"), elt.getChild1());
assertEquals("foobar", elt.getChild2Array()[0]);
elt.unsetChild1();
elt.removeChild2(0);
1.2 +2 -2 xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/MixedContentExtension.java
Index: MixedContentExtension.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/MixedContentExtension.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MixedContentExtension.java 16 Aug 2004 18:01:56 -0000 1.1
+++ MixedContentExtension.java 18 Aug 2004 20:45:06 -0000 1.2
@@ -35,7 +35,7 @@
Factory.newInstance();
ExtendedMixedT elt = doc.addNewExtendedMixedElt();
elt.setExtendedAttr("FOOBAR_val");
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
XmlCursor cur = elt.newCursor();
cur.toFirstContentToken();
cur.beginElement("Child2");
@@ -57,7 +57,7 @@
Factory.newInstance();
ExtendedMixedT elt = doc.addNewExtendedMixedElt();
elt.setExtendedAttr("FOOBAR_val");
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
XmlCursor cur = elt.newCursor();
cur.toEndToken();
cur.beginElement("child2");
1.2 +3 -3 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java
Index: GroupRestrictionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GroupRestrictionTest.java 16 Aug 2004 18:59:32 -0000 1.1
+++ GroupRestrictionTest.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -32,8 +32,8 @@
RestrictedSequenceT elt = doc.addNewRestrictedSequenceElt();
elt.setChild1(BigInteger.ONE);
elt.addChild2("foobar");
- elt.addChild3(BigInteger.TEN);
- elt.addChild3(BigInteger.TEN);
+ elt.addChild3(new BigInteger("10"));
+ elt.addChild3(new BigInteger("10"));
try {
assertTrue(doc.validate());
}
@@ -76,7 +76,7 @@
//child3 can't be missing
assertTrue(!doc.validate());
showErrors();
- elt.setChild3(BigInteger.TEN);
+ elt.setChild3(new BigInteger("10"));
try {
assertTrue(doc.validate());
}
1.2 +3 -3 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java
Index: MixedContentRestriction.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MixedContentRestriction.java 16 Aug 2004 18:59:32 -0000 1.1
+++ MixedContentRestriction.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -32,7 +32,7 @@
MixedEltDocument doc=MixedEltDocument.Factory.newInstance();
RestrictedMixedT elt=doc.addNewMixedElt();
assertTrue( !elt.isSetChild1());
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
elt.setChild2(BigInteger.ZERO);
//insert text b/n the 2 elements
XmlCursor cur=elt.newCursor();
@@ -56,7 +56,7 @@
ElementOnlyEltDocument doc=ElementOnlyEltDocument.Factory.newInstance();
RestrictedEltT elt=doc.addNewElementOnlyElt();
assertTrue( !elt.isSetChild1());
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
elt.setChild2(BigInteger.ZERO);
//insert text b/n the 2 elements
XmlCursor cur=elt.newCursor();
@@ -91,7 +91,7 @@
Mixed2EmptyEltDocument doc=Mixed2EmptyEltDocument.Factory.newInstance();
Mixed2EmptyT elt=doc.addNewMixed2EmptyElt();
assertEquals(null,elt.xgetChild1());
- elt.setChild1(BigInteger.TEN);
+ elt.setChild1(new BigInteger("10"));
assertTrue( !doc.validate(validateOptions));
showErrors();
elt.unsetChild1();
1.2 +1 -1 xml-xmlbeans/v2/test/src/scomp/elements/detailed/AnyTest.java
Index: AnyTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/elements/detailed/AnyTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnyTest.java 16 Aug 2004 18:01:56 -0000 1.1
+++ AnyTest.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -23,7 +23,7 @@
bst.setName("shirt");
bst.setNumber("SkU034");
bst.setColor("white");
- bst.setSize(BigInteger.TEN);
+ bst.setSize(new BigInteger("10"));
doc.setAnyElt(bst);
try {
assertTrue(doc.validate(validateOptions));
1.2 +2 -1 xml-xmlbeans/v2/test/src/scomp/elements/detailed/NamedModelGroupsTest.java
Index: NamedModelGroupsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/elements/detailed/NamedModelGroupsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamedModelGroupsTest.java 16 Aug 2004 18:01:56 -0000 1.1
+++ NamedModelGroupsTest.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -21,6 +21,7 @@
import java.util.GregorianCalendar;
import java.math.BigDecimal;
+import java.math.BigInteger;
/**
* @owner: ykadiysk
@@ -38,7 +39,7 @@
elt.setComment("Horrible performance by employee Potatohead");
elt.setDate(new GregorianCalendar(2004,8,12));
- elt.setGrade(BigDecimal.ONE);
+ elt.setGrade(new BigDecimal(new BigInteger("10")));
elt.setManager(m);
try {
assertTrue( doc.validate(validateOptions)) ;
1.3 +2 -2 xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/Deep.java
Index: Deep.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/Deep.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Deep.java 16 Aug 2004 23:34:22 -0000 1.2
+++ Deep.java 18 Aug 2004 20:45:07 -0000 1.3
@@ -124,7 +124,7 @@
BusinessCasualShirtType bShirt = BusinessCasualShirtType.Factory.newInstance();
bShirt.setName("Funny Shirt");
bShirt.setNumber("SKU84");
- bShirt.setSize(BigInteger.TEN);
+ bShirt.setSize(new BigInteger("10"));
bShirt.setPokadotColor("yellow");
bShirt.setColor("blue");
/* This doesn't work
@@ -136,7 +136,7 @@
shirt.setName("Funny Shirt");
shirt.setNumber("SKU54");
shirt.setColor("green");
- shirt.setSize(BigInteger.TEN);
+ shirt.setSize(new BigInteger("10"));
ProductType genericProd = ProductType.Factory.newInstance();
genericProd.setName("Pants");
genericProd.setNumber("32");
1.3 +2 -2 xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/OneLevel.java
Index: OneLevel.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/OneLevel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OneLevel.java 16 Aug 2004 23:34:22 -0000 1.2
+++ OneLevel.java 18 Aug 2004 20:45:07 -0000 1.3
@@ -109,7 +109,7 @@
HatType hat=HatType.Factory.newInstance();
hat.setName("Funny Hat");
hat.setNumber("SKU84");
- hat.setSize(BigInteger.TEN);
+ hat.setSize(new BigInteger("10"));
/* This doesn't work
ProductType hat = elt.addNewProduct();
@@ -120,7 +120,7 @@
shirt.setName("Funny Shirt");
shirt.setNumber("SKU54");
shirt.setColor("blue");
- shirt.setSize(BigInteger.TEN);
+ shirt.setSize(new BigInteger("10"));
ProductType genericProd = ProductType.Factory.newInstance();
genericProd.setName("Pants");
genericProd.setNumber("32");
1.3 +1 -1 xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/Wide.java
Index: Wide.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/detailed/Wide.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Wide.java 16 Aug 2004 23:34:22 -0000 1.2
+++ Wide.java 18 Aug 2004 20:45:07 -0000 1.3
@@ -102,7 +102,7 @@
BusinessShirtType bShirt=BusinessShirtType.Factory.newInstance();
bShirt.setName("Funny Shirt");
bShirt.setNumber("SKU84");
- bShirt.setSize(BigInteger.TEN);
+ bShirt.setSize(new BigInteger("10"));
bShirt.setColor("blue");
BeachUmbrellaT bu=BeachUmbrellaT.Factory.newInstance();
1.2 +1 -1 xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Abstract.java
Index: Abstract.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Abstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Abstract.java 16 Aug 2004 18:01:58 -0000 1.1
+++ Abstract.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -99,7 +99,7 @@
bs.setName("Oxford Shirt");
bs.setNumber("SKU35");
bs.setColor("blue");
- bs.setSize(BigInteger.TEN);
+ bs.setSize(new BigInteger("10"));
ItemType it= doc.addNewItems();
BeachUmbrellaT um=BeachUmbrellaT.Factory.newInstance();
um.setDiameter(1.5f);
1.2 +2 -2 xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Block.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Block.java 16 Aug 2004 18:01:58 -0000 1.1
+++ Block.java 18 Aug 2004 20:45:07 -0000 1.2
@@ -70,7 +70,7 @@
bs.setName("Bus Shirt");
bs.setNumber("SKU35");
bs.setColor("blue");
- bs.setSize(BigInteger.TEN);
+ bs.setSize(new BigInteger("10"));
/** //Why is this set not working???
doc.getItems().setProductArray(0, bs);
@@ -130,7 +130,7 @@
bs.setName("Oxford Shirt");
bs.setNumber("SKU35");
bs.setColor("blue");
- bs.setSize(BigInteger.TEN);
+ bs.setSize(new BigInteger("10"));
ItemType it= doc.addNewItems();
it.setProductArray(new ProductType[]{bs});
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org