pbwest 2004/04/28 20:30:21
Modified: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design CorrespondingProperty.java
PaddingBefore.java BorderColorCorresponding.java
BorderTopWidth.java BorderCommonStyleRelative.java
BorderTopStyle.java BorderBottomColor.java
BorderAfterWidthLength.java
PaddingBeforeLength.java PaddingAfter.java
BorderRightColor.java BorderLeftColor.java
AbstractCorrespondingProperty.java
BorderBottomStyle.java BorderStartWidthLength.java
PaddingEndLength.java BorderTopColor.java
PaddingStart.java BorderRightWidth.java
BorderLeftWidth.java PaddingStartLength.java
BorderCommonWidthRelative.java BorderLeftStyle.java
PaddingEnd.java PaddingAfterLength.java
BorderCommonWidth.java
BorderColorCorrespondingRelative.java
BorderStartStyle.java BorderCommonStyle.java
BorderBeforeWidthLength.java BorderBottomWidth.java
BorderEndWidthLength.java BorderRightStyle.java
Added: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design
PaddingCorrespondingRelative.java
PaddingCorrespondingAbsolute.java
Log:
More work on corresponding properties;
Changes to interface CorrespodingProperties
Work on Padding properties
Revision Changes Path
No revision
No revision
1.1.2.3 +2 -4
xml-fop/src/java/org/apache/fop/fo/properties/Attic/CorrespondingProperty.java
Index: CorrespondingProperty.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/CorrespondingProperty.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CorrespondingProperty.java 22 Apr 2004 03:05:47 -0000 1.1.2.2
+++ CorrespondingProperty.java 29 Apr 2004 03:30:19 -0000 1.1.2.3
@@ -34,6 +34,4 @@
throws PropertyException;
public int getCorrespondingProperty(FONode foNode)
throws PropertyException;
- public boolean overridesCorresponding(FONode foNode)
- throws PropertyException;
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingBefore.java
Index: PaddingBefore.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingBefore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingBefore.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingBefore.java 29 Apr 2004 03:30:19 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingBefore extends Property {
+public class PaddingBefore extends PaddingCorrespondingRelative {
public static final int dataTypes =
COMPOUND |PERCENTAGE | LENGTH | INHERIT;
@@ -55,6 +56,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.BEFORE);
}
}
1.1.2.2 +2 -9
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorresponding.java
Index: BorderColorCorresponding.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorresponding.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderColorCorresponding.java 22 Apr 2004 07:36:54 -0000 1.1.2.1
+++ BorderColorCorresponding.java 29 Apr 2004 03:30:19 -0000 1.1.2.2
@@ -47,11 +47,4 @@
throws PropertyException {
throw new PropertyException("Called from superclass");
}
- /* (non-Javadoc)
- * @see
org.apache.fop.fo.properties.CorrespondingProperty#overridesCorresponding(org.apache.fop.fo.FONode)
- */
- public boolean overridesCorresponding(FONode foNode)
- throws PropertyException {
- throw new PropertyException("Called from superclass");
- }
}
1.1.2.6 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopWidth.java
Index: BorderTopWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderTopWidth.java 22 Apr 2004 07:36:54 -0000 1.1.2.5
+++ BorderTopWidth.java 29 Apr 2004 03:30:19 -0000 1.1.2.6
@@ -69,9 +69,5 @@
foNode, WritingMode.TOP);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.6 +2 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java
Index: BorderCommonStyleRelative.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderCommonStyleRelative.java 24 Apr 2004 13:43:25 -0000 1.1.2.5
+++ BorderCommonStyleRelative.java 29 Apr 2004 03:30:19 -0000 1.1.2.6
@@ -59,10 +59,6 @@
return absBorderStyleProps[absEdge];
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
public boolean isCorrespondingRelative() {
return true;
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopStyle.java
Index: BorderTopStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderTopStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderTopStyle.java 29 Apr 2004 03:30:19 -0000 1.1.2.7
@@ -56,9 +56,5 @@
foNode, WritingMode.TOP);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.5 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomColor.java
Index: BorderBottomColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomColor.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderBottomColor.java 22 Apr 2004 07:36:54 -0000 1.1.2.4
+++ BorderBottomColor.java 29 Apr 2004 03:30:19 -0000 1.1.2.5
@@ -63,9 +63,5 @@
foNode, WritingMode.BOTTOM);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java
Index: BorderAfterWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/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 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ BorderAfterWidthLength.java 29 Apr 2004 03:30:19 -0000 1.1.2.4
@@ -21,10 +21,11 @@
package org.apache.fop.fo.properties;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderAfterWidthLength extends BorderCommonWidth {
+public class BorderAfterWidthLength extends BorderCommonWidthRelative {
public static final int dataTypes = LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.AFTER);
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java
Index: PaddingBeforeLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingBeforeLength.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingBeforeLength.java 29 Apr 2004 03:30:19 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingBeforeLength extends Property {
+public class PaddingBeforeLength extends PaddingCorrespondingRelative {
public static final int dataTypes = LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.BEFORE);
}
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingAfter.java
Index: PaddingAfter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingAfter.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ PaddingAfter.java 29 Apr 2004 03:30:19 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingAfter extends Property {
+public class PaddingAfter extends PaddingCorrespondingRelative {
public static final int dataTypes =
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.AFTER);
}
}
1.1.2.5 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightColor.java
Index: BorderRightColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightColor.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderRightColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
+++ BorderRightColor.java 29 Apr 2004 03:30:19 -0000 1.1.2.5
@@ -63,9 +63,5 @@
foNode, WritingMode.RIGHT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.5 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftColor.java
Index: BorderLeftColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftColor.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderLeftColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
+++ BorderLeftColor.java 29 Apr 2004 03:30:20 -0000 1.1.2.5
@@ -63,9 +63,5 @@
foNode, WritingMode.LEFT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.3 +2 -10
xml-fop/src/java/org/apache/fop/fo/properties/Attic/AbstractCorrespondingProperty.java
Index: AbstractCorrespondingProperty.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/AbstractCorrespondingProperty.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractCorrespondingProperty.java 22 Apr 2004 03:05:47 -0000 1.1.2.2
+++ AbstractCorrespondingProperty.java 29 Apr 2004 03:30:20 -0000 1.1.2.3
@@ -49,12 +49,4 @@
throw new PropertyException("Called from superclass");
}
- /**
- * @return
- * @throws PropertyException
- */
- public boolean overridesCorresponding()
- throws PropertyException {
- throw new PropertyException("Called from superclass");
- }
}
1.1.2.7 +1 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomStyle.java
Index: BorderBottomStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBottomStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderBottomStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.7
@@ -57,10 +57,5 @@
foNode, WritingMode.BOTTOM);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
-
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java
Index: BorderStartWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/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 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderStartWidthLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -21,10 +21,11 @@
package org.apache.fop.fo.properties;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderStartWidthLength extends BorderCommonWidth {
+public class BorderStartWidthLength extends BorderCommonWidthRelative {
public static final int dataTypes = LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.END);
}
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingEndLength.java
Index: PaddingEndLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingEndLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingEndLength.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingEndLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingEndLength extends Property {
+public class PaddingEndLength extends PaddingCorrespondingRelative {
public static final int dataTypes = PERCENTAGE | LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.END);
}
}
1.1.2.5 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopColor.java
Index: BorderTopColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTopColor.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderTopColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
+++ BorderTopColor.java 29 Apr 2004 03:30:20 -0000 1.1.2.5
@@ -63,9 +63,5 @@
foNode, WritingMode.TOP);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingStart.java
Index: PaddingStart.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingStart.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingStart.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingStart.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingStart extends Property {
+public class PaddingStart extends PaddingCorrespondingRelative {
public static final int dataTypes =
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.START);
}
}
1.1.2.6 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightWidth.java
Index: BorderRightWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderRightWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
+++ BorderRightWidth.java 29 Apr 2004 03:30:20 -0000 1.1.2.6
@@ -69,9 +69,5 @@
foNode, WritingMode.RIGHT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.6 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java
Index: BorderLeftWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderLeftWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
+++ BorderLeftWidth.java 29 Apr 2004 03:30:20 -0000 1.1.2.6
@@ -69,9 +69,5 @@
foNode, WritingMode.LEFT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingStartLength.java
Index: PaddingStartLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingStartLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingStartLength.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingStartLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingStartLength extends Property {
+public class PaddingStartLength extends PaddingCorrespondingRelative {
public static final int dataTypes = PERCENTAGE | LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.START);
}
}
1.1.2.3 +2 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthRelative.java
Index: BorderCommonWidthRelative.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthRelative.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonWidthRelative.java 24 Apr 2004 13:43:25 -0000 1.1.2.2
+++ BorderCommonWidthRelative.java 29 Apr 2004 03:30:20 -0000 1.1.2.3
@@ -55,10 +55,6 @@
return absBorderWidthProps[absEdge];
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
public boolean isCorrespondingRelative() {
return true;
}
1.1.2.8 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftStyle.java
Index: BorderLeftStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeftStyle.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderLeftStyle.java 24 Apr 2004 13:43:25 -0000 1.1.2.7
+++ BorderLeftStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.8
@@ -57,9 +57,5 @@
foNode, WritingMode.LEFT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingEnd.java
Index: PaddingEnd.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingEnd.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingEnd.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ PaddingEnd.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingEnd extends Property {
+public class PaddingEnd extends PaddingCorrespondingRelative {
public static final int dataTypes =
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.END);
}
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java
Index: PaddingAfterLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PaddingAfterLength.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ PaddingAfterLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class PaddingAfterLength extends Property {
+public class PaddingAfterLength extends PaddingCorrespondingRelative {
public static final int dataTypes = PERCENTAGE | LENGTH;
public int getDataTypes() {
@@ -54,6 +55,12 @@
public int getInherited() {
return inherited;
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingPaddingProperty(
+ foNode, WritingMode.AFTER);
}
}
1.1.2.6 +1 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java
Index: BorderCommonWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderCommonWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
+++ BorderCommonWidth.java 29 Apr 2004 03:30:20 -0000 1.1.2.6
@@ -72,10 +72,5 @@
return rwEnums[index];
}
- public boolean overridesCorresponding(FONode foNode)
- throws PropertyException {
- throw new PropertyException("Called within superclass");
- }
-
}
1.1.2.3 +2 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorrespondingRelative.java
Index: BorderColorCorrespondingRelative.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorrespondingRelative.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderColorCorrespondingRelative.java 24 Apr 2004 13:43:25 -0000 1.1.2.2
+++ BorderColorCorrespondingRelative.java 29 Apr 2004 03:30:20 -0000 1.1.2.3
@@ -55,10 +55,6 @@
return absBorderColorProps[absEdge];
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
public boolean isCorrespondingRelative() {
return true;
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartStyle.java
Index: BorderStartStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderStartStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderStartStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.START);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.8 +1 -6
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java
Index: BorderCommonStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderCommonStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.7
+++ BorderCommonStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.8
@@ -23,7 +23,6 @@
import java.util.HashMap;
import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
/**
@@ -80,9 +79,5 @@
return rwEnums[index];
}
- public boolean overridesCorresponding(FONode foNode)
- throws PropertyException {
- throw new PropertyException("Called within superclass");
- }
}
1.1.2.4 +8 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java
Index: BorderBeforeWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/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 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderBeforeWidthLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -21,10 +21,11 @@
package org.apache.fop.fo.properties;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBeforeWidthLength extends BorderCommonWidth {
+public class BorderBeforeWidthLength extends BorderCommonWidthRelative {
public static final int dataTypes = LENGTH;
public int getDataTypes() {
@@ -56,6 +57,11 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.BEFORE);
+ }
}
1.1.2.6 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java
Index: BorderBottomWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderBottomWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
+++ BorderBottomWidth.java 29 Apr 2004 03:30:20 -0000 1.1.2.6
@@ -69,9 +69,5 @@
foNode, WritingMode.BOTTOM);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +8 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java
Index: BorderEndWidthLength.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/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 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ BorderEndWidthLength.java 29 Apr 2004 03:30:20 -0000 1.1.2.4
@@ -21,10 +21,11 @@
package org.apache.fop.fo.properties;
import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderEndWidthLength extends BorderCommonWidth {
+public class BorderEndWidthLength extends BorderCommonWidthRelative {
public static final int dataTypes = LENGTH;
public int getDataTypes() {
@@ -55,7 +56,11 @@
public int getInherited() {
return inherited;
}
-
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.END);
+ }
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightStyle.java
Index: BorderRightStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderRightStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderRightStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.RIGHT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
No revision
Index: BorderRightStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderRightStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderRightStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.RIGHT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
No revision
Index: BorderRightStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRightStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderRightStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderRightStyle.java 29 Apr 2004 03:30:20 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.RIGHT);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.1 +62 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingRelative.java
1.1.2.1 +63 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingAbsolute.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
