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 kl...@apache.org on 2002/08/28 23:10:22 UTC
cvs commit: xml-fop/src/org/apache/fop/layoutmgr AbstractBPLayoutManager.java BPLayoutManager.java BlockLayoutManager.java ContentLayoutManager.java FlowLayoutManager.java InlineStackingBPLayoutManager.java LeafNodeLayoutManager.java LineBPLayoutManager.java PageLayoutManager.java StaticContentLayoutManager.java TextBPLayoutManager.java
klease 2002/08/28 14:10:22
Modified: src/org/apache/fop/layoutmgr AbstractBPLayoutManager.java
BPLayoutManager.java BlockLayoutManager.java
ContentLayoutManager.java FlowLayoutManager.java
InlineStackingBPLayoutManager.java
LeafNodeLayoutManager.java LineBPLayoutManager.java
PageLayoutManager.java
StaticContentLayoutManager.java
TextBPLayoutManager.java
Log:
Remove two parameter version of getNextBreakPoss method and remove all calls to it which always used a null second parameter
Revision Changes Path
1.9 +2 -7 xml-fop/src/org/apache/fop/layoutmgr/AbstractBPLayoutManager.java
Index: AbstractBPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/AbstractBPLayoutManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractBPLayoutManager.java 21 Aug 2002 09:17:42 -0000 1.8
+++ AbstractBPLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.9
@@ -157,14 +157,9 @@
* default implementation?
*/
public BreakPoss getNextBreakPoss(LayoutContext context) {
- return getNextBreakPoss(context, null);
- }
-
-
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevBreakPoss) {
return null;
}
+
/**
* Return value indicating whether the next area to be generated could
1.6 +1 -10 xml-fop/src/org/apache/fop/layoutmgr/BPLayoutManager.java
Index: BPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BPLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BPLayoutManager.java 8 Aug 2002 15:08:08 -0000 1.5
+++ BPLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.6
@@ -27,16 +27,7 @@
* space specifiers from ancestor areas or previous areas, reference
* area inline-progression-dimension and various other layout-related
* information.
- * @param prevBreakPosition If not null, gives a Position returned by
- * this layout manager on a previous call to getNextBreakPoss. It may not
- * be the previous one returned. The Layout Manager should return the next
- * potential Break Possibility after prevBreakPosition.
- * If prevBreakPosition is null, it should return the first possible
- * BreakPoss.
*/
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevBreakPosition);
-
public BreakPoss getNextBreakPoss(LayoutContext context);
1.16 +3 -5 xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BlockLayoutManager.java 22 Aug 2002 13:57:48 -0000 1.15
+++ BlockLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.16
@@ -108,9 +108,7 @@
return curBlockArea.getIPD();
}
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevLineBP) {
-
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
BPLayoutManager curLM ; // currently active LM
MinOptMax stackSize = new MinOptMax();
@@ -139,7 +137,7 @@
}
while (!curLM.isFinished()) {
- if ((bp = curLM.getNextBreakPoss(childLC, null)) != null) {
+ if ((bp = curLM.getNextBreakPoss(childLC)) != null) {
stackSize.add(bp.getStackingSize());
if (stackSize.min > context.getStackLimit().max) {
// reset to last break
1.2 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentLayoutManager.java 23 Aug 2002 13:45:25 -0000 1.1
+++ ContentLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.2
@@ -41,7 +41,7 @@
childLC.setRefIPD(ipd);
while (!curLM.isFinished()) {
- if ((bp = curLM.getNextBreakPoss(childLC, null)) != null) {
+ if ((bp = curLM.getNextBreakPoss(childLC)) != null) {
stack.add(bp.getStackingSize());
childBreaks.add(bp);
}
1.9 +3 -4 xml-fop/src/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FlowLayoutManager.java 21 Aug 2002 09:17:42 -0000 1.8
+++ FlowLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.9
@@ -36,8 +36,7 @@
super(fobj);
}
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevLineBP) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
BPLayoutManager curLM ; // currently active LM
MinOptMax stackSize = new MinOptMax();
@@ -54,7 +53,7 @@
childLC.setRefIPD(context.getRefIPD());
if (!curLM.isFinished()) {
- if ((bp = curLM.getNextBreakPoss(childLC, null)) != null) {
+ if ((bp = curLM.getNextBreakPoss(childLC)) != null) {
stackSize.add(bp.getStackingSize());
blockBreaks.add(bp);
// set stackLimit for remaining space
1.7 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/InlineStackingBPLayoutManager.java
Index: InlineStackingBPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/InlineStackingBPLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InlineStackingBPLayoutManager.java 9 Aug 2002 07:11:15 -0000 1.6
+++ InlineStackingBPLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.7
@@ -184,7 +184,7 @@
}
- public BreakPoss getNextBreakPoss(LayoutContext lc, Position pbp) {
+ public BreakPoss getNextBreakPoss(LayoutContext lc) {
// Get a break from currently active child LM
BreakPoss bp = null;
BPLayoutManager curLM ;
1.13 +2 -3 xml-fop/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LeafNodeLayoutManager.java 23 Aug 2002 13:45:25 -0000 1.12
+++ LeafNodeLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.13
@@ -66,8 +66,7 @@
return null;
}
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevBreakPoss) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
curArea = get(context);
if (curArea == null) {
setFinished(true);
1.16 +3 -4 xml-fop/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java
Index: LineBPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LineBPLayoutManager.java 22 Aug 2002 13:57:48 -0000 1.15
+++ LineBPLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.16
@@ -104,8 +104,7 @@
* generate inline areas. If a block-level generating LM is found,
* finish any line being filled and return to the parent LM.
*/
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevLineBP) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
// Get a break from currently active child LM
// Set up constraints for inline level managers
@@ -153,7 +152,7 @@
// GET NEXT POSSIBLE BREAK FROM CHILD LM
// prevBP = bp;
- if ((bp = curLM.getNextBreakPoss(inlineLC, null)) != null) {
+ if ((bp = curLM.getNextBreakPoss(inlineLC)) != null) {
// Add any space before and previous content dimension
MinOptMax prevIPD = updatePrevIPD(bp, prevBP,
(m_vecInlineBreaks.size() == iPrevLineEnd),
1.14 +5 -6 xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PageLayoutManager.java 19 Aug 2002 08:01:56 -0000 1.13
+++ PageLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.14
@@ -96,7 +96,7 @@
BreakPoss bp;
LayoutContext childLC = new LayoutContext(0);
while (!isFinished()) {
- if ((bp = getNextBreakPoss(childLC, null)) != null) {
+ if ((bp = getNextBreakPoss(childLC)) != null) {
addAreas((BlockBreakPosition)bp.getPosition());
// add static areas and resolve any new id areas
@@ -108,8 +108,7 @@
}
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevLineBP) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
BPLayoutManager curLM ; // currently active LM
@@ -121,7 +120,7 @@
childLC.setRefIPD(flowIPD);
if (!curLM.isFinished()) {
- bp = curLM.getNextBreakPoss(childLC, null);
+ bp = curLM.getNextBreakPoss(childLC);
}
if(bp != null) {
return new BreakPoss(
@@ -242,7 +241,7 @@
childLC.setRefIPD((int)reg.getViewArea().getWidth());
while (!lm.isFinished()) {
- BreakPoss bp = lm.getNextBreakPoss(childLC, null);
+ BreakPoss bp = lm.getNextBreakPoss(childLC);
if (bp != null) {
ArrayList vecBreakPoss = new ArrayList();
vecBreakPoss.add(bp);
1.2 +3 -4 xml-fop/src/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Index: StaticContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StaticContentLayoutManager.java 17 Aug 2002 23:51:08 -0000 1.1
+++ StaticContentLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.2
@@ -34,8 +34,7 @@
this.region = region;
}
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevLineBP) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
BPLayoutManager curLM ; // currently active LM
@@ -45,7 +44,7 @@
BreakPoss bp;
LayoutContext childLC = context;
if (!curLM.isFinished()) {
- if ((bp = curLM.getNextBreakPoss(childLC, null)) != null) {
+ if ((bp = curLM.getNextBreakPoss(childLC)) != null) {
blockBreaks.add(bp);
if(bp.isForcedBreak()) {
System.out.println("Forced breaks are not allowed in static content");
1.12 +2 -6 xml-fop/src/org/apache/fop/layoutmgr/TextBPLayoutManager.java
Index: TextBPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/TextBPLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TextBPLayoutManager.java 18 Aug 2002 13:47:13 -0000 1.11
+++ TextBPLayoutManager.java 28 Aug 2002 21:10:21 -0000 1.12
@@ -201,9 +201,6 @@
* Return the next break possibility that fits the constraints.
* @param context An object specifying the flags and input information
* concerning the context of the BreakPoss.
- * @para prevPos An object specifying the previous Position returned
- * by a BreakPoss from this LM. It may be earlier than the current
- * pointer when doing hyphenation or starting a new line.
* @return BreakPoss An object containing information about the next
* legal break position or the end of the text run if no break
* was found.
@@ -215,8 +212,7 @@
* There may be LINEFEED characters if they weren't converted
* into spaces. A LINEFEED always forces a break.
*/
- public BreakPoss getNextBreakPoss(LayoutContext context,
- Position prevPos) {
+ public BreakPoss getNextBreakPoss(LayoutContext context) {
/* On first call in a new Line, the START_AREA
* flag in LC is set.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org