diff options
19 files changed, 21 insertions, 16 deletions
@@ -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"/> diff --git a/src/codegen/fo-property-mapping.xsl b/src/codegen/fo-property-mapping.xsl index 33e7e2f91..c51a08bda 100644 --- a/src/codegen/fo-property-mapping.xsl +++ b/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.*; diff --git a/src/codegen/enumgen.xsl b/src/codegen/prop-val-enum-interfaces.xsl index e21366c3b..8f942f4d8 100644 --- a/src/codegen/enumgen.xsl +++ b/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> diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl index c0edfa00d..83969ee91 100644 --- a/src/codegen/properties.xsl +++ b/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> diff --git a/src/java/org/apache/fop/datatypes/CondLength.java b/src/java/org/apache/fop/datatypes/CondLength.java index 07e817db9..25804cfec 100644 --- a/src/java/org/apache/fop/datatypes/CondLength.java +++ b/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). diff --git a/src/java/org/apache/fop/fo/properties/Constants.java b/src/java/org/apache/fop/fo/Constants.java index b5be55044..ac3d8ad15 100644 --- a/src/java/org/apache/fop/fo/properties/Constants.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 9e72a1590..1f5fcaadd 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java index 8f922efa6..30c323d03 100644 --- a/src/java/org/apache/fop/fo/Property.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 6c4485f66..0038a42e9 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index 2fad54b89..eaa51451f 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index 44d1203a0..b1ae2a9f0 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 786ce1f0c..1ae293c00 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java index b332f2825..077b9033c 100644 --- a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java +++ b/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; diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java index d023527cc..bdc72a8ad 100644 --- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java +++ b/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; diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index f8ffe0640..ce21c4d8c 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/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; diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index ed14fd446..3eda1b35a 100644 --- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java +++ b/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; diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index 088d253fc..6abd4897c 100644 --- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java +++ b/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; diff --git a/src/java/org/apache/fop/traits/LayoutProps.java b/src/java/org/apache/fop/traits/LayoutProps.java index efc266bac..c183e5a1a 100644 --- a/src/java/org/apache/fop/traits/LayoutProps.java +++ b/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. diff --git a/src/java/org/apache/fop/traits/SpaceVal.java b/src/java/org/apache/fop/traits/SpaceVal.java index b34ef7f0c..bdb038ee2 100644 --- a/src/java/org/apache/fop/traits/SpaceVal.java +++ b/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 |