bckfnn 2004/01/25 14:34:50
Modified: src/java/org/apache/fop/fo FOPropertyMapping.java
Property.java
Log:
Fix missing shorthands.
PR: 26423
Submitted by: Simon Pepping
Revision Changes Path
1.3 +2 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FOPropertyMapping.java 22 Jan 2004 09:06:05 -0000 1.2
+++ FOPropertyMapping.java 25 Jan 2004 22:34:49 -0000 1.3
@@ -412,9 +412,9 @@
*/
public static Property.Maker[] getGenericMappings() {
FOPropertyMapping gp = new FOPropertyMapping();
- gp.createGenerics();
// Create the shorthand first, they are referenced by the real properties.
gp.createShorthandProperties();
+ gp.createGenerics();
gp.createAccessibilityProperties();
gp.createAbsolutePositionProperties();
gp.createAuralProperties();
1.18 +1 -1 xml-fop/src/java/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Property.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Property.java 22 Jan 2004 09:06:05 -0000 1.17
+++ Property.java 25 Jan 2004 22:34:49 -0000 1.18
@@ -117,7 +117,7 @@
inherited = generic.inherited;
defaultValue = generic.defaultValue;
percentBase = generic.percentBase;
- if (shorthands != null) {
+ if (generic.shorthands != null) {
shorthands = new Property.Maker[generic.shorthands.length];
System.arraycopy(shorthands, 0, generic.shorthands, 0,
shorthands.length);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
