moved MinOptMax to where it is used

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195939 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/area/MinOptMax.java b/src/org/apache/fop/area/MinOptMax.java
deleted file mode 100644 (file)
index 7332336..0000000
--- a/src/org/apache/fop/area/MinOptMax.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * $Id$
- * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- */
-
-package org.apache.fop.area;
-
-/**
- * This class holds the resolved (as mpoints) form of a LengthRange or
- * Space type Property value.
- * MinOptMax values are used during layout calculations. The instance
- * variables are package visible.
- */
-public class MinOptMax implements java.io.Serializable, Cloneable {
-
-    /** Publicly visible min(imum), opt(imum) and max(imum) values.*/
-    public int min;
-    public int opt;
-    public int max;
-
-    public MinOptMax() {
-        this(0);
-    }
-
-    public MinOptMax(int val) {
-        this(val, val, val);
-    }
-
-    public MinOptMax(int min, int opt, int max) {
-        this.min = min;
-        this.opt = opt;
-        this.max = max;
-    }
-
-    public Object clone() {
-        try {
-            return super.clone();
-        } catch (CloneNotSupportedException ex) {
-            // SHOULD NEVER OCCUR - all members are primitive types!
-            return null;
-        }
-    }
-
-    public static MinOptMax subtract(MinOptMax op1, MinOptMax op2) {
-        return new MinOptMax(op1.min - op2.max, op1.opt - op2.opt,
-                             op1.max - op2.min);
-    }
-
-    public static MinOptMax add(MinOptMax op1, MinOptMax op2) {
-        return new MinOptMax(op1.min + op2.min, op1.opt + op2.opt,
-                             op1.max + op2.max);
-    }
-
-    public static MinOptMax multiply(MinOptMax op1, double mult) {
-        return new MinOptMax((int)(op1.min * mult),
-                             (int)(op1.opt * mult), (int)(op1.max * mult));
-    }
-
-    public void add(MinOptMax op) {
-        min += op.min;
-        opt += op.opt;
-        max += op.max;
-    }
-
-    public void subtract(MinOptMax op) {
-        min -= op.max;
-        opt -= op.opt;
-        max -= op.min;
-    }
-
-}
-

diff --git a/src/org/apache/fop/fo/flow/Leader.java b/src/org/apache/fop/fo/flow/Leader.java
index 930cf59af1d0f0ae1b19c8e7b338f6a3f7f3c7a4..073c2175184d5e042613a729ef4cf61da56f9b2d 100644 (file)
--- a/src/org/apache/fop/fo/flow/Leader.java
+++ b/src/org/apache/fop/fo/flow/Leader.java
@@ -21,7 +21,7 @@ import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
 import org.apache.fop.layoutmgr.ContentLayoutManager;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.LMiter;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.area.inline.Space;
 import org.apache.fop.area.inline.Word;
 import org.apache.fop.area.inline.InlineParent;

diff --git a/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 3446179da5673675ac1c6fa99e69bb35ec10f8a0..49c2f1a4511593ee9c5a41b5485f1a468a4dfa09 100644 (file)
--- a/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -14,7 +14,6 @@ import org.apache.fop.area.BlockParent;
 import org.apache.fop.area.BlockViewport;
 import org.apache.fop.area.Block;
 import org.apache.fop.area.LineArea;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.layout.AbsolutePositionProps;
 import org.apache.fop.fo.properties.AbsolutePosition;

diff --git a/src/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 7692c8c3be7781b6687f50478f200b272db226ba..d7f92d6bec401d1907aff42c422e7c56dd68089a 100644 (file)
--- a/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -14,7 +14,6 @@ import org.apache.fop.area.Area;
 import org.apache.fop.area.BlockParent;
 import org.apache.fop.area.Block;
 import org.apache.fop.area.LineArea;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.Trait;
 import org.apache.fop.traits.LayoutProps;
 import org.apache.fop.layout.BorderAndPadding;

diff --git a/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 7a8310325b564f9238c649e1a2e6162d982680c0..323c6feb4151476a244717d4930bd61f1def190a 100644 (file)
--- a/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -11,7 +11,6 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.BlockParent;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
 
 import java.util.Iterator;
 

