pbwest 2004/04/22 00:36:55
Modified: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design BorderStartColor.java
BorderStartWidth.java BorderAfterColor.java
BorderTopWidth.java BorderCommonStyleRelative.java
BorderEndStyle.java BorderBottomColor.java
BorderRightColor.java BorderLeftColor.java
BorderBeforeStyle.java BorderTopColor.java
BorderBeforeWidth.java BorderRightWidth.java
BorderBeforeColor.java BorderAfterWidth.java
BorderAfterStyle.java BorderLeftWidth.java
BorderEndWidth.java BorderEndColor.java
BorderCommonWidth.java BorderBottomWidth.java
Added: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design BorderColorCorresponding.java
BorderCommonWidthAbsolute.java
BorderCommonWidthRelative.java
BorderColorCorrespondingRelative.java
BorderColorCorrespondingAbsolute.java
Log:
More work on border corresponding properties
Revision Changes Path
No revision
No revision
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartColor.java
Index: BorderStartColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartColor.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderStartColor.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ BorderStartColor.java 22 Apr 2004 07:36:54 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderStartColor extends ColorTransparent {
+public class BorderStartColor extends BorderColorCorrespondingRelative {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -55,6 +56,12 @@
{
return
new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.END);
}
}
1.1.2.5 +7 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartWidth.java
Index: BorderStartWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartWidth.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderStartWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderStartWidth.java 22 Apr 2004 07:36:54 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderStartWidth extends BorderCommonWidth {
+public class BorderStartWidth extends BorderCommonWidthRelative {
public static final int dataTypes =
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
@@ -64,6 +64,11 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.START);
+ }
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterColor.java
Index: BorderAfterColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterColor.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderAfterColor.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ BorderAfterColor.java 22 Apr 2004 07:36:54 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderAfterColor extends ColorTransparent {
+public class BorderAfterColor extends BorderColorCorrespondingRelative {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,12 @@
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.AFTER);
}
}
1.1.2.5 +11 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderTopWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderTopWidth.java 22 Apr 2004 07:36:54 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderTopWidth extends BorderCommonWidth {
+public class BorderTopWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.TOP);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
1.1.2.4 +6 -3
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderCommonStyleRelative.java 22 Apr 2004 03:05:47 -0000 1.1.2.3
+++ BorderCommonStyleRelative.java 22 Apr 2004 07:36:54 -0000 1.1.2.4
@@ -33,7 +33,6 @@
public abstract class BorderCommonStyleRelative
extends BorderCommonStyle {
-
/** Array of absolute border style properties,
* indexed by absolute edge constants */
private static int[] absBorderStyleProps = {
@@ -58,6 +57,10 @@
int absEdge = WritingMode.getCorrespondingAbsoluteEdge(
getWritingMode(foNode), relativeEdge);
return absBorderStyleProps[absEdge];
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
}
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndStyle.java
Index: BorderEndStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderEndStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderEndStyle.java 22 Apr 2004 07:36:54 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.END);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +13 -2
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBottomColor.java 19 Feb 2004 03:11:41 -0000 1.1.2.3
+++ BorderBottomColor.java 22 Apr 2004 07:36:54 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderBottomColor extends ColorTransparent {
+public class BorderBottomColor extends BorderColorCorrespondingAbsolute {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,16 @@
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.BOTTOM);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
}
}
1.1.2.4 +13 -2
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderRightColor.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderRightColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderRightColor extends ColorTransparent {
+public class BorderRightColor extends BorderColorCorrespondingAbsolute {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,16 @@
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.RIGHT);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
}
}
1.1.2.4 +13 -2
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderLeftColor.java 19 Feb 2004 03:11:39 -0000 1.1.2.3
+++ BorderLeftColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderLeftColor extends ColorTransparent {
+public class BorderLeftColor extends BorderColorCorrespondingAbsolute {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,16 @@
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.LEFT);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
}
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeStyle.java
Index: BorderBeforeStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBeforeStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderBeforeStyle.java 22 Apr 2004 07:36:55 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.BEFORE);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.4 +13 -2
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderTopColor.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderTopColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderTopColor extends ColorTransparent {
+public class BorderTopColor extends BorderColorCorrespondingAbsolute {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,16 @@
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.TOP);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
}
}
1.1.2.5 +7 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java
Index: BorderBeforeWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderBeforeWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderBeforeWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBeforeWidth extends BorderCommonWidth {
+public class BorderBeforeWidth extends BorderCommonWidthRelative {
public static final int dataTypes =
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
@@ -64,6 +64,11 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.BEFORE);
+ }
}
1.1.2.5 +11 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderRightWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderRightWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderRightWidth extends BorderCommonWidth {
+public class BorderRightWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.RIGHT);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
1.1.2.4 +9 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java
Index: BorderBeforeColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBeforeColor.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderBeforeColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderBeforeColor extends ColorTransparent {
+public class BorderBeforeColor extends BorderColorCorrespondingRelative {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,12 @@
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.BEFORE);
}
}
1.1.2.5 +8 -4
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java
Index: BorderAfterWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderAfterWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderAfterWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderAfterWidth extends BorderCommonWidth {
+public class BorderAfterWidth extends BorderCommonWidthRelative {
public static final int dataTypes =
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
@@ -47,7 +47,7 @@
}
- // Initial value for BorderAfterWidth is tne mapped enumerated value
+ // Initial value for BorderAfterWidth is the mapped enumerated value
// "medium". This maps to 1pt. There is no way at present to
// automatically update the following initial Length PropertyValue
// if the mapping changes.
@@ -70,7 +70,11 @@
return inherited;
}
-
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.AFTER);
+ }
}
1.1.2.7 +1 -5
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java
Index: BorderAfterStyle.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderAfterStyle.java 22 Apr 2004 03:05:47 -0000 1.1.2.6
+++ BorderAfterStyle.java 22 Apr 2004 07:36:55 -0000 1.1.2.7
@@ -57,9 +57,5 @@
foNode, WritingMode.AFTER);
}
- public boolean overridesCorresponding(FONode foNode) {
- return false;
- }
-
}
1.1.2.5 +11 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderLeftWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderLeftWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderLeftWidth extends BorderCommonWidth {
+public class BorderLeftWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.LEFT);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
1.1.2.5 +7 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndWidth.java
Index: BorderEndWidth.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndWidth.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderEndWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderEndWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderEndWidth extends BorderCommonWidth {
+public class BorderEndWidth extends BorderCommonWidthRelative {
public static final int dataTypes =
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
@@ -64,6 +64,11 @@
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/BorderEndColor.java
Index: BorderEndColor.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndColor.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderEndColor.java 19 Feb 2004 03:11:40 -0000 1.1.2.3
+++ BorderEndColor.java 22 Apr 2004 07:36:55 -0000 1.1.2.4
@@ -22,10 +22,11 @@
import org.apache.fop.datatypes.ColorType;
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 BorderEndColor extends ColorTransparent {
+public class BorderEndColor extends BorderColorCorrespondingRelative {
public static final int dataTypes = ENUM | COLOR_T | INHERIT;
public int getDataTypes() {
@@ -54,6 +55,12 @@
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
+ }
+
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingColorProperty(
+ foNode, WritingMode.END);
}
}
1.1.2.5 +7 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderCommonWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderCommonWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -29,7 +29,7 @@
* Pseudo-property class for common border width values occurring in a
* number of classes.
*/
-public class BorderCommonWidth extends Property {
+public abstract class BorderCommonWidth extends AbstractCorrespondingProperty {
public static final int THIN = 1;
public static final int MEDIUM = 2;
public static final int THICK = 3;
@@ -70,6 +70,11 @@
}
public String getEnumText(int index) {
return rwEnums[index];
+ }
+
+ public boolean overridesCorresponding(FONode foNode)
+ throws PropertyException {
+ throw new PropertyException("Called within superclass");
}
}
1.1.2.5 +11 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderBottomWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderBottomWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBottomWidth extends BorderCommonWidth {
+public class BorderBottomWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.BOTTOM);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
No revision
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderBottomWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderBottomWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBottomWidth extends BorderCommonWidth {
+public class BorderBottomWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.BOTTOM);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
No revision
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderBottomWidth.java 25 Feb 2004 23:09:09 -0000 1.1.2.4
+++ BorderBottomWidth.java 22 Apr 2004 07:36:55 -0000 1.1.2.5
@@ -26,7 +26,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBottomWidth extends BorderCommonWidth {
+public class BorderBottomWidth extends BorderCommonWidthAbsolute {
public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;
public int getDataTypes() {
@@ -63,6 +63,15 @@
return inherited;
}
+ public int getCorrespondingProperty(FONode foNode)
+ throws PropertyException {
+ return getCorrespondingWidthProperty(
+ foNode, WritingMode.BOTTOM);
+ }
+
+ public boolean overridesCorresponding(FONode foNode) {
+ return false;
+ }
}
1.1.2.1 +57 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorresponding.java
1.1.2.1 +58 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthAbsolute.java
1.1.2.1 +62 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthRelative.java
1.1.2.1 +62 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorrespondingRelative.java
1.1.2.1 +58 -0
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColorCorrespondingAbsolute.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
