1.) Added restriction to fo:declarations that fo:color-profile is the only XSL namespace child element allowed.

2.) Switched from fo.FOTreeControl to apps.Document throughout app, to better clarify that it is the apps.Document object being accessed/used.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197716 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 32 insertions, 32 deletions

diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java
index 002650c67..88a656547 100644
--- a/src/java/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/BasicLink.java
@@ -54,7 +54,7 @@ public class BasicLink extends Inline {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startLink(this);
+        getDocument().getFOInputHandler().startLink(this);
     }
 
     public void setup() {
@@ -143,7 +143,7 @@ public class BasicLink extends Inline {
     public void end() {
         super.end();
         
-        getFOTreeControl().getFOInputHandler().endLink();
+        getDocument().getFOInputHandler().endLink();
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index e1f90ea9a..0a0365ede 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -111,7 +111,7 @@ public class Block extends FObjMixed {
 
         setupID();
 
-        getFOTreeControl().getFOInputHandler().startBlock(this);
+        getDocument().getFOInputHandler().startBlock(this);
     }
 
     private void setup() {
@@ -238,7 +238,7 @@ public class Block extends FObjMixed {
      */
     public void end() {
         handleWhiteSpace();
-        getFOTreeControl().getFOInputHandler().endBlock(this);
+        getDocument().getFOInputHandler().endBlock(this);
     }
 
     private void handleWhiteSpace() {
diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index adcac83ca..4b7ff9035 100644
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -63,7 +63,7 @@ public class ExternalGraphic extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().image(this);
+        getDocument().getFOInputHandler().image(this);
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index 4f74945a5..536c8b06d 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -48,7 +48,7 @@ public class Footnote extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startFootnote(this);
+        getDocument().getFOInputHandler().startFootnote(this);
     }
 
     /**
@@ -79,7 +79,7 @@ public class Footnote extends FObj {
     
     protected void end() {
         super.end();
-        getFOTreeControl().getFOInputHandler().endFootnote(this);
+        getDocument().getFOInputHandler().endFootnote(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 5b9a2c3a6..8461b44d8 100644
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -52,7 +52,7 @@ public class FootnoteBody extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startFootnoteBody(this);
+        getDocument().getFOInputHandler().startFootnoteBody(this);
     }
 
     public void acceptVisitor(FOTreeVisitor fotv) {
@@ -62,7 +62,7 @@ public class FootnoteBody extends FObj {
     protected void end() {
         super.end();
         
-        getFOTreeControl().getFOInputHandler().endFootnoteBody(this);
+        getDocument().getFOInputHandler().endFootnoteBody(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java
index ebe49bd49..8d940ddab 100644
--- a/src/java/org/apache/fop/fo/flow/Inline.java
+++ b/src/java/org/apache/fop/fo/flow/Inline.java
@@ -114,7 +114,7 @@ public class Inline extends FObjMixed {
             this.lineThrough = true;
         }
         
-        getFOTreeControl().getFOInputHandler().startInline(this);
+        getDocument().getFOInputHandler().startInline(this);
     }
 
     /**
@@ -139,7 +139,7 @@ public class Inline extends FObjMixed {
      * @see org.apache.fop.fo.FONode#end
      */
     public void end() {
-        getFOTreeControl().getFOInputHandler().endInline(this);
+        getDocument().getFOInputHandler().endInline(this);
     }
 
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index f9c3ac8c4..f5387a62c 100644
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -66,7 +66,7 @@ public class Leader extends FObjMixed {
         CommonBackground bProps = propMgr.getBackgroundProps();
 
         // Common Font Properties
-        this.fontState = propMgr.getFontState(getFOTreeControl());
+        this.fontState = propMgr.getFontState(getDocument());
 
         // Common Margin Properties-Inline
         CommonMarginInline mProps = propMgr.getMarginInlineProps();
diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index 23d4da5ef..84b85ed93 100644
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -64,7 +64,7 @@ public class ListBlock extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startList(this);
+        getDocument().getFOInputHandler().startList(this);
     }
 
     private void setup() throws FOPException {
@@ -139,7 +139,7 @@ public class ListBlock extends FObj {
     protected void end() {
         super.end();
         
-        getFOTreeControl().getFOInputHandler().endList(this);
+        getDocument().getFOInputHandler().endList(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index 6c5ed254b..b403c44cb 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -64,7 +64,7 @@ public class ListItem extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startListItem(this);
+        getDocument().getFOInputHandler().startListItem(this);
     }
 
     private void setup() {
@@ -148,7 +148,7 @@ public class ListItem extends FObj {
 
     protected void end() {
         super.end();
-        getFOTreeControl().getFOInputHandler().endListItem(this);
+        getDocument().getFOInputHandler().endListItem(this);
     }
 
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index cead94f88..51b8da235 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -46,7 +46,7 @@ public class ListItemLabel extends FObj {
      */
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
-        getFOTreeControl().getFOInputHandler().startListLabel();
+        getDocument().getFOInputHandler().startListLabel();
     }
 
     private void setup() {
@@ -86,7 +86,7 @@ public class ListItemLabel extends FObj {
     protected void end() {
         super.end();
         
-        getFOTreeControl().getFOInputHandler().endListLabel();
+        getDocument().getFOInputHandler().endListLabel();
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 1871e8133..0c4e558bf 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -61,7 +61,7 @@ public class PageNumber extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         setup();
-        getFOTreeControl().getFOInputHandler().startPageNumber(this);
+        getDocument().getFOInputHandler().startPageNumber(this);
     }
 
     public void setup() {
@@ -77,7 +77,7 @@ public class PageNumber extends FObj {
         CommonBackground bProps = propMgr.getBackgroundProps();
 
         // Common Font Properties
-        this.fontState = propMgr.getFontState(getFOTreeControl());
+        this.fontState = propMgr.getFontState(getDocument());
 
         // Common Margin Properties-Inline
         CommonMarginInline mProps = propMgr.getMarginInlineProps();
@@ -129,7 +129,7 @@ public class PageNumber extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endPageNumber(this);
+        getDocument().getFOInputHandler().endPageNumber(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
index b1907b05b..6ea66fe3a 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -82,7 +82,7 @@ public class PageNumberCitation extends FObj {
         CommonBackground bProps = propMgr.getBackgroundProps();
 
         // Common Font Properties
-        this.fontState = propMgr.getFontState(getFOTreeControl());
+        this.fontState = propMgr.getFontState(getDocument());
 
         // Common Margin Properties-Inline
         CommonMarginInline mProps = propMgr.getMarginInlineProps();
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 94fada6c1..82202e65c 100644
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -81,7 +81,7 @@ public class Table extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         setupID();
-        getFOTreeControl().getFOInputHandler().startTable(this);
+        getDocument().getFOInputHandler().startTable(this);
     }
 
     /**
@@ -203,7 +203,7 @@ public class Table extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endTable(this);
+        getDocument().getFOInputHandler().endTable(this);
     }
 
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index ce5048a67..a75142b1c 100644
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -57,7 +57,7 @@ public class TableBody extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         setupID();
-        getFOTreeControl().getFOInputHandler().startBody(this);
+        getDocument().getFOInputHandler().startBody(this);
     }
 
     private void setup() throws FOPException {
@@ -104,7 +104,7 @@ public class TableBody extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endBody(this);
+        getDocument().getFOInputHandler().endBody(this);
     }
 
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index b9d4e2b6a..88c089963 100644
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -123,7 +123,7 @@ public class TableCell extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         doSetup();    // init some basic property values
-        getFOTreeControl().getFOInputHandler().startCell(this);
+        getDocument().getFOInputHandler().startCell(this);
     }
 
     /**
@@ -348,7 +348,7 @@ public class TableCell extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endCell(this);
+        getDocument().getFOInputHandler().endCell(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index 232d6b0ea..69e18b8fa 100644
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -60,7 +60,7 @@ public class TableColumn extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         initialize();    // init some basic property values
-        getFOTreeControl().getFOInputHandler().startColumn(this);
+        getDocument().getFOInputHandler().startColumn(this);
     }
 
     /**
@@ -124,7 +124,7 @@ public class TableColumn extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endColumn(this);
+        getDocument().getFOInputHandler().endColumn(this);
     }
     
     public String getName() {
diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 9ecc3ec12..467fe02b2 100644
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -68,7 +68,7 @@ public class TableRow extends FObj {
     protected void addProperties(Attributes attlist) throws FOPException {
         super.addProperties(attlist);
         setupID();
-        getFOTreeControl().getFOInputHandler().startRow(this);
+        getDocument().getFOInputHandler().startRow(this);
     }
 
     /**
@@ -145,7 +145,7 @@ public class TableRow extends FObj {
     }
 
     protected void end() {
-        getFOTreeControl().getFOInputHandler().endRow(this);
+        getDocument().getFOInputHandler().endRow(this);
     }
     
     public String getName() {