diff --git a/src/org/apache/fop/layoutmgr/BreakPoss.java b/src/org/apache/fop/layoutmgr/BreakPoss.java
index 237db85aecaede80711056523e03ce1fba1bdea7..7017a897a8e2278573ae9133b8b19f5202151133 100644 (file)
--- a/src/org/apache/fop/layoutmgr/BreakPoss.java
+++ b/src/org/apache/fop/layoutmgr/BreakPoss.java
@@ -6,7 +6,6 @@
  */
 package org.apache.fop.layoutmgr;
 
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.traits.LayoutProps;
 
 /**

diff --git a/src/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
index 49b55d12827b4ab445a9ad4f6d51c94b179a6c4f..01c339ffe1d2b46e9c2833dcf2014f6264eb201e 100644 (file)
--- a/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -8,7 +8,6 @@ package org.apache.fop.layoutmgr;
 
 import org.apache.fop.fo.FOUserAgent;
 import org.apache.fop.area.Area;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.Resolveable;
 import org.apache.fop.area.PageViewport;
 

diff --git a/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java b/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
index 8931289a5879e1cd64bfa622938e9eac7b26b49f..6955de01f394b29158ad2954bee113c5127c1a3a 100644 (file)
--- a/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
@@ -13,7 +13,6 @@ import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 import org.apache.fop.traits.InlineProps;
 import org.apache.fop.area.Area;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.area.inline.InlineParent;
 import org.apache.fop.area.inline.Space;

diff --git a/src/org/apache/fop/layoutmgr/LayoutContext.java b/src/org/apache/fop/layoutmgr/LayoutContext.java
index c70cab3b3d026b2c2613704f0a54f59abb8cbce3..2d47c35ccc2c4e658971a7328eec16f0a923f20b 100644 (file)
--- a/src/org/apache/fop/layoutmgr/LayoutContext.java
+++ b/src/org/apache/fop/layoutmgr/LayoutContext.java
@@ -6,7 +6,6 @@
  */
 package org.apache.fop.layoutmgr;
 
-import org.apache.fop.area.MinOptMax;
 
 /**
  * This class is used to pass information to the getNextBreakPoss()

diff --git a/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java b/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
index 5e8d1d1130e10b04293cfda760c9d2757e6da53f..2cad3131faf0d6ff4b410a38e089be3644119deb 100644 (file)
--- a/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
@@ -9,7 +9,6 @@ package org.apache.fop.layoutmgr;
 
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.fo.properties.VerticalAlign;
 

diff --git a/src/org/apache/fop/layoutmgr/LineLayoutManager.java b/src/org/apache/fop/layoutmgr/LineLayoutManager.java
index 3b05cb0afa9f675e146ef3451a503a1e86876ef0..9eb2683012114e1052afff5bc1528b92bdd8076a 100644 (file)
--- a/src/org/apache/fop/layoutmgr/LineLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/LineLayoutManager.java
@@ -18,7 +18,6 @@ import org.apache.fop.layout.hyphenation.Hyphenator;
 import org.apache.fop.traits.BlockProps;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.LineArea;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.area.Resolveable;
 import org.apache.fop.fo.properties.TextAlign;

diff --git a/src/org/apache/fop/layoutmgr/MinOptMax.java b/src/org/apache/fop/layoutmgr/MinOptMax.java
new file mode 100644 (file)
index 0000000..c9c0246
--- /dev/null
+++ b/src/org/apache/fop/layoutmgr/MinOptMax.java
@@ -0,0 +1,74 @@
+/*
+ * $Id$
+ * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
+ * For details on use and redistribution please refer to the
+ * LICENSE file included with these sources.
+ */
+
+package org.apache.fop.layoutmgr;
+
+/**
+ * This class holds the resolved (as mpoints) form of a LengthRange or
+ * Space type Property value.
+ * MinOptMax values are used during layout calculations. The instance
+ * variables are package visible.
+ */
+public class MinOptMax implements java.io.Serializable, Cloneable {
+
+    /** Publicly visible min(imum), opt(imum) and max(imum) values.*/
+    public int min;
+    public int opt;
+    public int max;
+
+    public MinOptMax() {
+        this(0);
+    }
+
+    public MinOptMax(int val) {
+        this(val, val, val);
+    }
+
+    public MinOptMax(int min, int opt, int max) {
+        this.min = min;
+        this.opt = opt;
+        this.max = max;
+    }
+
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException ex) {
+            // SHOULD NEVER OCCUR - all members are primitive types!
+            return null;
+        }
+    }
+
+    public static MinOptMax subtract(MinOptMax op1, MinOptMax op2) {
+        return new MinOptMax(op1.min - op2.max, op1.opt - op2.opt,
+                             op1.max - op2.min);
+    }
+
+    public static MinOptMax add(MinOptMax op1, MinOptMax op2) {
+        return new MinOptMax(op1.min + op2.min, op1.opt + op2.opt,
+                             op1.max + op2.max);
+    }
+
+    public static MinOptMax multiply(MinOptMax op1, double mult) {
+        return new MinOptMax((int)(op1.min * mult),
+                             (int)(op1.opt * mult), (int)(op1.max * mult));
+    }
+
+    public void add(MinOptMax op) {
+        min += op.min;
+        opt += op.opt;
+        max += op.max;
+    }
+
+    public void subtract(MinOptMax op) {
+        min -= op.max;
+        opt -= op.opt;
+        max -= op.min;
+    }
+
+}
+

