[FOray-commit] SF.net SVN: foray: [7413] trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java

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

Revision: 7413
Author:   victormote
Date:     2006-06-05 12:28:29 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7413&view=rev

Log Message:
-----------
Reverse sense of method for future enhancement clarity.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java	2006-06-05 19:12:20 UTC (rev 7412)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java	2006-06-05 19:28:29 UTC (rev 7413)
@@ -96,10 +96,10 @@
          * "Constraints", first paragraph, for explanation of logic.
          */
         int viewportIPD = this.traitIPDimensionOpt(parentAreaCR_IPD);
-        if (viewportIPD == Constants.DIMENSION_AUTO) {
-            viewportIPD = traitContentWidth(parentAreaCR_IPD);
+        if (viewportIPD != Constants.DIMENSION_AUTO) {
+            return viewportIPD;
         }
-        return viewportIPD;
+        return traitContentWidth(parentAreaCR_IPD);
     }
 
     /**
@@ -115,10 +115,10 @@
          * "Constraints", first paragraph, for explanation of logic.
          */
         int viewportBPD = this.traitBPDimensionOpt(parentAreaCR_BPD);
-        if (viewportBPD == Constants.DIMENSION_AUTO) {
-            viewportBPD = traitContentHeight(parentAreaCR_BPD);
+        if (viewportBPD != Constants.DIMENSION_AUTO) {
+            return viewportBPD;
         }
-        return viewportBPD;
+        return traitContentHeight(parentAreaCR_BPD);
     }
 
     /**


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