You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2005/06/11 00:17:39 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java InlineStackingLayoutManager.java LeafNodeLayoutManager.java TextLayoutManager.java ContentLayoutManager.java LayoutManager.java FootnoteLayoutManager.java
gmazza 2005/06/10 15:17:39
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
InlineStackingLayoutManager.java
LeafNodeLayoutManager.java TextLayoutManager.java
ContentLayoutManager.java LayoutManager.java
FootnoteLayoutManager.java
Log:
generatesInlineAreas() methods removed.
Revision Changes Path
1.54 +0 -11 xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- AbstractLayoutManager.java 10 Jun 2005 04:04:49 -0000 1.53
+++ AbstractLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.54
@@ -83,11 +83,6 @@
return this.parentLM;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#generatesInlineAreas() */
- public boolean generatesInlineAreas() {
- return false;
- }
-
/**
* Return currently active child LayoutManager or null if
* all children have finished layout.
@@ -162,12 +157,6 @@
public void addAreas(PositionIterator posIter, LayoutContext context) {
}
-
- /* ---------------------------------------------------------
- * PROVIDE NULL IMPLEMENTATIONS OF METHODS from LayoutManager
- * interface which are declared abstract in AbstractLayoutManager.
- * ---------------------------------------------------------*/
-
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
log.warn("null implementation of getNextKnuthElements() called!");
1.25 +0 -11 xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- InlineStackingLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.24
+++ InlineStackingLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.25
@@ -102,16 +102,6 @@
childLMiter = iter;
}
- /**
- * Check if this generates inline areas.
- * This creates inline areas that contain other inline areas.
- *
- * @return true
- */
- public boolean generatesInlineAreas() {
- return true;
- }
-
protected MinOptMax getExtraIPD(boolean bNotFirst, boolean bNotLast) {
return new MinOptMax(0);
}
@@ -545,4 +535,3 @@
return returnList;
}
}
-
1.19 +0 -8 xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LeafNodeLayoutManager.java 10 Jun 2005 11:34:21 -0000 1.18
+++ LeafNodeLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.19
@@ -93,14 +93,6 @@
}
/**
- * Check if this generates inline areas.
- * @return true always since this is an inline area manager
- */
- public boolean generatesInlineAreas() {
- return true;
- }
-
- /**
* Check if this inline area is resolved due to changes in
* page or ipd.
* Currently not used.
1.37 +0 -9 xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
Index: TextLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TextLayoutManager.java 10 Jun 2005 03:56:49 -0000 1.36
+++ TextLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.37
@@ -186,15 +186,6 @@
}
/**
- * Text always generates inline areas.
- *
- * @return true
- */
- public boolean generatesInlineAreas() {
- return true;
- }
-
- /**
* Reset position for returning next BreakPossibility.
*
* @param prevPos the position to reset to
1.33 +0 -5 xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ContentLayoutManager.java 10 Jun 2005 03:56:49 -0000 1.32
+++ ContentLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.33
@@ -162,11 +162,6 @@
}
/** @see org.apache.fop.layoutmgr.LayoutManager */
- public boolean generatesInlineAreas() {
- return true;
- }
-
- /** @see org.apache.fop.layoutmgr.LayoutManager */
public Area getParentArea(Area childArea) {
return holder;
}
1.29 +0 -9 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- LayoutManager.java 10 Jun 2005 03:56:49 -0000 1.28
+++ LayoutManager.java 10 Jun 2005 22:17:38 -0000 1.29
@@ -50,15 +50,6 @@
PageSequenceLayoutManager getPSLM();
/**
- * Generates inline areas.
- * This is used to check if the layout manager generates inline
- * areas.
- *
- * @return true if the layout manager generates inline areas
- */
- boolean generatesInlineAreas();
-
- /**
* Reset to the position.
*
* @param position the Position to reset to
1.4 +1 -5 xml-fop/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java
Index: FootnoteLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FootnoteLayoutManager.java 10 Jun 2005 04:04:49 -0000 1.3
+++ FootnoteLayoutManager.java 10 Jun 2005 22:17:38 -0000 1.4
@@ -46,10 +46,6 @@
bodyLM = new FootnoteBodyLayoutManager(footnote.getFootnoteBody());
}
- public boolean generatesInlineAreas() {
- return true;
- }
-
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
// this is the only method that must be implemented:
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org