Changeset 1255 for trunk/docx4j/src/main/java/org/docx4j/customXmlProperties

Timestamp:

10/10/10 04:47:16 (20 months ago)

Author:

jharrop

Message:

SchemaRefs? can contain multiple SchemaRef?. Correct XSD to reflect this and re-generate.

Location:

trunk/docx4j/src/main/java/org/docx4j/customXmlProperties

Files:

• DatastoreItem.java (modified) (1 diff)
• ObjectFactory.java (modified) (2 diffs)
• SchemaRefs.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/customXmlProperties/DatastoreItem.java

@@ -40 +40 @@
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://schemas.openxmlformats.org/officedocument/2006/2/customXml}schemaRefs" minOccurs="0"/>
+ *         <element ref="{http://schemas.openxmlformats.org/officeDocument/2006/customXml}schemaRefs" minOccurs="0"/>
  *       </sequence>
  *       <attribute name="itemID" use="required">

trunk/docx4j/src/main/java/org/docx4j/customXmlProperties/ObjectFactory.java

@@ -58 +58 @@
 
     /**
+     * Create an instance of {@link SchemaRefs }
+     * 
+     */
+    public SchemaRefs createSchemaRefs() {
+        return new SchemaRefs();
+    }
+
+    /**
      * Create an instance of {@link DatastoreItem }
      * 
@@ -65 +73 @@
     }
 
-    /**
-     * Create an instance of {@link SchemaRefs }
-     * 
-     */
-    public SchemaRefs createSchemaRefs() {
-        return new SchemaRefs();
-    }
-
 }

trunk/docx4j/src/main/java/org/docx4j/customXmlProperties/SchemaRefs.java

@@ -21 +21 @@
 package org.docx4j.customXmlProperties;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -38 +40 @@
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="schemaRef" minOccurs="0">
+ *         <element name="schemaRef" maxOccurs="unbounded" minOccurs="0">
  *           <complexType>
  *             <complexContent>
@@ -62 +64 @@
 public class SchemaRefs {
 
-    protected SchemaRefs.SchemaRef schemaRef;
+    protected List<SchemaRefs.SchemaRef> schemaRef;
 
     /**
      * Gets the value of the schemaRef property.
      * 
-     * @return
-     *     possible object is
-     *     {@link SchemaRefs.SchemaRef }
-     *     
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the schemaRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSchemaRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SchemaRefs.SchemaRef }
+     * 
+     * 
      */
-    public SchemaRefs.SchemaRef getSchemaRef() {
-        return schemaRef;
-    }
-
-    /**
-     * Sets the value of the schemaRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SchemaRefs.SchemaRef }
-     *     
-     */
-    public void setSchemaRef(SchemaRefs.SchemaRef value) {
-        this.schemaRef = value;
+    public List<SchemaRefs.SchemaRef> getSchemaRef() {
+        if (schemaRef == null) {
+            schemaRef = new ArrayList<SchemaRefs.SchemaRef>();
+        }
+        return this.schemaRef;
     }