[FOray-commit] SF.net SVN: foray: [7255] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java

[<vic...@us...>]

Revision: 7255
Author:   victormote
Date:     2006-05-25 12:18:36 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7255&view=rev

Log Message:
-----------
Use new axsl convenience methods to fix NPE (restores similar functionality to the code that existed before splitting the Area and Layout code).

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-05-25 19:17:49 UTC (rev 7254)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-05-25 19:18:36 UTC (rev 7255)
@@ -49,11 +49,8 @@
         }
         
         // Compute effective width & height of containing Area
-        org.axsl.areaW.Area nearest = area.nearestGeneratedByBlockLevelFO();
-        int height = nearest.crBPD();
-        height = node.getHeight(height);
-        int width = nearest.crIPD();
-        width = node.getWidth(width);
+        int height = node.getHeight(area.crBPDNearestGeneratedByBlockLevelFO());
+        int width = node.getWidth(area.crIPDNearestGeneratedByBlockLevelFO());
         if ((width == 0) && (height == 0)) {
             width = node.traitRight(0) - node.traitLeft(0);
             height = node.traitBottom(0) - node.traitTop(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.