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 ad...@apache.org on 2008/04/27 01:08:03 UTC
svn commit: r651867 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr: ./ list/ table/
Author: adelmelle
Date: Sat Apr 26 16:07:51 2008
New Revision: 651867
URL: http://svn.apache.org/viewvc?rev=651867&view=rev
Log:
Minor refactoring: consolidate getPSLM().notifyEndOfLayout(fobj.getId()) in AbstractLayoutManager.notifyEndOfLayout()
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -60,7 +60,6 @@
/** child LM and child LM iterator during getNextKnuthElement phase */
protected LayoutManager curChildLM = null;
- /** child LM and child LM iterator during getNextKnuthElement phase */
protected ListIterator childLMiter = null;
private int lastGeneratedPosition = -1;
@@ -231,6 +230,7 @@
/**
* @see PageSequenceLayoutManager#getCurrentPage()
+ * @return the {@link Page} instance corresponding to the current page
*/
public Page getCurrentPage() {
return getPSLM().getCurrentPage();
@@ -344,7 +344,7 @@
* @param targetArea the area to set the attributes on
*/
protected void transferForeignAttributes(Area targetArea) {
- Map atts = getFObj().getForeignAttributes();
+ Map atts = fobj.getForeignAttributes();
targetArea.setForeignAttributes(atts);
}
@@ -373,7 +373,17 @@
getPSLM().addIDToPage(fobj.getId());
}
}
-
+
+ /**
+ * Notifies the {@link PageSequenceLayoutManager} that layout
+ * for this LM has ended.
+ */
+ protected void notifyEndOfLayout() {
+ if (fobj != null) {
+ getPSLM().notifyEndOfLayout(fobj.getId());
+ }
+ }
+
/** {@inheritDoc} */
public String toString() {
return (super.toString() + (fobj != null ? "[fobj=" + fobj.toString() + "]" : ""));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -442,8 +442,7 @@
}
}
} else {
- int maxbpd = context.getStackLimitBP().opt;
- allocBPD = maxbpd;
+ allocBPD = context.getStackLimitBP().opt;
if (!switchedProgressionDirection) {
autoHeight = true;
}
@@ -601,13 +600,10 @@
}
public boolean isOverflow() {
- if (isEmpty()) {
- return false;
- } else {
- return (deferredAlg.getPageBreaks().size() > 1)
- || (deferredAlg.totalWidth - deferredAlg.totalShrink)
- > deferredAlg.getLineWidth();
- }
+ return !isEmpty()
+ && ((deferredAlg.getPageBreaks().size() > 1)
+ || (deferredAlg.totalWidth - deferredAlg.totalShrink)
+ > deferredAlg.getLineWidth());
}
public int getOverflowAmount() {
@@ -879,8 +875,8 @@
viewportBlockArea = null;
referenceArea = null;
resetSpaces();
-
- getPSLM().notifyEndOfLayout(fobj.getId());
+
+ notifyEndOfLayout();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -153,6 +153,7 @@
}
/**
+ * @param pos ...
* @return true if new child lms were added
*/
protected boolean createNextChildLMs(int pos) {
@@ -210,7 +211,7 @@
/** {@inheritDoc} */
public int getKeepTogetherStrength() {
- KeepProperty keep = getBlockFO().getKeepTogether();
+ KeepProperty keep = getBlockFO().getKeepTogether();
int strength = KeepUtil.getCombinedBlockLevelKeepStrength(keep);
strength = Math.max(strength, getParentKeepTogetherStrength());
return strength;
@@ -392,7 +393,7 @@
resetSpaces();
// Notify end of block layout manager to the PSLM
- getPSLM().notifyEndOfLayout(getBlockFO().getId());
+ notifyEndOfLayout();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -219,7 +219,7 @@
curBlockArea = null;
resetSpaces();
- getPSLM().notifyEndOfLayout(fobj.getId());
+ notifyEndOfLayout();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -172,7 +172,7 @@
curBlockArea = null;
- getPSLM().notifyEndOfLayout(fobj.getId());
+ notifyEndOfLayout();
}
/**
@@ -236,6 +236,6 @@
public int getKeepWithPreviousStrength() {
return KEEP_AUTO;
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -288,7 +288,7 @@
if (end[1] + 1 == elementLists[1].size()) {
keepWithNextActive = Math.max(keepWithNextActive, keepWithNextPendingOnBody);
}
-
+
// compute penalty height and box height
int penaltyHeight = step
+ getMaxRemainingHeight(fullHeights, partialHeights)
@@ -557,7 +557,7 @@
curBlockArea = null;
resetSpaces();
- getPSLM().notifyEndOfLayout(fobj.getId());
+ notifyEndOfLayout();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -199,7 +199,7 @@
p.setP(0);
}
- getPSLM().notifyEndOfLayout(fobj.getId());
+ notifyEndOfLayout();
setFinished(true);
return returnList;
@@ -575,7 +575,7 @@
public int getKeepWithPreviousStrength() {
return KEEP_AUTO; //TODO FIX ME (table-cell has no keep-with-previous!)
}
-
+
// --------- Property Resolution related functions --------- //
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=651867&r1=651866&r2=651867&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Sat Apr 26 16:07:51 2008
@@ -381,7 +381,7 @@
resetSpaces();
curBlockArea = null;
- getPSLM().notifyEndOfLayout(fobj.getId());
+ notifyEndOfLayout();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org