Changeset 1555 for trunk/docx4j/src/main/java/org/docx4j/dml

Timestamp:

06/22/11 01:36:38 (11 months ago)

Author:

jharrop

Message:

Apply Dave Brown's "assorted patches" of 28 April, as described at
 http://dev.plutext.org/forums/docx-java-f6/assorted-patches-t712.html

Location:

trunk/docx4j/src/main/java/org/docx4j/dml

Files:

• CTBlip.java (modified) (4 diffs)
• wordprocessingDrawing/Anchor.java (modified) (5 diffs)
• wordprocessingDrawing/Inline.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/dml/CTBlip.java

@@ -22 +22 @@
 package org.docx4j.dml;
 
+import org.jvnet.jaxb2_commons.ppp.Child;
+
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.*;
 
 
@@ -77 +75 @@
     "extLst"
 })
-public class CTBlip {
+public class CTBlip implements Child {
 
     @XmlElements({
@@ -106 +104 @@
     @XmlAttribute(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")
     protected String link;
+    @XmlTransient
+    private Object parent;
 
     /**
@@ -259 +259 @@
         this.link = value;
     }
-
+   /**
+     * Gets the parent object in the object tree representing the unmarshalled xml document.
+     *
+     * @return
+     *     The parent object.
+     */
+    public Object getParent() {
+        return this.parent;
+    }
+
+    public void setParent(Object parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * This method is invoked by the JAXB implementation on each instance when unmarshalling completes.
+     *
+     * @param parent
+     *     The parent object in the object tree.
+     * @param unmarshaller
+     *     The unmarshaller that generated the instance.
+     */
+    public void afterUnmarshal(Unmarshaller unmarshaller, Object parent) {
+        setParent(parent);
+    }
 }

trunk/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Anchor.java

@@ -22 +22 @@
 package org.docx4j.dml.wordprocessingDrawing;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.*;
+
 import org.docx4j.dml.CTNonVisualDrawingProps;
 import org.docx4j.dml.CTNonVisualGraphicFrameProperties;
@@ -33 +30 @@
 import org.docx4j.dml.CTPositiveSize2D;
 import org.docx4j.dml.Graphic;
+import org.jvnet.jaxb2_commons.ppp.Child;
 
 
@@ -89 +87 @@
     "graphic"
 })
-public class Anchor {
+public class Anchor implements Child {
 
     @XmlElement(required = true)
@@ -133 +131 @@
     @XmlAttribute(required = true)
     protected boolean allowOverlap;
-
+    @XmlTransient
+    private Object parent;
     /**
      * Gets the value of the simplePos property.
@@ -670 +669 @@
     }
 
+   /**
+     * Gets the parent object in the object tree representing the unmarshalled xml document.
+     *
+     * @return
+     *     The parent object.
+     */
+    public Object getParent() {
+        return this.parent;
+    }
+
+    public void setParent(Object parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * This method is invoked by the JAXB implementation on each instance when unmarshalling completes.
+     *
+     * @param parent
+     *     The parent object in the object tree.
+     * @param unmarshaller
+     *     The unmarshaller that generated the instance.
+     */
+    public void afterUnmarshal(Unmarshaller unmarshaller, Object parent) {
+        setParent(parent);
+    }
 }

trunk/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Inline.java

@@ -22 +22 @@
 package org.docx4j.dml.wordprocessingDrawing;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.*;
+
 import org.docx4j.dml.CTNonVisualDrawingProps;
 import org.docx4j.dml.CTNonVisualGraphicFrameProperties;
 import org.docx4j.dml.CTPositiveSize2D;
 import org.docx4j.dml.Graphic;
+import org.jvnet.jaxb2_commons.ppp.Child;
 
 
@@ -68 +67 @@
     "graphic"
 })
-public class Inline {
+public class Inline implements Child {
 
     @XmlElement(required = true)
@@ -86 +85 @@
     @XmlAttribute
     protected Long distR;
-
+    @XmlTransient
+    private Object parent;
     /**
      * Gets the value of the extent property.
@@ -302 +302 @@
         this.distR = value;
     }
-
+    /**
+     * Gets the parent object in the object tree representing the unmarshalled xml document.
+     *
+     * @return
+     *     The parent object.
+     */
+    public Object getParent() {
+        return this.parent;
+    }
+
+    public void setParent(Object parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * This method is invoked by the JAXB implementation on each instance when unmarshalling completes.
+     *
+     * @param parent
+     *     The parent object in the object tree.
+     * @param unmarshaller
+     *     The unmarshaller that generated the instance.
+     */
+    public void afterUnmarshal(Unmarshaller unmarshaller, Object parent) {
+        setParent(parent);
+    }
 }