Changeset 1504

Timestamp:

05/20/11 04:50:02 (12 months ago)

Author:

jharrop

Message:

Implement ContentAccessor?

Location:

trunk/docx4j/src/main/java/org/docx4j/wml

Files:

• Ftr.java (modified) (3 diffs)
• Hdr.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/wml/Ftr.java

@@ -63 +63 @@
 @XmlRootElement(name = "ftr")
 public class Ftr
-    implements Child
+    implements Child, ContentAccessor
 {
 
@@ -153 +153 @@
      * 
      */
+    @Deprecated        
     public List<Object> getEGBlockLevelElts() {
         if (egBlockLevelElts == null) {
@@ -160 +161 @@
     }
 
+    public List<Object> getContent() {
+        if (egBlockLevelElts == null) {
+            egBlockLevelElts = new ArrayList<Object>();
+        }
+        return this.egBlockLevelElts;
+    }
+    
     /**
      * Gets the parent object in the object tree representing the unmarshalled xml document.

trunk/docx4j/src/main/java/org/docx4j/wml/Hdr.java

@@ -63 +63 @@
 @XmlRootElement(name = "hdr")
 public class Hdr
-    implements Child
+    implements Child, ContentAccessor
 {
 
@@ -99 +99 @@
     })
     protected List<Object> egBlockLevelElts;
+    
+        
     @XmlTransient
     private Object parent;
@@ -153 +155 @@
      * 
      */
+    @Deprecated    
     public List<Object> getEGBlockLevelElts() {
         if (egBlockLevelElts == null) {
@@ -161 +164 @@
 
     /**
+     * Get the content of this element.
+     * @since 2.7
+     */
+    public List<Object> getContent() {
+        if (egBlockLevelElts == null) {
+            egBlockLevelElts = new ArrayList<Object>();
+        }
+        return this.egBlockLevelElts;
+    }
+    
+    /**
      * Gets the parent object in the object tree representing the unmarshalled xml document.
      *