Menu
▾
▴
[mvp-xml-cvs] Prototypes/SGen/SGen.Tests OrderSerialization.cs,1.2,1.3 PurchaseOrder.cs,1.1,1.2 PurchaseOrder.xsd,1.2,1.3 PurchaseOrder.xsx,1.2,1.3
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:12:08
|
Update of /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6976/SGen/SGen.Tests Modified Files: OrderSerialization.cs PurchaseOrder.cs PurchaseOrder.xsd PurchaseOrder.xsx Log Message: Index: PurchaseOrder.xsx =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.xsx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PurchaseOrder.xsx 14 Sep 2004 13:40:10 -0000 1.2 +++ PurchaseOrder.xsx 18 Dec 2004 05:11:52 -0000 1.3 @@ -8,9 +8,9 @@ </Items_XmlElement> </Order_XmlElement> <Customer_XmlElement left="19023" top="1667" width="5292" height="2963" selected="0" zOrder="11" index="1" expanded="1"> - <Category_XmlElement left="19023" top="5138" width="5292" height="847" selected="0" zOrder="15" index="2" expanded="1"> - <_x0028_Category_x0029__XmlSimpleType left="19023" top="6493" width="5292" height="2963" selected="0" zOrder="19" index="0" expanded="1" /> + <Category_XmlElement left="19023" top="5138" width="5292" height="847" selected="0" zOrder="13" index="2" expanded="1"> + <_x0028_Category_x0029__XmlSimpleType left="19023" top="6493" width="5292" height="2963" selected="0" zOrder="16" index="0" expanded="1" /> </Category_XmlElement> </Customer_XmlElement> - <Item_XmlElement left="12488" top="1562" width="5292" height="2963" selected="0" zOrder="13" index="2" expanded="1" /> + <Item_XmlElement left="12488" top="1562" width="5292" height="2963" selected="0" zOrder="19" index="2" expanded="1" /> </XSDDesignerLayout> \ No newline at end of file Index: PurchaseOrder.xsd =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PurchaseOrder.xsd 14 Sep 2004 13:40:10 -0000 1.2 +++ PurchaseOrder.xsd 18 Dec 2004 05:11:52 -0000 1.3 @@ -17,6 +17,7 @@ <xs:attribute name="Id" type="xs:string" /> <xs:attribute name="Ordered" type="xs:date" /> <xs:attribute name="Shipped" type="xs:date" /> + <xs:attribute name="Version" type="xs:string" fixed="1.0" use="required" /> </xs:complexType> </xs:element> <xs:element name="Customer"> Index: OrderSerialization.cs =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/OrderSerialization.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- OrderSerialization.cs 14 Sep 2004 13:40:10 -0000 1.2 +++ OrderSerialization.cs 18 Dec 2004 05:11:52 -0000 1.3 @@ -86,7 +86,7 @@ SGen.Tests.Order o = new SGen.Tests.Order(); SGen.Tests.Item[] a_1 = null; int ca_1 = 0; - bool[] paramsRead = new bool[5]; + bool[] paramsRead = new bool[6]; while (Reader.MoveToNextAttribute()) { if (!paramsRead[2] && ((object) Reader.LocalName == (object)id3_Id && (object) Reader.NamespaceURI == (object)id4_Item)) { o.@Id = Reader.Value; @@ -102,6 +102,10 @@ paramsRead[4] = true; o.@ShippedSpecified = true; } + else if (!paramsRead[5] && ((object) Reader.LocalName == (object)id7_Version && (object) Reader.NamespaceURI == (object)id4_Item)) { + o.@Version = Reader.Value; + paramsRead[5] = true; + } else if (!IsXmlnsAttribute(Reader.Name)) { UnknownNode((object)o); } @@ -115,11 +119,11 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id7_Customer && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id8_Customer && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Customer = Read2_Customer(false, true); paramsRead[0] = true; } - else if (((object) Reader.LocalName == (object)id8_Items && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) Reader.LocalName == (object)id9_Items && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { if (!ReadNull()) { SGen.Tests.Item[] a_1_0 = null; int ca_1_0 = 0; @@ -131,7 +135,7 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (((object) Reader.LocalName == (object)id9_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (((object) Reader.LocalName == (object)id10_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { a_1_0 = (SGen.Tests.Item[])EnsureArrayIndex(a_1_0, ca_1_0, typeof(SGen.Tests.Item));a_1_0[ca_1_0++] = Read5_Item(false, true); } else { @@ -166,7 +170,7 @@ if (isNullable && ReadNull()) return null; if (checkType) { System.Xml.XmlQualifiedName t = GetXsiType(); - if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id7_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id8_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) ; else throw CreateUnknownTypeException((System.Xml.XmlQualifiedName)t); @@ -187,15 +191,15 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id10_FirstName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id11_FirstName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@FirstName = Reader.ReadElementString(); paramsRead[0] = true; } - else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id11_LastName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id12_LastName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@LastName = Reader.ReadElementString(); paramsRead[1] = true; } - else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id12_Category && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id13_Category && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Category = Read3_CustomerCategory(Reader.ReadElementString()); paramsRead[2] = true; } @@ -230,17 +234,17 @@ return ReadTypedPrimitive(new System.Xml.XmlQualifiedName("anyType", "http://www.w3.org/2001/XMLSchema")); else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id1_Order && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read1_Order(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id9_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id10_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read5_Item(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id7_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id8_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read2_Customer(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id13_CustomerCategory && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id14_CustomerCategory && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { Reader.ReadStartElement(); object e = Read3_CustomerCategory(Reader.ReadString()); ReadEndElement(); return e; } - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id14_ArrayOfItem && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id15_ArrayOfItem && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { SGen.Tests.Item[] a = null; if (!ReadNull()) { SGen.Tests.Item[] z_0_0 = null; @@ -253,7 +257,7 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (((object) Reader.LocalName == (object)id9_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (((object) Reader.LocalName == (object)id10_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { z_0_0 = (SGen.Tests.Item[])EnsureArrayIndex(z_0_0, cz_0_0, typeof(SGen.Tests.Item));z_0_0[cz_0_0++] = Read5_Item(false, true); } else { @@ -306,7 +310,7 @@ if (isNullable && ReadNull()) return null; if (checkType) { System.Xml.XmlQualifiedName t = GetXsiType(); - if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id9_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id10_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) ; else throw CreateUnknownTypeException((System.Xml.XmlQualifiedName)t); @@ -327,15 +331,15 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id15_SKU && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id16_SKU && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@SKU = Reader.ReadElementString(); paramsRead[0] = true; } - else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id16_Quantity && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id17_Quantity && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Quantity = Reader.ReadElementString(); paramsRead[1] = true; } - else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id17_Price && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id18_Price && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Price = Reader.ReadElementString(); paramsRead[2] = true; } @@ -372,42 +376,44 @@ return (object)o; } - System.String id11_LastName; - System.String id8_Items; - System.String id7_Customer; - System.String id13_CustomerCategory; - System.String id15_SKU; + System.String id9_Items; + System.String id17_Quantity; + System.String id8_Customer; + System.String id14_CustomerCategory; + System.String id16_SKU; System.String id3_Id; - System.String id9_Item; - System.String id17_Price; + System.String id10_Item; + System.String id18_Price; System.String id5_Ordered; - System.String id4_Item; - System.String id16_Quantity; - System.String id12_Category; + System.String id7_Version; + System.String id12_LastName; + System.String id13_Category; System.String id1_Order; System.String id2_httptempuriorgPurchaseOrderxsd; System.String id6_Shipped; - System.String id14_ArrayOfItem; - System.String id10_FirstName; + System.String id4_Item; + System.String id15_ArrayOfItem; + System.String id11_FirstName; protected override void InitIDs() { - id11_LastName = Reader.NameTable.Add(@"LastName"); - id8_Items = Reader.NameTable.Add(@"Items"); - id7_Customer = Reader.NameTable.Add(@"Customer"); - id13_CustomerCategory = Reader.NameTable.Add(@"CustomerCategory"); - id15_SKU = Reader.NameTable.Add(@"SKU"); + id9_Items = Reader.NameTable.Add(@"Items"); + id17_Quantity = Reader.NameTable.Add(@"Quantity"); + id8_Customer = Reader.NameTable.Add(@"Customer"); + id14_CustomerCategory = Reader.NameTable.Add(@"CustomerCategory"); + id16_SKU = Reader.NameTable.Add(@"SKU"); id3_Id = Reader.NameTable.Add(@"Id"); - id9_Item = Reader.NameTable.Add(@"Item"); - id17_Price = Reader.NameTable.Add(@"Price"); + id10_Item = Reader.NameTable.Add(@"Item"); + id18_Price = Reader.NameTable.Add(@"Price"); id5_Ordered = Reader.NameTable.Add(@"Ordered"); - id4_Item = Reader.NameTable.Add(@""); - id16_Quantity = Reader.NameTable.Add(@"Quantity"); - id12_Category = Reader.NameTable.Add(@"Category"); + id7_Version = Reader.NameTable.Add(@"Version"); + id12_LastName = Reader.NameTable.Add(@"LastName"); + id13_Category = Reader.NameTable.Add(@"Category"); id1_Order = Reader.NameTable.Add(@"Order"); id2_httptempuriorgPurchaseOrderxsd = Reader.NameTable.Add(@"http://tempuri.org/PurchaseOrder.xsd"); id6_Shipped = Reader.NameTable.Add(@"Shipped"); - id14_ArrayOfItem = Reader.NameTable.Add(@"ArrayOfItem"); - id10_FirstName = Reader.NameTable.Add(@"FirstName"); + id4_Item = Reader.NameTable.Add(@""); + id15_ArrayOfItem = Reader.NameTable.Add(@"ArrayOfItem"); + id11_FirstName = Reader.NameTable.Add(@"FirstName"); } } public class Writer : System.Xml.Serialization.XmlSerializationWriter { @@ -434,6 +440,9 @@ if (o.ShippedSpecified) { WriteAttribute(@"Shipped", @"", FromDate((System.DateTime)o.@Shipped)); } + if ((System.String)o.@Version != @"1.0") { + WriteAttribute(@"Version", @"", (System.String)o.@Version); + } Write2_Customer(@"Customer", @"http://tempuri.org/PurchaseOrder.xsd", ((SGen.Tests.Customer)o.@Customer), false, false); { SGen.Tests.Item[] a = (SGen.Tests.Item[])((SGen.Tests.Item[])o.@Items); Index: PurchaseOrder.cs =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PurchaseOrder.cs 14 Sep 2004 13:37:07 -0000 1.1 +++ PurchaseOrder.cs 18 Dec 2004 05:11:52 -0000 1.2 @@ -82,5 +82,10 @@ /// <remarks/> [System.Xml.Serialization.XmlIgnoreAttribute()] public bool ShippedSpecified; + + /// <remarks/> + [System.Xml.Serialization.XmlAttributeAttribute()] + [System.ComponentModel.DefaultValueAttribute("1.0")] + public string Version = "1.0"; } } |
