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/09 00:06:32 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr InlineLayoutManager.java AbstractLayoutManager.java InlineStackingLayoutManager.java LeafNodeLayoutManager.java TextLayoutManager.java ContentLayoutManager.java LayoutManager.java
gmazza 2005/06/08 15:06:32
Modified: src/java/org/apache/fop/layoutmgr InlineLayoutManager.java
AbstractLayoutManager.java
InlineStackingLayoutManager.java
LeafNodeLayoutManager.java TextLayoutManager.java
ContentLayoutManager.java LayoutManager.java
Log:
LayoutManager.canBreakBefore() removed.
Revision Changes Path
1.7 +1 -17 xml-fop/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java
Index: InlineLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InlineLayoutManager.java 7 Jun 2005 20:43:42 -0000 1.6
+++ InlineLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.7
@@ -18,11 +18,9 @@
package org.apache.fop.layoutmgr;
-import java.util.List;
import java.util.ListIterator;
import java.util.LinkedList;
-import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.InlineLevel;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginInline;
@@ -99,20 +97,6 @@
return inlineProps.spaceEnd;
}
- /**
- * Return value indicating whether the next area to be generated could
- * start a new line. This should only be called in the "START" condition
- * if a previous inline BP couldn't end the line.
- * Return true if any space-start, border-start or padding-start, else
- * propagate to first child LM
- */
- public boolean canBreakBefore(LayoutContext context) {
- if (new SpaceVal(inlineProps.spaceStart).getSpace().min > 0 || hasLeadingFence(false)) {
- return true;
- }
- return super.canBreakBefore(context);
- }
-
protected void setTraits(boolean bNotFirst, boolean bNotLast) {
// Add border and padding to current area and set flags (FIRST, LAST ...)
1.49 +0 -18 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- AbstractLayoutManager.java 7 Jun 2005 20:43:42 -0000 1.48
+++ AbstractLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.49
@@ -156,24 +156,6 @@
bFinished = fin;
}
-
- /**
- * Return value indicating whether the next area to be generated could
- * start a new line or flow area.
- * In general, if can't break at the current level, delegate to
- * the first child LM.
- * NOTE: should only be called if the START_AREA flag is set in context,
- * since the previous sibling LM must have returned a BreakPoss which
- * does not allow break-after.
- * QUESTION: in block-stacked areas, does this mean some kind of keep
- * condition, or is it only used for inline-stacked areas?
- * Default implementation always returns true.
- */
- public boolean canBreakBefore(LayoutContext context) {
- return true;
- }
-
-
/**
* @see org.apache.fop.layoutmgr.LayoutManager#addAreas(org.apache.fop.layoutmgr.PositionIterator, org.apache.fop.layoutmgr.LayoutContext)
*/
1.24 +0 -16 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- InlineStackingLayoutManager.java 17 May 2005 17:00:24 -0000 1.23
+++ InlineStackingLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.24
@@ -168,22 +168,6 @@
// What about prevBP?
}
- /**
- * Return value indicating whether the next area to be generated could
- * start a new line. This should only be called in the "START" condition
- * if a previous inline BP couldn't end the line.
- * Return true if any space-start, border-start or padding-start, else
- * propagate to first child LM
- */
- public boolean canBreakBefore(LayoutContext context) {
- LayoutManager lm = getChildLM();
- if (lm != null) {
- return lm.canBreakBefore(context);
- } else {
- return false; // ??? NO child LM?
- }
- }
-
protected MinOptMax getPrevIPD(LayoutManager lm) {
return (MinOptMax) hmPrevIPD.get(lm);
}
1.17 +0 -9 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LeafNodeLayoutManager.java 17 May 2005 16:58:52 -0000 1.16
+++ LeafNodeLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.17
@@ -242,15 +242,6 @@
area.setIPD(width);
}
- /**
- * Check if can break before this area.
- * @param context the layout context to check for the break
- * @return true if can break before this area in the context
- */
- public boolean canBreakBefore(LayoutContext context) {
- return true;
- }
-
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
MinOptMax ipd;
1.35 +0 -18 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- TextLayoutManager.java 17 May 2005 17:00:24 -0000 1.34
+++ TextLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.35
@@ -219,24 +219,6 @@
}
/**
- * Return value indicating whether the next area to be generated could
- * start a new line. This should only be called in the "START" condition
- * if a previous inline BP couldn't end the line.
- * Return true if the first character is a potential linebreak character.
- *
- * @param context the layout context for determining a break
- * @return true if can break before this text
- */
- public boolean canBreakBefore(LayoutContext context) {
- char c = textArray[iNextStart];
- return ((c == NEWLINE) || (foText.getWrapOption() == EN_WRAP
- && (CharUtilities.isBreakableSpace(c)
- || (BREAK_CHARS.indexOf(c) >= 0
- && (iNextStart == 0
- || Character.isLetterOrDigit(textArray[iNextStart-1]))))));
- }
-
- /**
* Reset position for returning next BreakPossibility.
*
* @param prevPos the position to reset to
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ContentLayoutManager.java 7 Jun 2005 20:43:43 -0000 1.29
+++ ContentLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.30
@@ -203,11 +203,6 @@
}
/** @see org.apache.fop.layoutmgr.LayoutManager */
- public boolean canBreakBefore(LayoutContext lc) {
- return false;
- }
-
- /** @see org.apache.fop.layoutmgr.LayoutManager */
public boolean isFinished() {
return false;
}
1.27 +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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- LayoutManager.java 7 Jun 2005 20:43:43 -0000 1.26
+++ LayoutManager.java 8 Jun 2005 22:06:32 -0000 1.27
@@ -59,15 +59,6 @@
boolean generatesInlineAreas();
/**
- * Return true if the next area which would be generated by this
- * LayoutManager could start a new line (or flow for block-level FO).
- *
- * @param lc the layout context
- * @return true if can break before
- */
- boolean canBreakBefore(LayoutContext lc);
-
- /**
* Reset to the position.
*
* @param position the Position to reset to
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org