svn commit: r1541865 - in /xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr: ./ inline/ table/

[vhennebert]

Author: vhennebert
Date: Thu Nov 14 09:47:24 2013
New Revision: 1541865

URL: http://svn.apache.org/r1541865
Log:
Fixed the setting of generates[Block|Reference]Area

Modified:
    
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
    
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
    
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
    
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
    
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java

Modified: 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java?rev=1541865&r1=1541864&r2=1541865&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
 Thu Nov 14 09:47:24 2013
@@ -65,9 +65,6 @@ public abstract class AbstractBaseLayout
     public AbstractBaseLayoutManager(FObj fo) {
         this.fobj = fo;
         setGeneratesReferenceArea(fo.generatesReferenceAreas());
-        if (getGeneratesReferenceArea()) {
-            setGeneratesBlockArea(true);
-        }
     }
 
     // --------- Property Resolution related functions --------- //

Modified: 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1541865&r1=1541864&r2=1541865&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 Thu Nov 14 09:47:24 2013
@@ -90,6 +90,7 @@ public class BlockContainerLayoutManager
      */
     public BlockContainerLayoutManager(BlockContainer node) {
         super(node);
+        setGeneratesBlockArea(true);
     }
 
     /** {@inheritDoc} */

Modified: 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=1541865&r1=1541864&r2=1541865&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
 Thu Nov 14 09:47:24 2013
@@ -58,6 +58,7 @@ public class FlowLayoutManager extends B
      */
     public FlowLayoutManager(PageSequenceLayoutManager pslm, Flow node) {
         super(node);
+        setGeneratesBlockArea(true);
         setParent(pslm);
     }
 

Modified: 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java?rev=1541865&r1=1541864&r2=1541865&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
 Thu Nov 14 09:47:24 2013
@@ -71,6 +71,7 @@ public class InlineContainerLayoutManage
 
     public InlineContainerLayoutManager(InlineContainer node) {
         super(node);
+        setGeneratesReferenceArea(true);
     }
 
     @Override
@@ -232,11 +233,6 @@ public class InlineContainerLayoutManage
     }
 
     @Override
-    public boolean getGeneratesReferenceArea() {
-        return true;
-    }
-
-    @Override
     public void addAreas(PositionIterator posIter, LayoutContext context) {
         Position inlineContainerPosition = null;
         while (posIter.hasNext()) {

Modified: 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=1541865&r1=1541864&r2=1541865&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
 Thu Nov 14 09:47:24 2013
@@ -117,6 +117,7 @@ public class TableCellLayoutManager exte
      */
     public TableCellLayoutManager(TableCell node, PrimaryGridUnit pgu) {
         super(node);
+        setGeneratesBlockArea(true);
         this.primaryGridUnit = pgu;
         this.isDescendantOfTableHeader = node.getParent().getParent() 
instanceof TableHeader
                 || node.getParent() instanceof TableHeader;



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org