PR:

Obtained from:
Submitted by:
Reviewed by:
1.) renamed enumgen.xsl to longer but hopefully clearer
prop-val-enum-interfaces.xsl

2.) Moved Constants.java from fo.properties to fo package, to reduce the
need for layout and renderers to import directly from the properties package.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197048 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -209,7 +209,6 @@ list of possible build targets.
     <property name="colorkw.xml" value="${build.codegen}/colorkw.xml"/>
 
     <property name="properties.xsl" value="${build.codegen}/properties.xsl"/>
-    <property name="enumgen.xsl" value="${build.codegen}/enumgen.xsl"/>
     <property name="propinc.xsl" value="${build.codegen}/propinc.xsl"/>
     <property name="src.charlist.xsl" value="${src.codegen}/code-point-mapping.xsl"/>
     <property name="encodings.xml" value="${build.codegen}/encodings.xml"/>
@@ -355,7 +354,7 @@ list of possible build targets.
         out="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this}"/>
     <style in="${foproperties.xml}" style="${build.codegen}/fo-property-mapping.xsl"
         out="${build.gensrc}/${replacestring}/fo/properties/FOPropertyMapping.java"/>
-    <style in="${foproperties.xml}" style="${enumgen.xsl}"
+    <style in="${foproperties.xml}" style="${build.codegen}/prop-val-enum-interfaces.xsl"
         out="${build.gensrc}/${replacestring}/fo/properties/foenums_${ignore_this}"/>
     <style in="${encodings.xml}" style="${charlist.xsl}"
         out="${build.gensrc}/${replacestring}/fonts//CodePointMapping.java"/>

src/codegen/fo-property-mapping.xsl

@@ -104,6 +104,7 @@ package org.apache.fop.fo.properties;
 
 import java.util.HashMap;
 import java.util.Set;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.Property;
 //import org.apache.fop.svg.*;
 

src/codegen/enumgen.xsl → src/codegen/prop-val-enum-interfaces.xsl

@@ -84,6 +84,9 @@ Software Foundation, please see <http://www.apache.org/>.
   <xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
     <redirect:write select="concat($classname, '.java')">
       <xsl:text>package org.apache.fop.fo.properties;
+
+import org.apache.fop.fo.Constants;
+
 </xsl:text>
       <!-- Handle enumeration values -->
       <xsl:text>

src/codegen/properties.xsl

@@ -311,6 +311,7 @@ Software Foundation, please see <http://www.apache.org/>.
 
     <redirect:write select="concat($classname, '.java')">
       <xsl:text>package org.apache.fop.fo.properties;
+import org.apache.fop.fo.Constants;
 </xsl:text>
       <xsl:if test=".//keyword-equiv or ./name[.='generic-color']">
         <xsl:text>

src/java/org/apache/fop/datatypes/CondLength.java

@@ -51,7 +51,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.Property;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * A space quantity in XSL (space-before, space-after).

src/java/org/apache/fop/fo/properties/Constants.java → src/java/org/apache/fop/fo/Constants.java

@@ -47,7 +47,7 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
 */
-package org.apache.fop.fo.properties;
+package org.apache.fop.fo;
 
 public interface Constants {
 

src/java/org/apache/fop/fo/FObj.java

@@ -59,7 +59,7 @@ import java.util.Set;
 
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.xml.sax.Attributes;
 

src/java/org/apache/fop/fo/Property.java

@@ -61,7 +61,7 @@ import org.apache.fop.datatypes.Space;
 import org.apache.fop.fo.expr.Numeric;
 import org.apache.fop.fo.expr.PropertyParser;
 import org.apache.fop.fo.expr.PropertyInfo;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.apps.FOPException;
 import java.util.Vector;

src/java/org/apache/fop/fo/PropertyList.java

@@ -57,7 +57,7 @@ import org.xml.sax.Attributes;
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.Property.Maker;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.fo.properties.WritingMode;
 

src/java/org/apache/fop/fo/PropertyManager.java

@@ -67,7 +67,7 @@ import org.apache.fop.traits.BlockProps;
 import org.apache.fop.traits.InlineProps;
 import org.apache.fop.traits.SpaceVal;
 import org.apache.fop.traits.LayoutProps; // keep, break, span, space?
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.Span;
 import org.apache.fop.fonts.FontMetrics;
 import org.apache.fop.fo.properties.CommonHyphenation;

src/java/org/apache/fop/fo/flow/Block.java

@@ -62,7 +62,7 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.RecursiveCharIterator;
 import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;

src/java/org/apache/fop/fo/flow/TableRow.java

@@ -61,7 +61,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;

src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java

@@ -50,6 +50,7 @@
  */
 package org.apache.fop.fo.properties;
 
+import org.apache.fop.fo.Constants;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.CondLength;
 

src/java/org/apache/fop/layoutmgr/PageLayoutManager.java

@@ -81,7 +81,7 @@ import org.apache.fop.fo.pagination.StaticContent;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.Overflow;
 
 import java.util.ArrayList;

src/java/org/apache/fop/render/rtf/RTFHandler.java

@@ -78,7 +78,7 @@ import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.pagination.SimplePageMaster;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.apps.Document;

src/java/org/apache/fop/render/rtf/TableAttributesConverter.java

@@ -59,7 +59,7 @@ import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.EnumProperty;
 import org.apache.fop.fo.expr.NCnameProperty;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.ListProperty;
 import org.apache.fop.fo.PropertyList;

src/java/org/apache/fop/render/rtf/TextAttributesConverter.java

@@ -55,7 +55,7 @@ import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.EnumProperty;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.SpaceProperty;

src/java/org/apache/fop/traits/LayoutProps.java

@@ -50,7 +50,7 @@
  */ 
 package org.apache.fop.traits;
 
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * Store properties affecting layout: break-before, break-after, keeps, span.

src/java/org/apache/fop/traits/SpaceVal.java

@@ -53,7 +53,7 @@ package org.apache.fop.traits;
 import org.apache.fop.datatypes.Space;
 
 import org.apache.fop.fo.Property;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * Store a single Space property value in simplified form, with all