keiron 2003/02/12 20:24:19
Modified: src/org/apache/fop/fo/flow Leader.java
src/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
BlockLayoutManager.java
BlockStackingLayoutManager.java BreakPoss.java
ContentLayoutManager.java
InlineStackingLayoutManager.java LayoutContext.java
LeafNodeLayoutManager.java LineLayoutManager.java
PageLayoutManager.java SpaceSpecifier.java
TextLayoutManager.java
src/org/apache/fop/layoutmgr/list Item.java
ListBlockLayoutManager.java
ListItemLayoutManager.java
src/org/apache/fop/layoutmgr/table Body.java Caption.java
Cell.java Row.java
TableAndCaptionLayoutManager.java
TableLayoutManager.java
src/org/apache/fop/traits SpaceVal.java
Added: src/org/apache/fop/layoutmgr MinOptMax.java
Removed: src/org/apache/fop/area MinOptMax.java
Log:
moved MinOptMax to where it is used
Revision Changes Path
1.31 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Leader.java 18 Nov 2002 15:54:14 -0000 1.30
+++ Leader.java 13 Feb 2003 04:24:17 -0000 1.31
@@ -21,7 +21,7 @@
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;
1.8 +1 -2
xml-fop/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BlockContainerLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.7
+++ BlockContainerLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.8
@@ -14,7 +14,6 @@
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;
1.26 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- BlockLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.25
+++ BlockLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.26
@@ -14,7 +14,6 @@
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;
1.14 +1 -2
xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BlockStackingLayoutManager.java 13 Nov 2002 10:25:48 -0000 1.13
+++ BlockStackingLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.14
@@ -11,7 +11,6 @@
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;
1.11 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/BreakPoss.java
Index: BreakPoss.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BreakPoss.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BreakPoss.java 18 Nov 2002 15:54:15 -0000 1.10
+++ BreakPoss.java 13 Feb 2003 04:24:17 -0000 1.11
@@ -6,7 +6,6 @@
*/
package org.apache.fop.layoutmgr;
-import org.apache.fop.area.MinOptMax;
import org.apache.fop.traits.LayoutProps;
/**
1.12 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContentLayoutManager.java 18 Nov 2002 15:54:15 -0000 1.11
+++ ContentLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.12
@@ -8,7 +8,6 @@
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;
1.9 +1 -2
xml-fop/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InlineStackingLayoutManager.java 18 Nov 2002 15:54:15 -0000 1.8
+++ InlineStackingLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.9
@@ -13,7 +13,6 @@
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;
1.11 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/LayoutContext.java
Index: LayoutContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LayoutContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LayoutContext.java 13 Nov 2002 10:25:48 -0000 1.10
+++ LayoutContext.java 13 Feb 2003 04:24:17 -0000 1.11
@@ -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()
1.20 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LeafNodeLayoutManager.java 13 Nov 2002 10:25:48 -0000 1.19
+++ LeafNodeLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.20
@@ -9,7 +9,6 @@
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;
1.20 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LineLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.19
+++ LineLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.20
@@ -18,7 +18,6 @@
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;
1.27 +1 -3 xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PageLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.26
+++ PageLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.27
@@ -27,8 +27,6 @@
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;
1.9 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/SpaceSpecifier.java
Index: SpaceSpecifier.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/SpaceSpecifier.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SpaceSpecifier.java 13 Nov 2002 10:25:48 -0000 1.8
+++ SpaceSpecifier.java 13 Feb 2003 04:24:17 -0000 1.9
@@ -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;
1.18 +1 -2 xml-fop/src/org/apache/fop/layoutmgr/TextLayoutManager.java
Index: TextLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/TextLayoutManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TextLayoutManager.java 27 Nov 2002 14:59:52 -0000 1.17
+++ TextLayoutManager.java 13 Feb 2003 04:24:17 -0000 1.18
@@ -12,7 +12,6 @@
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;
1.1 xml-fop/src/org/apache/fop/layoutmgr/MinOptMax.java
Index: MinOptMax.java
===================================================================
/*
* $Id: MinOptMax.java,v 1.1 2003/02/13 04:24:17 keiron Exp $
* 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;
}
}
1.7 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Item.java 29 Nov 2002 23:18:55 -0000 1.6
+++ Item.java 13 Feb 2003 04:24:18 -0000 1.7
@@ -19,7 +19,7 @@
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;
1.7 +2 -2
xml-fop/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListBlockLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.6
+++ ListBlockLayoutManager.java 13 Feb 2003 04:24:18 -0000 1.7
@@ -19,7 +19,7 @@
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;
1.8 +2 -2
xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ListItemLayoutManager.java 29 Nov 2002 23:18:55 -0000 1.7
+++ ListItemLayoutManager.java 13 Feb 2003 04:24:18 -0000 1.8
@@ -19,7 +19,7 @@
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;
1.9 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Body.java 23 Dec 2002 10:54:52 -0000 1.8
+++ Body.java 13 Feb 2003 04:24:19 -0000 1.9
@@ -19,7 +19,7 @@
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;
1.5 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/table/Caption.java
Index: Caption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Caption.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Caption.java 18 Nov 2002 15:54:16 -0000 1.4
+++ Caption.java 13 Feb 2003 04:24:19 -0000 1.5
@@ -18,7 +18,7 @@
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;
1.9 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Cell.java 28 Nov 2002 13:04:51 -0000 1.8
+++ Cell.java 13 Feb 2003 04:24:19 -0000 1.9
@@ -19,7 +19,7 @@
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;
1.10 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Row.java 27 Dec 2002 14:00:44 -0000 1.9
+++ Row.java 13 Feb 2003 04:24:19 -0000 1.10
@@ -19,7 +19,7 @@
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;
1.5 +2 -2
xml-fop/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
Index: TableAndCaptionLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableAndCaptionLayoutManager.java 18 Nov 2002 15:54:16 -0000 1.4
+++ TableAndCaptionLayoutManager.java 13 Feb 2003 04:24:19 -0000 1.5
@@ -18,7 +18,7 @@
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;
1.9 +2 -2
xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TableLayoutManager.java 23 Dec 2002 10:54:52 -0000 1.8
+++ TableLayoutManager.java 13 Feb 2003 04:24:19 -0000 1.9
@@ -19,7 +19,7 @@
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;
1.3 +2 -2 xml-fop/src/org/apache/fop/traits/SpaceVal.java
Index: SpaceVal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/traits/SpaceVal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpaceVal.java 25 Oct 2002 09:29:48 -0000 1.2
+++ SpaceVal.java 13 Feb 2003 04:24:19 -0000 1.3
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
