svn commit: r679052 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ src/java/org/apache/fop/area/BlockParent.java src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java

[acumiskey]

Author: acumiskey
Date: Wed Jul 23 02:57:22 2008
New Revision: 679052

URL: http://svn.apache.org/viewvc?rev=679052&view=rev
Log:
Merged revisions 678730,679044 via svnmerge from 
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r678730 | acumiskey | 2008-07-22 13:14:37 +0100 (Tue, 22 Jul 2008) | 1 line
  
  Lets free a little memory in every BlockParent :)..  Commented out the unused 
private member variable 'orientation'.
........
  r679044 | acumiskey | 2008-07-23 10:26:40 +0100 (Wed, 23 Jul 2008) | 2 lines
  
  Minor optimization.
........

Modified:
    xmlgraphics/fop/branches/Temp_AFPGOCAResources/   (props changed)
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/BlockParent.java
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java

Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 23 02:57:22 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-678711
+/xmlgraphics/fop/trunk:1-679051

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/BlockParent.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/BlockParent.java?rev=679052&r1=679051&r2=679052&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/BlockParent.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/BlockParent.java
 Wed Jul 23 02:57:22 2008
@@ -51,7 +51,7 @@
     protected List children = null;
 
     // orientation if reference area
-    private int orientation = ORIENT_0;
+//    private int orientation = ORIENT_0;
 
     /** [EMAIL PROTECTED] */
     public void addChildArea(Area childArea) {

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=679052&r1=679051&r2=679052&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 Wed Jul 23 02:57:22 2008
@@ -196,8 +196,6 @@
             return getNextKnuthElementsAbsolute(context, alignment);
         }
         
-        boolean switchedProgressionDirection
-            = (getBlockContainerFO().getReferenceOrientation() % 180 != 0);
         autoHeight = false;
         //boolean rotated = (getBlockContainerFO().getReferenceOrientation() % 
180 != 0);
         int maxbpd = context.getStackLimitBP().opt;
@@ -354,6 +352,8 @@
             if (autoHeight) {
                 //Update content BPD now that it is known
                 int newHeight = breaker.deferredAlg.totalWidth;
+                boolean switchedProgressionDirection
+                    = (getBlockContainerFO().getReferenceOrientation() % 180 
!= 0);
                 if (switchedProgressionDirection) {
                     setContentAreaIPD(newHeight);
                 } else {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]