gmazza 2004/08/04 15:50:59
Modified: src/java/org/apache/fop/fo/extensions Bookmarks.java
ExtensionObj.java Label.java Outline.java
src/java/org/apache/fop/fo/flow FootnoteBody.java
ListItemBody.java ListItemLabel.java Marker.java
TableColumn.java
src/java/org/apache/fop/fo/pagination ColorProfile.java
ConditionalPageMasterReference.java
Declarations.java LayoutMasterSet.java
PageMasterReference.java PageSequence.java
PageSequenceMaster.java Region.java
RegionAfter.java RegionBA.java RegionBefore.java
RegionBody.java RegionEnd.java RegionSE.java
RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java Root.java
SimplePageMaster.java
SinglePageMasterReference.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
More detaching from AddLMVisitor those FO's which don't/don't currently
generate areas.
Revision Changes Path
1.11 +1 -7 xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java
Index: Bookmarks.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Bookmarks.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Bookmarks.java 27 Jul 2004 23:57:11 -0000 1.10
+++ Bookmarks.java 4 Aug 2004 22:50:57 -0000 1.11
@@ -26,7 +26,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.pagination.Root;
/**
@@ -64,12 +63,7 @@
((Root) parent).setBookmarks(this);
}
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveBookmarks(this);
- }
-
public ArrayList getOutlines() {
return outlines;
}
-
}
1.5 +1 -7 xml-fop/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
Index: ExtensionObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/ExtensionObj.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtensionObj.java 27 Jul 2004 23:57:11 -0000 1.4
+++ ExtensionObj.java 4 Aug 2004 22:50:57 -0000 1.5
@@ -20,7 +20,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* Base class for pdf bookmark extension objects.
@@ -35,10 +34,5 @@
public ExtensionObj(FONode parent) {
super(parent);
}
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveExtensionObj(this);
- }
-
}
1.7 +1 -7 xml-fop/src/java/org/apache/fop/fo/extensions/Label.java
Index: Label.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Label.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Label.java 27 Jul 2004 23:57:11 -0000 1.6
+++ Label.java 4 Aug 2004 22:50:57 -0000 1.7
@@ -21,8 +21,6 @@
import org.xml.sax.Locator;
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
/**
* Labal for PDF bookmark extension.
@@ -61,10 +59,6 @@
*/
public String toString() {
return label;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveLabel(this);
}
public String getName() {
1.9 +1 -6 xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java
Index: Outline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/Outline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Outline.java 1 Aug 2004 04:20:48 -0000 1.8
+++ Outline.java 4 Aug 2004 22:50:57 -0000 1.9
@@ -19,7 +19,6 @@
package org.apache.fop.fo.extensions;
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import java.util.ArrayList;
@@ -87,10 +86,6 @@
*/
public String getLabel() {
return label == null ? "" : label.toString();
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveOutline(this);
}
public String getInternalDestination() {
1.16 +0 -5 xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FootnoteBody.java 1 Aug 2004 04:20:48 -0000 1.15
+++ FootnoteBody.java 4 Aug 2004 22:50:57 -0000 1.16
@@ -26,7 +26,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* Class modelling the fo:footnote-body object. See Sec. 6.10.4 of the XSL-FO
@@ -54,10 +53,6 @@
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
getFOInputHandler().startFootnoteBody(this);
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveFootnoteBody(this);
}
protected void endOfNode() throws SAXParseException {
1.14 +0 -10 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ListItemBody.java 27 Jul 2004 23:57:12 -0000 1.13
+++ ListItemBody.java 4 Aug 2004 22:50:57 -0000 1.14
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.properties.CommonAccessibility;
/**
@@ -59,15 +58,6 @@
*/
protected boolean containsMarkers() {
return true;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveListItemBody(this);
}
public String getName() {
1.22 +0 -10 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ListItemLabel.java 1 Aug 2004 04:20:48 -0000 1.21
+++ ListItemLabel.java 4 Aug 2004 22:50:57 -0000 1.22
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.properties.CommonAccessibility;
/**
@@ -71,15 +70,6 @@
*/
protected boolean containsMarkers() {
return true;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveListItemLabel(this);
}
protected void endOfNode() throws SAXParseException {
1.13 +0 -5 xml-fop/src/java/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Marker.java 1 Aug 2004 04:20:49 -0000 1.12
+++ Marker.java 4 Aug 2004 22:50:57 -0000 1.13
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* Marker formatting object.
@@ -61,10 +60,6 @@
*/
public String getMarkerClassName() {
return markerClassName;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveMarker(this);
}
public String getName() {
1.25 +0 -10 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TableColumn.java 1 Aug 2004 04:20:49 -0000 1.24
+++ TableColumn.java 4 Aug 2004 22:50:57 -0000 1.25
@@ -28,7 +28,6 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -121,15 +120,6 @@
setupID();
initialized = true;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveTableColumn(this);
}
protected void endOfNode() throws SAXParseException {
1.14 +1 -6 xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ColorProfile.java 27 Jul 2004 23:57:15 -0000 1.13
+++ ColorProfile.java 4 Aug 2004 22:50:57 -0000 1.14
@@ -33,7 +33,6 @@
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* The fo:color-profile formatting object.
@@ -110,10 +109,6 @@
} catch (IllegalArgumentException iae) {
getLogger().error("Color Profile src not an ICC Profile", iae);
}
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveColorProfile(this);
}
public String getName() {
1.16 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ConditionalPageMasterReference.java 1 Aug 2004 04:20:50 -0000 1.15
+++ ConditionalPageMasterReference.java 4 Aug 2004 22:50:57 -0000 1.16
@@ -26,7 +26,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* A conditional-page-master-reference formatting object.
@@ -171,10 +170,6 @@
+ "of fo:repeatable-page-master-alternatives,
not "
+ parent.getName(), locator);
}
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveConditionalPageMasterReference(this);
}
public String getName() {
1.15 +1 -6 xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Declarations.java 27 Jul 2004 23:57:15 -0000 1.14
+++ Declarations.java 4 Aug 2004 22:50:58 -0000 1.15
@@ -32,7 +32,6 @@
import org.apache.fop.fo.FOElementMapping;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.XMLObj;
@@ -104,10 +103,6 @@
}
}
childNodes = null;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveDeclarations(this);
}
public String getName() {
1.19 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LayoutMasterSet.java 1 Aug 2004 04:20:50 -0000 1.18
+++ LayoutMasterSet.java 4 Aug 2004 22:50:58 -0000 1.19
@@ -31,7 +31,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.apps.FOPException;
/**
@@ -215,10 +214,6 @@
}
}
return false;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveLayoutMasterSet(this);
}
public String getName() {
1.10 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java
Index: PageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageMasterReference.java 1 Aug 2004 04:20:50 -0000 1.9
+++ PageMasterReference.java 4 Aug 2004 22:50:58 -0000 1.10
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* Base PageMasterReference class. Provides implementation for handling the
@@ -84,10 +83,6 @@
+ "child of fo:page-sequence-master, not "
+ parent.getName(), locator);
}
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.servePageMasterReference(this);
}
public String getName() {
1.34 +0 -9 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- PageSequence.java 1 Aug 2004 04:20:50 -0000 1.33
+++ PageSequence.java 4 Aug 2004 22:50:58 -0000 1.34
@@ -31,7 +31,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.apps.FOPException;
/**
@@ -690,14 +689,6 @@
*/
public Title getTitleFO() {
return titleFO;
- }
-
- /**
- * Hook for Visitor objects accessing the FO Tree.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.servePageSequence(this);
}
/**
1.16 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PageSequenceMaster.java 1 Aug 2004 04:20:50 -0000 1.15
+++ PageSequenceMaster.java 4 Aug 2004 22:50:58 -0000 1.16
@@ -31,7 +31,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.apps.FOPException;
/**
@@ -198,10 +197,6 @@
+ masterName + "'");
}
return pageMaster;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.servePageSequenceMaster(this);
}
public String getName() {
1.27 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Region.java 1 Aug 2004 15:26:52 -0000 1.26
+++ Region.java 4 Aug 2004 22:50:58 -0000 1.27
@@ -28,7 +28,6 @@
// FOP
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.FObj;
/**
1.12 +0 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RegionAfter.java 27 Jul 2004 23:57:16 -0000 1.11
+++ RegionAfter.java 4 Aug 2004 22:50:58 -0000 1.12
@@ -23,7 +23,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.datatypes.FODimension;
/**
@@ -67,15 +66,6 @@
*/
public int getRegionClassCode() {
return Region.AFTER_CODE;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRegionAfter(this);
}
public String getName() {
1.14 +0 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
Index: RegionBA.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RegionBA.java 1 Aug 2004 15:26:52 -0000 1.13
+++ RegionBA.java 4 Aug 2004 22:50:58 -0000 1.14
@@ -27,8 +27,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
/**
* Abstract base class for fo:region-before and fo:region-after.
1.13 +0 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionBefore.java 1 Aug 2004 15:26:52 -0000 1.12
+++ RegionBefore.java 4 Aug 2004 22:50:58 -0000 1.13
@@ -24,7 +24,6 @@
// FOP
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* The fo:region-before element.
@@ -72,15 +71,6 @@
adjustIPD(vpRect, this.wm);
}
return vpRect;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRegionBefore(this);
}
public String getName() {
1.25 +0 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RegionBody.java 27 Jul 2004 23:57:16 -0000 1.24
+++ RegionBody.java 4 Aug 2004 22:50:58 -0000 1.25
@@ -28,7 +28,6 @@
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.CommonMarginBlock;
@@ -105,15 +104,6 @@
*/
public int getRegionClassCode() {
return Region.BODY_CODE;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRegionBody(this);
}
public String getName() {
1.12 +0 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RegionEnd.java 27 Jul 2004 23:57:16 -0000 1.11
+++ RegionEnd.java 4 Aug 2004 22:50:58 -0000 1.12
@@ -23,7 +23,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.datatypes.FODimension;
/**
@@ -68,15 +67,6 @@
*/
public int getRegionClassCode() {
return Region.END_CODE;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRegionEnd(this);
}
public String getName() {
1.9 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java
Index: RegionSE.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RegionSE.java 1 Aug 2004 15:26:53 -0000 1.8
+++ RegionSE.java 4 Aug 2004 22:50:58 -0000 1.9
@@ -27,7 +27,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* Abstract base class for fo:region-start and fo:region-end.
1.12 +0 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RegionStart.java 27 Jul 2004 23:57:16 -0000 1.11
+++ RegionStart.java 4 Aug 2004 22:50:58 -0000 1.12
@@ -23,7 +23,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.datatypes.FODimension;
/**
@@ -67,15 +66,6 @@
*/
public int getRegionClassCode() {
return Region.START_CODE;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRegionStart(this);
}
public String getName() {
1.14 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RepeatablePageMasterAlternatives.java 1 Aug 2004 04:20:50 -0000 1.13
+++ RepeatablePageMasterAlternatives.java 4 Aug 2004 22:50:58 -0000 1.14
@@ -30,7 +30,6 @@
import org.apache.fop.fo.FOElementMapping;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* A repeatable-page-master-alternatives formatting object.
@@ -154,10 +153,6 @@
*/
public void reset() {
this.numberConsumed = 0;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRepeatablePageMasterAlternatives(this);
}
public String getName() {
1.13 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RepeatablePageMasterReference.java 1 Aug 2004 04:20:50 -0000 1.12
+++ RepeatablePageMasterReference.java 4 Aug 2004 22:50:58 -0000 1.13
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* A repeatable-page-master-reference formatting object.
@@ -102,10 +101,6 @@
*/
public void reset() {
this.numberConsumed = 0;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRepeatablePageMasterReference(this);
}
public String getName() {
1.20 +0 -8 xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Root.java 27 Jul 2004 23:57:16 -0000 1.19
+++ Root.java 4 Aug 2004 22:50:58 -0000 1.20
@@ -224,14 +224,6 @@
return foInputHandler;
}
- /**
- * Hook for Visitor objects accessing the FO Tree.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveRoot(this);
- }
-
public String getName() {
return "fo:root";
}
1.21 +0 -10
xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SimplePageMaster.java 1 Aug 2004 04:20:50 -0000 1.20
+++ SimplePageMaster.java 4 Aug 2004 22:50:58 -0000 1.21
@@ -30,7 +30,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* A simple-page-master formatting object.
@@ -155,15 +154,6 @@
}
}
return false;
- }
-
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveSimplePageMaster(this);
}
public String getName() {
1.10 +0 -5
xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
Index: SinglePageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SinglePageMasterReference.java 31 Jul 2004 00:44:23 -0000 1.9
+++ SinglePageMasterReference.java 4 Aug 2004 22:50:58 -0000 1.10
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
/**
* A single-page-master-reference formatting object.
@@ -76,10 +75,6 @@
*/
public void reset() {
this.state = FIRST;
- }
-
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveSinglePageMasterReference(this);
}
public String getName() {
1.47 +1 -231 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- AddLMVisitor.java 4 Aug 2004 22:21:04 -0000 1.46
+++ AddLMVisitor.java 4 Aug 2004 22:50:59 -0000 1.47
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.ListIterator;
-
import org.apache.fop.area.LinkResolver;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.Resolveable;
@@ -48,10 +47,6 @@
import org.apache.fop.fo.TextInfo;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.XMLObj;
-import org.apache.fop.fo.extensions.Bookmarks;
-import org.apache.fop.fo.extensions.ExtensionObj;
-import org.apache.fop.fo.extensions.Label;
-import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.flow.BasicLink;
import org.apache.fop.fo.flow.BidiOverride;
import org.apache.fop.fo.flow.Block;
@@ -59,7 +54,6 @@
import org.apache.fop.fo.flow.Character;
import org.apache.fop.fo.flow.ExternalGraphic;
import org.apache.fop.fo.flow.Footnote;
-import org.apache.fop.fo.flow.FootnoteBody;
import org.apache.fop.fo.flow.Inline;
import org.apache.fop.fo.flow.InlineContainer;
import org.apache.fop.fo.flow.InstreamForeignObject;
@@ -68,7 +62,6 @@
import org.apache.fop.fo.flow.ListItem;
import org.apache.fop.fo.flow.ListItemBody;
import org.apache.fop.fo.flow.ListItemLabel;
-import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.flow.PageNumber;
import org.apache.fop.fo.flow.PageNumberCitation;
import org.apache.fop.fo.flow.RetrieveMarker;
@@ -81,27 +74,7 @@
import org.apache.fop.fo.flow.TableHeader;
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.flow.Wrapper;
-import org.apache.fop.fo.pagination.ColorProfile;
-import org.apache.fop.fo.pagination.ConditionalPageMasterReference;
-import org.apache.fop.fo.pagination.Declarations;
import org.apache.fop.fo.pagination.Flow;
-import org.apache.fop.fo.pagination.LayoutMasterSet;
-import org.apache.fop.fo.pagination.PageMasterReference;
-import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.fo.pagination.PageSequenceMaster;
-import org.apache.fop.fo.pagination.Region;
-import org.apache.fop.fo.pagination.RegionAfter;
-import org.apache.fop.fo.pagination.RegionBA;
-import org.apache.fop.fo.pagination.RegionBefore;
-import org.apache.fop.fo.pagination.RegionBody;
-import org.apache.fop.fo.pagination.RegionEnd;
-import org.apache.fop.fo.pagination.RegionSE;
-import org.apache.fop.fo.pagination.RegionStart;
-import org.apache.fop.fo.pagination.RepeatablePageMasterAlternatives;
-import org.apache.fop.fo.pagination.RepeatablePageMasterReference;
-import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.fo.pagination.SimplePageMaster;
-import org.apache.fop.fo.pagination.SinglePageMasterReference;
import org.apache.fop.fo.pagination.StaticContent;
import org.apache.fop.fo.pagination.Title;
import org.apache.fop.fo.properties.CommonBackground;
@@ -811,55 +784,6 @@
}
/**
- * @param node ColorProfile object to process
- */
- public void serveColorProfile(ColorProfile node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node ConditionalPageMasterReference object to process
- */
- public void serveConditionalPageMasterReference(ConditionalPageMasterReference
node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node Declarations object to process
- */
- public void serveDeclarations(Declarations node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node ExtensionObj object to process
- */
- public void serveExtensionObj(ExtensionObj node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node Bookmarks object to process
- */
- public void serveBookmarks(Bookmarks node) {
- serveExtensionObj((ExtensionObj)node);
- }
-
- /**
- * @param node Label object to process
- */
- public void serveLabel(Label node) {
- serveExtensionObj((ExtensionObj)node);
- }
-
- /**
- * @param node Outline object to process
- */
- public void serveOutline(Outline node) {
- serveExtensionObj((ExtensionObj)node);
- }
-
- /**
* @param node StaticContent object to process
*/
public void serveStaticContent(StaticContent node) {
@@ -867,13 +791,6 @@
}
/**
- * @param node Marker object to process
- */
- public void serveMarker(Marker node) {
- serveFObjMixed((FObjMixed)node);
- }
-
- /**
* @param node Title object to process
*/
public void serveTitle(Title node) {
@@ -881,146 +798,6 @@
}
/**
- * @param node FootnoteBody object to process
- */
- public void serveFootnoteBody(FootnoteBody node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node LayoutMasterSet object to process
- */
- public void serveLayoutMasterSet(LayoutMasterSet node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node ListItemBody object to process
- */
- public void serveListItemBody(ListItemBody node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node ListItemLabel object to process
- */
- public void serveListItemLabel(ListItemLabel node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node PageMasterReference object to process
- */
- public void servePageMasterReference(PageMasterReference node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node RepeatablePageMasterReference object to process
- */
- public void serveRepeatablePageMasterReference(RepeatablePageMasterReference
node) {
- servePageMasterReference((PageMasterReference)node);
- }
-
- /**
- * @param node SinglePageMasterReference object to process
- */
- public void serveSinglePageMasterReference(SinglePageMasterReference node) {
- servePageMasterReference((PageMasterReference)node);
- }
-
- /**
- * @param node PageSequence object to process
- */
- public void servePageSequence(PageSequence node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node PageSequenceMaster object to process
- */
- public void servePageSequenceMaster(PageSequenceMaster node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node Region object to process
- */
- public void serveRegion(Region node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node RegionBA object to process
- */
- public void serveRegionBA(RegionBA node) {
- serveRegion((Region)node);
- }
-
- /**
- * @param node RegionAfter object to process
- */
- public void serveRegionAfter(RegionAfter node) {
- serveRegionBA((RegionBA)node);
- }
-
- /**
- * @param node RegionBefore object to process
- */
- public void serveRegionBefore(RegionBefore node) {
- serveRegionBA((RegionBA)node);
- }
-
- /**
- * @param node RegionSE object to process
- */
- public void serveRegionSE(RegionSE node) {
- serveRegion((Region)node);
- }
-
- /**
- * @param node RegionEnd object to process
- */
- public void serveRegionEnd(RegionEnd node) {
- serveRegionSE((RegionSE)node);
- }
-
- /**
- * @param node RegionStart object to process
- */
- public void serveRegionStart(RegionStart node) {
- serveRegionSE((RegionSE)node);
- }
-
- /**
- * @param node RegionBody object to process
- */
- public void serveRegionBody(RegionBody node) {
- serveRegion((Region)node);
- }
-
- /**
- * @param node RepeatablePageMasterAlternatives object to process
- */
- public void
serveRepeatablePageMasterAlternatives(RepeatablePageMasterAlternatives node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node Root object to process
- */
- public void serveRoot(Root node) {
- serveFObj((FObj)node);
- }
-
- /**
- * @param node SimplePageMaster object to process
- */
- public void serveSimplePageMaster(SimplePageMaster node) {
- serveFObj((FObj)node);
- }
-
- /**
* @param node TableFooter object to process
*/
public void serveTableFooter(TableFooter node) {
@@ -1032,12 +809,5 @@
*/
public void serveTableHeader(TableHeader node) {
serveTableBody((TableBody)node);
- }
-
- /**
- * @param node TableColumn object to process
- */
- public void serveTableColumn(TableColumn node) {
- serveFObj((FObj)node);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
