pbwest 2002/11/11 17:39:42
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
BorderAfterWidth.java BorderAfterWidthLength.java
BorderBeforeWidth.java BorderBeforeWidthLength.java
BorderBottomWidth.java BorderCommonWidth.java
BorderEndWidth.java BorderEndWidthLength.java
BorderLeftWidth.java BorderRightWidth.java
BorderStartWidth.java BorderStartWidthLength.java
BorderTopWidth.java WordSpacing.java
WordSpacingMaximum.java WordSpacingMinimum.java
WordSpacingOptimum.java
Log:
FONode arg added to getMappedLength calls.
Revision Changes Path
No revision
No revision
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java
Index: BorderAfterWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderAfterWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderAfterWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -5,6 +5,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderAfterWidth extends BorderCommonWidth {
@@ -21,13 +22,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength (PropNames.BORDER_AFTER_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_AFTER_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +1 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java
Index: BorderAfterWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderAfterWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderAfterWidthLength.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -13,7 +13,7 @@
throws PropertyException
{
return getMappedLength
- (PropNames.BORDER_AFTER_WIDTH_LENGTH, MEDIUM);
+ (null, PropNames.BORDER_AFTER_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java
Index: BorderBeforeWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBeforeWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderBeforeWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderBeforeWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_BEFORE_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_BEFORE_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +1 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java
Index: BorderBeforeWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBeforeWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderBeforeWidthLength.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -13,7 +13,7 @@
throws PropertyException
{
return getMappedLength
- (PropNames.BORDER_BEFORE_WIDTH_LENGTH, MEDIUM);
+ (null, PropNames.BORDER_BEFORE_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java
Index: BorderBottomWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBottomWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderBottomWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderBottomWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_BOTTOM_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_BOTTOM_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +2 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java
Index: BorderCommonWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderCommonWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderCommonWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -3,6 +3,7 @@
import org.apache.fop.fo.properties.Property;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
/**
@@ -37,7 +38,7 @@
* @return <tt>Numeric[]</tt> containing the values corresponding
* to the MappedNumeric enumeration constants for border width
*/
- public Numeric getMappedLength(int property, int enum)
+ public Numeric getMappedLength(FONode node, int property, int enum)
throws PropertyException
{
return
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java
Index: BorderEndWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderEndWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderEndWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderEndWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_END_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_END_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +1 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java
Index: BorderEndWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderEndWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderEndWidthLength.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -13,7 +13,7 @@
throws PropertyException
{
return getMappedLength
- (PropNames.BORDER_END_WIDTH_LENGTH, MEDIUM);
+ (null, PropNames.BORDER_END_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java
Index: BorderLeftWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderLeftWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderLeftWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderLeftWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_LEFT_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_LEFT_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java
Index: BorderRightWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderRightWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderRightWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderRightWidth extends BorderCommonWidth {
@@ -13,13 +14,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_RIGHT_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_RIGHT_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +4 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java
Index: BorderStartWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderStartWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderStartWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderStartWidth extends BorderCommonWidth {
@@ -14,13 +15,13 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_START_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_START_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +1 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java
Index: BorderStartWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderStartWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderStartWidthLength.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -13,7 +13,7 @@
throws PropertyException
{
return getMappedLength
- (PropNames.BORDER_START_WIDTH_LENGTH, MEDIUM);
+ (null, PropNames.BORDER_START_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.4 +5 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java
Index: BorderTopWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderTopWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ BorderTopWidth.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BorderCommonWidth;
public class BorderTopWidth extends BorderCommonWidth {
@@ -13,13 +14,14 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(MEDIUM);
+ System.out.println("In BorderTopWidth geInitialValue.");
+ return getMappedLength(null, MEDIUM);
}
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
- return getMappedLength(PropNames.BORDER_TOP_WIDTH, enum);
+ return getMappedLength(node, PropNames.BORDER_TOP_WIDTH, enum);
}
public static final int inherited = NO;
1.1.2.4 +3 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java
Index: WordSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WordSpacing.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
+++ WordSpacing.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -6,6 +6,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.WordSpacingCommon;
public class WordSpacing extends WordSpacingCommon {
@@ -16,11 +17,11 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(NORMAL); //normal
+ return getMappedLength(null, NORMAL); //null imples initial value
}
public static final int inherited = NO;
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.4 +3 -2
xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java
Index: WordSpacingMaximum.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WordSpacingMaximum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
+++ WordSpacingMaximum.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(NORMAL);
+ return getMappedLength(null, NORMAL); // null implies initial value
}
public static final int inherited = COMPUTED;
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.4 +3 -2
xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java
Index: WordSpacingMinimum.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WordSpacingMinimum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
+++ WordSpacingMinimum.java 12 Nov 2002 01:39:41 -0000 1.1.2.4
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(WordSpacing.NORMAL);
+ return getMappedLength(null, NORMAL); // null implies initial value
}
public static final int inherited = COMPUTED;
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.4 +3 -2
xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java
Index: WordSpacingOptimum.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WordSpacingOptimum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
+++ WordSpacingOptimum.java 12 Nov 2002 01:39:42 -0000 1.1.2.4
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.Length;
@@ -14,11 +15,11 @@
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return getMappedLength(WordSpacing.NORMAL);
+ return getMappedLength(null, NORMAL); // null implies initial value
}
public static final int inherited = COMPUTED;
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
if (enum != NORMAL)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