diff --git a/src/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/org/apache/fop/layoutmgr/PageLayoutManager.java
index 0583ae401e1fe94a0c2718cb5b23ecefaa12ea6f..5434ebb6a17894d189688e1d5efbb430b70616ce 100644 (file)
--- a/src/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -27,8 +27,6 @@ import org.apache.fop.fo.pagination.SimplePageMaster;
 import org.apache.fop.fo.pagination.PageNumberGenerator;
 import org.apache.fop.fo.properties.Constants;
 
-import org.apache.fop.area.MinOptMax;
-
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/org/apache/fop/layoutmgr/SpaceSpecifier.java b/src/org/apache/fop/layoutmgr/SpaceSpecifier.java
index a454f2f0184b93a691fa469918ec1d2559df3429..2af57efd633269bdb9f1ce14c5a5a8b99516fec2 100644 (file)
--- a/src/org/apache/fop/layoutmgr/SpaceSpecifier.java
+++ b/src/org/apache/fop/layoutmgr/SpaceSpecifier.java
@@ -7,7 +7,6 @@
 
 package org.apache.fop.layoutmgr;
 
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.traits.SpaceVal;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/org/apache/fop/layoutmgr/TextLayoutManager.java b/src/org/apache/fop/layoutmgr/TextLayoutManager.java
index bda6fdba93e25762cdb57efc037d1c527f07d23b..44dd34453bf4b01ecdcea25f341e7f7c81a34997 100644 (file)
--- a/src/org/apache/fop/layoutmgr/TextLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/TextLayoutManager.java
@@ -12,7 +12,6 @@ import org.apache.fop.fo.TextInfo;
 import org.apache.fop.traits.SpaceVal;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.LineArea;
-import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.Trait;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.area.inline.Word;

diff --git a/src/org/apache/fop/layoutmgr/list/Item.java b/src/org/apache/fop/layoutmgr/list/Item.java
index bf96d6ab060ee972bcb659e180449e65ba24e207..381528f1321bd6180df5ff44c97f80ed7b905473 100644 (file)
--- a/src/org/apache/fop/layoutmgr/list/Item.java
+++ b/src/org/apache/fop/layoutmgr/list/Item.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index 2c4cf060356e3601f23cc625853d24d211ac52e6..6535d3e3272e59fd0107deae25cbbec5e3ce439d 100644 (file)
--- a/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 6d3efbf3a105c0bc90deb5dd1e318a1964efd4b2..cc834be37c7af170de4c268e4ae0d7831f10d1d2 100644 (file)
--- a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/table/Body.java b/src/org/apache/fop/layoutmgr/table/Body.java
index f50c95affb747784ebccc4fdd00891c0dc4284b2..dba2597e86e4d552a48c35e0d855c52c85614ae4 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/Body.java
+++ b/src/org/apache/fop/layoutmgr/table/Body.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/table/Caption.java b/src/org/apache/fop/layoutmgr/table/Caption.java
index c69ab7b0f3c9738df15190857914256a151443ea..a39baa18493a02ea17e0bbf8308c435992666f81 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/Caption.java
+++ b/src/org/apache/fop/layoutmgr/table/Caption.java
@@ -18,7 +18,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/org/apache/fop/layoutmgr/table/Cell.java b/src/org/apache/fop/layoutmgr/table/Cell.java
index f590d45c57ad198864d4355b13fe65630a8ddfcf..57d0e31e3ea4c7320a6e1a6072db6d457a5c5ac6 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/Cell.java
+++ b/src/org/apache/fop/layoutmgr/table/Cell.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/table/Row.java b/src/org/apache/fop/layoutmgr/table/Row.java
index beccceb70bc19803c50fb7e4309916b2a64c43a0..b520521735740fdb1eb2f810f480b9a0c0943ba9 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/Row.java
+++ b/src/org/apache/fop/layoutmgr/table/Row.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
index 0b7c2ccf42394672664c9bce818ac038b4f9a910..6471e8afcba0571b63a806664cf033e2e43e164c 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
@@ -18,7 +18,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 9797c29affba38e12de7a947178ddaf10d95889b..3285b8954f0d89b55452fd4133ad785435c633ec 100644 (file)
--- a/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -19,7 +19,7 @@ import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 

diff --git a/src/org/apache/fop/traits/SpaceVal.java b/src/org/apache/fop/traits/SpaceVal.java
index 763ac00ebc1e666c2911033297700bd7c27de006..2db7cccf0df220fd290009a6834e545a5b1a9af6 100644 (file)
--- a/src/org/apache/fop/traits/SpaceVal.java
+++ b/src/org/apache/fop/traits/SpaceVal.java
@@ -8,7 +8,7 @@
 package org.apache.fop.traits;
 
 import org.apache.fop.datatypes.Space;
-import org.apache.fop.area.MinOptMax;
+import org.apache.fop.layoutmgr.MinOptMax;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.properties.Constants;