pbwest 2004/05/01 20:00:15
Modified: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design
BorderCommonWidthRelative.java
CorrespondingProperty.java
PaddingCorrespondingAbsolute.java
BorderCommonWidthAbsolute.java
BorderCommonStyleAbsolute.java
AbstractCorrespondingProperty.java
PaddingCorrespondingRelative.java
BorderCommonStyleRelative.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Moved getWritingMode from CorrespondingProperties to FONode
Revision Changes Path
No revision
No revision
1.1.2.4 +3 -3
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderCommonWidthRelative.java 29 Apr 2004 03:30:20 -0000 1.1.2.3
+++ BorderCommonWidthRelative.java 2 May 2004 03:00:14 -0000 1.1.2.4
@@ -51,7 +51,7 @@
FONode foNode, int relativeEdge)
throws PropertyException {
int absEdge = WritingMode.getCorrespondingAbsoluteEdge(
- getWritingMode(foNode), relativeEdge);
+ foNode.getWritingMode(), relativeEdge);
return absBorderWidthProps[absEdge];
}
1.1.2.4 +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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CorrespondingProperty.java 29 Apr 2004 03:30:19 -0000 1.1.2.3
+++ CorrespondingProperty.java 2 May 2004 03:00:14 -0000 1.1.2.4
@@ -30,8 +30,6 @@
* @version $Revision$ $Name$
*/
public interface CorrespondingProperty {
- public int getWritingMode (FONode foNode)
- throws PropertyException;
public int getCorrespondingProperty(FONode foNode)
throws PropertyException;
}
1.1.2.2 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingAbsolute.java
Index: PaddingCorrespondingAbsolute.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingAbsolute.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingCorrespondingAbsolute.java 29 Apr 2004 03:30:20 -0000 1.1.2.1
+++ PaddingCorrespondingAbsolute.java 2 May 2004 03:00:14 -0000 1.1.2.2
@@ -52,7 +52,7 @@
FONode foNode, int absoluteEdge)
throws PropertyException {
int relEdge = WritingMode.getCorrespondingRelativeEdge(
- getWritingMode(foNode), absoluteEdge);
+ foNode.getWritingMode(), absoluteEdge);
return relPaddingProps[relEdge];
}
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthAbsolute.java
Index: BorderCommonWidthAbsolute.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidthAbsolute.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonWidthAbsolute.java 24 Apr 2004 13:43:25 -0000 1.1.2.2
+++ BorderCommonWidthAbsolute.java 2 May 2004 03:00:15 -0000 1.1.2.3
@@ -51,7 +51,7 @@
FONode foNode, int absoluteEdge)
throws PropertyException {
int relEdge = WritingMode.getCorrespondingRelativeEdge(
- getWritingMode(foNode), absoluteEdge);
+ foNode.getWritingMode(), absoluteEdge);
return relBorderWidthProps[relEdge];
}
1.1.2.5 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleAbsolute.java
Index: BorderCommonStyleAbsolute.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleAbsolute.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderCommonStyleAbsolute.java 24 Apr 2004 13:43:25 -0000 1.1.2.4
+++ BorderCommonStyleAbsolute.java 2 May 2004 03:00:15 -0000 1.1.2.5
@@ -55,7 +55,7 @@
FONode foNode, int absoluteEdge)
throws PropertyException {
int relEdge = WritingMode.getCorrespondingRelativeEdge(
- getWritingMode(foNode), absoluteEdge);
+ foNode.getWritingMode(), absoluteEdge);
return relBorderStyleProps[relEdge];
}
1.1.2.4 +2 -13
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractCorrespondingProperty.java 29 Apr 2004 03:30:20 -0000 1.1.2.3
+++ AbstractCorrespondingProperty.java 2 May 2004 03:00:15 -0000 1.1.2.4
@@ -19,10 +19,7 @@
*/
package org.apache.fop.fo.properties;
-import org.apache.fop.datatypes.EnumType;
-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;
/**
@@ -32,14 +29,6 @@
public abstract class AbstractCorrespondingProperty extends Property
implements
CorrespondingProperty {
- /* (non-Javadoc)
- * @see
org.apache.fop.fo.properties.CorrespondingProperty#getWritingMode(org.apache.fop.fo.FONode)
- */
- public int getWritingMode(FONode foNode)
- throws PropertyException {
- PropertyValue wm = foNode.getPropertyValue(PropNames.WRITING_MODE);
- return EnumType.getEnumValue(wm);
- }
/* (non-Javadoc)
* @see
org.apache.fop.fo.properties.CorrespondingProperty#getCorrespondingProperty(org.apache.fop.fo.FONode)
1.1.2.2 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingRelative.java
Index: PaddingCorrespondingRelative.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PaddingCorrespondingRelative.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingCorrespondingRelative.java 29 Apr 2004 03:30:20 -0000 1.1.2.1
+++ PaddingCorrespondingRelative.java 2 May 2004 03:00:15 -0000 1.1.2.2
@@ -51,7 +51,7 @@
FONode foNode, int relativeEdge)
throws PropertyException {
int relEdge = WritingMode.getCorrespondingAbsoluteEdge(
- getWritingMode(foNode), relativeEdge);
+ foNode.getWritingMode(), relativeEdge);
return absPaddingProps[relEdge];
}
1.1.2.7 +3 -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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderCommonStyleRelative.java 29 Apr 2004 03:30:19 -0000 1.1.2.6
+++ BorderCommonStyleRelative.java 2 May 2004 03:00:15 -0000 1.1.2.7
@@ -55,7 +55,7 @@
FONode foNode, int relativeEdge)
throws PropertyException {
int absEdge = WritingMode.getCorrespondingAbsoluteEdge(
- getWritingMode(foNode), relativeEdge);
+ foNode.getWritingMode(), relativeEdge);
return absBorderStyleProps[absEdge];
}
No revision
No revision
1.2.2.22 +12 -0 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.21
retrieving revision 1.2.2.22
diff -u -r1.2.2.21 -r1.2.2.22
--- FONode.java 27 Apr 2004 15:20:22 -0000 1.2.2.21
+++ FONode.java 2 May 2004 03:00:15 -0000 1.2.2.22
@@ -28,6 +28,7 @@
import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datastructs.SyncedNode;
import org.apache.fop.datastructs.TreeException;
+import org.apache.fop.datatypes.EnumType;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
@@ -565,6 +566,17 @@
throw new PropertyException
("font-size value is not a length.");
return (Numeric)fontsize;
+ }
+
+ /**
+ * Gets the <code>writing-mode</code> applying to this node.
+ * @return an enumerated constant representing the writing-mode
+ * @throws PropertyException
+ */
+ public int getWritingMode()
+ throws PropertyException {
+ PropertyValue wm = getPropertyValue(PropNames.WRITING_MODE);
+ return EnumType.getEnumValue(wm);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
