From 561211705ed00206139bddead7daf4049c87be78 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Mon, 2 Feb 2004 16:08:27 +0000 Subject: [PATCH] Phase 3 (last) of bug 26434. - Move the property classes to fop.fo.properties. PR: 26434 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197314 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/datatypes/CompoundDatatype.java | 2 +- .../apache/fop/fo/BoxPropShorthandParser.java | 2 ++ .../org/apache/fop/fo/FOPropertyMapping.java | 15 ++++++++++++++- src/java/org/apache/fop/fo/FObj.java | 1 + .../apache/fop/fo/GenericShorthandParser.java | 2 ++ src/java/org/apache/fop/fo/PropertyList.java | 1 + src/java/org/apache/fop/fo/PropertyManager.java | 1 + src/java/org/apache/fop/fo/ShorthandParser.java | 2 ++ src/java/org/apache/fop/fo/expr/AbsFunction.java | 2 +- .../apache/fop/fo/expr/BodyStartFunction.java | 2 +- .../org/apache/fop/fo/expr/CeilingFunction.java | 4 ++-- .../org/apache/fop/fo/expr/FloorFunction.java | 4 ++-- .../apache/fop/fo/expr/FopPropValFunction.java | 2 +- .../apache/fop/fo/expr/FromParentFunction.java | 2 +- .../fop/fo/expr/FromTableColumnFunction.java | 2 +- src/java/org/apache/fop/fo/expr/Function.java | 2 +- .../fop/fo/expr/InheritedPropFunction.java | 2 +- .../org/apache/fop/fo/expr/LabelEndFunction.java | 8 ++++---- src/java/org/apache/fop/fo/expr/MaxFunction.java | 2 +- src/java/org/apache/fop/fo/expr/MinFunction.java | 2 +- .../org/apache/fop/fo/expr/NCnameProperty.java | 2 +- .../fop/fo/expr/NearestSpecPropFunction.java | 2 +- .../org/apache/fop/fo/expr/NumericProperty.java | 16 ++++++++-------- .../apache/fop/fo/expr/PPColWidthFunction.java | 4 ++-- .../org/apache/fop/fo/expr/PropertyParser.java | 16 ++++++++-------- .../org/apache/fop/fo/expr/RGBColorFunction.java | 4 ++-- .../org/apache/fop/fo/expr/RoundFunction.java | 4 ++-- .../org/apache/fop/fo/flow/ExternalGraphic.java | 2 +- src/java/org/apache/fop/fo/flow/Leader.java | 2 +- src/java/org/apache/fop/fo/flow/Table.java | 2 +- src/java/org/apache/fop/fo/flow/TableColumn.java | 2 +- src/java/org/apache/fop/fo/flow/TableRow.java | 2 +- .../org/apache/fop/fo/pagination/RegionBody.java | 2 +- src/java/org/apache/fop/fo/pagination/Title.java | 6 +++--- .../{datatypes => fo/properties}/AutoLength.java | 5 ++--- .../fo/properties/BorderWidthPropertyMaker.java | 2 -- .../fo/{ => properties}/CharacterProperty.java | 7 ++++--- .../fo/{ => properties}/ColorTypeProperty.java | 7 ++++--- .../fo/properties/CommonBorderAndPadding.java | 1 - .../fop/fo/properties/CompoundPropertyMaker.java | 2 -- .../fo/{ => properties}/CondLengthProperty.java | 8 +++++--- .../properties/CorrespondingPropertyMaker.java | 1 - .../fo/properties/DimensionPropertyMaker.java | 1 - .../fop/fo/{ => properties}/EnumProperty.java | 7 ++++--- .../properties}/FixedLength.java | 5 ++--- .../fop/fo/properties/IndentPropertyMaker.java | 2 -- .../fop/fo/{ => properties}/KeepProperty.java | 9 +++++---- .../fo/{ => properties}/LengthPairProperty.java | 9 +++++---- .../fop/fo/{ => properties}/LengthProperty.java | 8 ++++---- .../fo/{ => properties}/LengthRangeProperty.java | 9 +++++---- .../fo/properties/LineHeightPropertyMaker.java | 3 --- .../properties}/LinearCombinationLength.java | 6 +++--- .../fop/fo/{ => properties}/ListProperty.java | 7 ++++--- .../properties}/MixedLength.java | 5 ++--- .../fop/fo/{ => properties}/NumberProperty.java | 7 ++++--- .../properties}/PercentLength.java | 6 +++--- .../apache/fop/fo/{ => properties}/Property.java | 5 +++-- .../apache/fop/fo/properties/PropertyMaker.java | 2 -- .../fop/fo/{ => properties}/SpaceProperty.java | 9 +++++---- .../fop/fo/{ => properties}/StringProperty.java | 7 ++++--- .../properties}/TableColLength.java | 5 ++--- .../properties}/ToBeImplementedProperty.java | 6 ++---- .../fop/render/rtf/ListAttributesConverter.java | 4 ++-- .../fop/render/rtf/PageAttributesConverter.java | 2 +- .../org/apache/fop/render/rtf/RTFHandler.java | 10 +++++----- .../fop/render/rtf/TableAttributesConverter.java | 12 ++++++------ .../fop/render/rtf/TextAttributesConverter.java | 8 ++++---- src/java/org/apache/fop/traits/SpaceVal.java | 4 ++-- 68 files changed, 166 insertions(+), 151 deletions(-) rename src/java/org/apache/fop/{datatypes => fo/properties}/AutoLength.java (95%) rename src/java/org/apache/fop/fo/{ => properties}/CharacterProperty.java (96%) rename src/java/org/apache/fop/fo/{ => properties}/ColorTypeProperty.java (99%) rename src/java/org/apache/fop/fo/{ => properties}/CondLengthProperty.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/EnumProperty.java (97%) rename src/java/org/apache/fop/{datatypes => fo/properties}/FixedLength.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/KeepProperty.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/LengthPairProperty.java (96%) rename src/java/org/apache/fop/fo/{ => properties}/LengthProperty.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/LengthRangeProperty.java (97%) rename src/java/org/apache/fop/{datatypes => fo/properties}/LinearCombinationLength.java (96%) rename src/java/org/apache/fop/fo/{ => properties}/ListProperty.java (96%) rename src/java/org/apache/fop/{datatypes => fo/properties}/MixedLength.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/NumberProperty.java (97%) rename src/java/org/apache/fop/{datatypes => fo/properties}/PercentLength.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/Property.java (98%) rename src/java/org/apache/fop/fo/{ => properties}/SpaceProperty.java (97%) rename src/java/org/apache/fop/fo/{ => properties}/StringProperty.java (97%) rename src/java/org/apache/fop/{datatypes => fo/properties}/TableColLength.java (97%) rename src/java/org/apache/fop/{datatypes => fo/properties}/ToBeImplementedProperty.java (95%) diff --git a/src/java/org/apache/fop/datatypes/CompoundDatatype.java b/src/java/org/apache/fop/datatypes/CompoundDatatype.java index 14e32b711..77473cef0 100644 --- a/src/java/org/apache/fop/datatypes/CompoundDatatype.java +++ b/src/java/org/apache/fop/datatypes/CompoundDatatype.java @@ -50,8 +50,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.Property; import org.apache.fop.fo.Constants; +import org.apache.fop.fo.properties.Property; /** * This interface is used as a base for compound datatypes. diff --git a/src/java/org/apache/fop/fo/BoxPropShorthandParser.java b/src/java/org/apache/fop/fo/BoxPropShorthandParser.java index 4a35cba64..51c8f0610 100644 --- a/src/java/org/apache/fop/fo/BoxPropShorthandParser.java +++ b/src/java/org/apache/fop/fo/BoxPropShorthandParser.java @@ -50,6 +50,8 @@ */ package org.apache.fop.fo; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.PropertyMaker; /** diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index ddb892e6c..a24243527 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -54,13 +54,26 @@ import java.util.HashMap; import java.util.Map; import org.apache.fop.datatypes.LengthBase; -import org.apache.fop.datatypes.ToBeImplementedProperty; import org.apache.fop.fo.properties.BorderWidthPropertyMaker; +import org.apache.fop.fo.properties.CharacterProperty; +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.CondLengthProperty; import org.apache.fop.fo.properties.CorrespondingPropertyMaker; import org.apache.fop.fo.properties.DimensionPropertyMaker; +import org.apache.fop.fo.properties.EnumProperty; import org.apache.fop.fo.properties.IndentPropertyMaker; +import org.apache.fop.fo.properties.KeepProperty; +import org.apache.fop.fo.properties.LengthPairProperty; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.LengthRangeProperty; import org.apache.fop.fo.properties.LineHeightPropertyMaker; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.properties.SpaceProperty; +import org.apache.fop.fo.properties.StringProperty; +import org.apache.fop.fo.properties.ToBeImplementedProperty; /** * This class creates and returns an array of Property.Maker instances diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 8576e29b9..6d61dce3b 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -59,6 +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.Property; import org.apache.fop.fo.properties.PropertyMaker; import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/GenericShorthandParser.java b/src/java/org/apache/fop/fo/GenericShorthandParser.java index 8591c9832..ad6300795 100644 --- a/src/java/org/apache/fop/fo/GenericShorthandParser.java +++ b/src/java/org/apache/fop/fo/GenericShorthandParser.java @@ -52,6 +52,8 @@ package org.apache.fop.fo; import java.util.Enumeration; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.PropertyMaker; public class GenericShorthandParser implements ShorthandParser { diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 68c843da7..39f989e0a 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/src/java/org/apache/fop/fo/PropertyList.java @@ -56,6 +56,7 @@ import org.xml.sax.Attributes; // FOP import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.PropertyMaker; /** diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index 467254442..4c25add9e 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/src/java/org/apache/fop/fo/PropertyManager.java @@ -52,6 +52,7 @@ package org.apache.fop.fo; // FOP import org.apache.fop.fonts.Font; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonMarginInline; diff --git a/src/java/org/apache/fop/fo/ShorthandParser.java b/src/java/org/apache/fop/fo/ShorthandParser.java index b690abe95..5d9f901ec 100644 --- a/src/java/org/apache/fop/fo/ShorthandParser.java +++ b/src/java/org/apache/fop/fo/ShorthandParser.java @@ -50,6 +50,8 @@ */ package org.apache.fop.fo; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.PropertyMaker; /** diff --git a/src/java/org/apache/fop/fo/expr/AbsFunction.java b/src/java/org/apache/fop/fo/expr/AbsFunction.java index f29bb8c6c..a6494eb5b 100644 --- a/src/java/org/apache/fop/fo/expr/AbsFunction.java +++ b/src/java/org/apache/fop/fo/expr/AbsFunction.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; /** * Class modelling the abs Number Function. See Sec. 5.10.1 of the XSL-FO spec. diff --git a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java index 69416d770..d5abfd064 100644 --- a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java +++ b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java @@ -51,9 +51,9 @@ package org.apache.fop.fo.expr; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FONode; import org.apache.fop.fo.flow.ListItem; +import org.apache.fop.fo.properties.Property; /** * Class corresponding to the body-start Property Value function. See Sec. diff --git a/src/java/org/apache/fop/fo/expr/CeilingFunction.java b/src/java/org/apache/fop/fo/expr/CeilingFunction.java index f43544e38..5ec166b8e 100644 --- a/src/java/org/apache/fop/fo/expr/CeilingFunction.java +++ b/src/java/org/apache/fop/fo/expr/CeilingFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.NumberProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.Property; class CeilingFunction extends FunctionBase { diff --git a/src/java/org/apache/fop/fo/expr/FloorFunction.java b/src/java/org/apache/fop/fo/expr/FloorFunction.java index 48913dd95..aafcc36e3 100644 --- a/src/java/org/apache/fop/fo/expr/FloorFunction.java +++ b/src/java/org/apache/fop/fo/expr/FloorFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.NumberProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.Property; class FloorFunction extends FunctionBase { diff --git a/src/java/org/apache/fop/fo/expr/FopPropValFunction.java b/src/java/org/apache/fop/fo/expr/FopPropValFunction.java index 2d2581587..2d65461df 100644 --- a/src/java/org/apache/fop/fo/expr/FopPropValFunction.java +++ b/src/java/org/apache/fop/fo/expr/FopPropValFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FOPropertyMapping; +import org.apache.fop.fo.properties.Property; /** diff --git a/src/java/org/apache/fop/fo/expr/FromParentFunction.java b/src/java/org/apache/fop/fo/expr/FromParentFunction.java index c6bf0dd5f..654aa2ce8 100644 --- a/src/java/org/apache/fop/fo/expr/FromParentFunction.java +++ b/src/java/org/apache/fop/fo/expr/FromParentFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FOPropertyMapping; +import org.apache.fop.fo.properties.Property; /** diff --git a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java index e6241ff16..3a798660f 100644 --- a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java +++ b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; /** * Class modelling the from-table-column Property Value function. See Sec. diff --git a/src/java/org/apache/fop/fo/expr/Function.java b/src/java/org/apache/fop/fo/expr/Function.java index 0910ec173..a66523d8b 100644 --- a/src/java/org/apache/fop/fo/expr/Function.java +++ b/src/java/org/apache/fop/fo/expr/Function.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; import org.apache.fop.datatypes.PercentBase; /** diff --git a/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java b/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java index 08c8d96d4..31ef3a763 100644 --- a/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java +++ b/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FOPropertyMapping; +import org.apache.fop.fo.properties.Property; /** * Class modelling the inherited-property-value Property Value function. See diff --git a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java index e44b29951..7b2277511 100644 --- a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java +++ b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java @@ -51,13 +51,13 @@ package org.apache.fop.fo.expr; import org.apache.fop.datatypes.LengthBase; -import org.apache.fop.datatypes.LinearCombinationLength; -import org.apache.fop.datatypes.PercentLength; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.FONode; import org.apache.fop.fo.flow.ListItem; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.LinearCombinationLength; +import org.apache.fop.fo.properties.PercentLength; +import org.apache.fop.fo.properties.Property; /** * Class modelling the label-end Property Value function. See Sec. 5.10.4 of the diff --git a/src/java/org/apache/fop/fo/expr/MaxFunction.java b/src/java/org/apache/fop/fo/expr/MaxFunction.java index 40c8a407a..1127bcc97 100644 --- a/src/java/org/apache/fop/fo/expr/MaxFunction.java +++ b/src/java/org/apache/fop/fo/expr/MaxFunction.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; /** * Class for managing the "max" Number Function. See Sec. 5.10.1 in the XSL-FO diff --git a/src/java/org/apache/fop/fo/expr/MinFunction.java b/src/java/org/apache/fop/fo/expr/MinFunction.java index cdb9f25a3..6ddaa0ba3 100644 --- a/src/java/org/apache/fop/fo/expr/MinFunction.java +++ b/src/java/org/apache/fop/fo/expr/MinFunction.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; /** * Class for managing the "min" Number Function. See Sec. 5.10.1 in the XSL-FO diff --git a/src/java/org/apache/fop/fo/expr/NCnameProperty.java b/src/java/org/apache/fop/fo/expr/NCnameProperty.java index 7fff73df2..7fd8801de 100644 --- a/src/java/org/apache/fop/fo/expr/NCnameProperty.java +++ b/src/java/org/apache/fop/fo/expr/NCnameProperty.java @@ -50,7 +50,7 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; import org.apache.fop.datatypes.ColorType; /** diff --git a/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java b/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java index 6ac4dc743..a52a4a0c4 100644 --- a/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java +++ b/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java @@ -50,8 +50,8 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FOPropertyMapping; +import org.apache.fop.fo.properties.Property; /** * Class modelling the from-nearest-specified-value function. See Sec. 5.10.4 diff --git a/src/java/org/apache/fop/fo/expr/NumericProperty.java b/src/java/org/apache/fop/fo/expr/NumericProperty.java index 3d9028cba..70de2fa44 100644 --- a/src/java/org/apache/fop/fo/expr/NumericProperty.java +++ b/src/java/org/apache/fop/fo/expr/NumericProperty.java @@ -53,14 +53,14 @@ package org.apache.fop.fo.expr; import java.util.Vector; import org.apache.fop.datatypes.PercentBase; -import org.apache.fop.datatypes.FixedLength; -import org.apache.fop.datatypes.TableColLength; -import org.apache.fop.datatypes.PercentLength; -import org.apache.fop.datatypes.MixedLength; - -import org.apache.fop.fo.ColorTypeProperty; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.Property; + +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.FixedLength; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.MixedLength; +import org.apache.fop.fo.properties.PercentLength; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.properties.TableColLength; public class NumericProperty extends Property { // Bit fields diff --git a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java index 4d2ce74fc..06edf8d41 100644 --- a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java +++ b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java @@ -51,8 +51,8 @@ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; -import org.apache.fop.datatypes.TableColLength; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.properties.TableColLength; /** * Class modelling the proportional-column-width function. See Sec. 5.10.4 of diff --git a/src/java/org/apache/fop/fo/expr/PropertyParser.java b/src/java/org/apache/fop/fo/expr/PropertyParser.java index 4a2bcca09..a26630277 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyParser.java +++ b/src/java/org/apache/fop/fo/expr/PropertyParser.java @@ -50,15 +50,15 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.datatypes.FixedLength; import org.apache.fop.datatypes.PercentBase; -import org.apache.fop.datatypes.PercentLength; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.ColorTypeProperty; -import org.apache.fop.fo.ListProperty; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.NumberProperty; -import org.apache.fop.fo.StringProperty; +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.FixedLength; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.PercentLength; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.properties.StringProperty; import java.util.HashMap; diff --git a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java index 00b58a359..69d92c9c0 100644 --- a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java +++ b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java @@ -51,8 +51,8 @@ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.ColorTypeProperty; +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.datatypes.PercentBase; class RGBColorFunction extends FunctionBase { diff --git a/src/java/org/apache/fop/fo/expr/RoundFunction.java b/src/java/org/apache/fop/fo/expr/RoundFunction.java index 1877c87f2..3980704d1 100644 --- a/src/java/org/apache/fop/fo/expr/RoundFunction.java +++ b/src/java/org/apache/fop/fo/expr/RoundFunction.java @@ -51,8 +51,8 @@ package org.apache.fop.fo.expr; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.NumberProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.Property; class RoundFunction extends FunctionBase { public int nbArgs() { diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index 06141c983..3e51896be 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -58,7 +58,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; -import org.apache.fop.fo.LengthProperty; +import org.apache.fop.fo.properties.LengthProperty; import org.apache.fop.image.ImageFactory; import org.apache.fop.image.FopImage; // Java diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index bcb745399..e7cb39d1e 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.flow; import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.Length; -import org.apache.fop.datatypes.PercentLength; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.FObjMixed; @@ -62,6 +61,7 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; +import org.apache.fop.fo.properties.PercentLength; import org.apache.fop.fonts.Font; /** diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index ad531aa6f..1a621b39c 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -59,7 +59,6 @@ import org.xml.sax.Attributes; // FOP import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.ColorType; -import org.apache.fop.fo.LengthRangeProperty; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; @@ -69,6 +68,7 @@ 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.CommonRelativePosition; +import org.apache.fop.fo.properties.LengthRangeProperty; /** * Class modelling the fo:table object. See Sec. 6.7.3 of the XSL-FO Standard. diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index 4d6eb7a78..76a960771 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -60,10 +60,10 @@ import org.apache.fop.datatypes.Length; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; -import org.apache.fop.fo.Property; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; +import org.apache.fop.fo.properties.Property; /** * Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 39bac72ed..a8806d8d9 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -59,7 +59,6 @@ import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.KeepValue; 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.Constants; @@ -68,6 +67,7 @@ import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonRelativePosition; +import org.apache.fop.fo.properties.Property; /** diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index fd89cc670..1a55e7838 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -57,9 +57,9 @@ import org.apache.fop.datatypes.FODimension; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.properties.CommonMarginBlock; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.FOPropertyMapping; /** diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 3fbe8c67b..6036893fc 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -53,16 +53,16 @@ package org.apache.fop.fo.pagination; // FOP import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.EnumProperty; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.Property; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAccessibility; import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; +import org.apache.fop.fo.properties.EnumProperty; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; diff --git a/src/java/org/apache/fop/datatypes/AutoLength.java b/src/java/org/apache/fop/fo/properties/AutoLength.java similarity index 95% rename from src/java/org/apache/fop/datatypes/AutoLength.java rename to src/java/org/apache/fop/fo/properties/AutoLength.java index cafe3a3d7..0730a289c 100644 --- a/src/java/org/apache/fop/datatypes/AutoLength.java +++ b/src/java/org/apache/fop/fo/properties/AutoLength.java @@ -1,5 +1,5 @@ /* - * $Id: AutoLength.java,v 1.3 2003/03/05 20:38:23 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,8 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.LengthProperty; /** * A length quantity in XSL which is specified as "auto". diff --git a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java index 637a62845..ff6849696 100644 --- a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; /** diff --git a/src/java/org/apache/fop/fo/CharacterProperty.java b/src/java/org/apache/fop/fo/properties/CharacterProperty.java similarity index 96% rename from src/java/org/apache/fop/fo/CharacterProperty.java rename to src/java/org/apache/fop/fo/properties/CharacterProperty.java index 4a95c8ad0..4931887b4 100644 --- a/src/java/org/apache/fop/fo/CharacterProperty.java +++ b/src/java/org/apache/fop/fo/properties/CharacterProperty.java @@ -1,5 +1,5 @@ /* - * $Id: CharacterProperty.java,v 1.3 2003/03/05 21:48:02 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,10 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that wrap a character value diff --git a/src/java/org/apache/fop/fo/ColorTypeProperty.java b/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java similarity index 99% rename from src/java/org/apache/fop/fo/ColorTypeProperty.java rename to src/java/org/apache/fop/fo/properties/ColorTypeProperty.java index 125e1dbc4..f85154ef9 100644 --- a/src/java/org/apache/fop/fo/ColorTypeProperty.java +++ b/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java @@ -1,5 +1,5 @@ /* - * $Id: ColorTypeProperty.java,v 1.5 2003/03/05 21:48:02 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,13 +48,14 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import java.awt.Color; import java.util.StringTokenizer; import org.apache.fop.datatypes.ColorType; -import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that wrap ColorType values diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java index aa72ad6de..80ff56d61 100644 --- a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.CondLengthProperty; /** * Stores all common border and padding properties. diff --git a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java index 9a1168072..96cc148e7 100644 --- a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java @@ -53,9 +53,7 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.CompoundDatatype; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.EnumProperty; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; /** diff --git a/src/java/org/apache/fop/fo/CondLengthProperty.java b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/CondLengthProperty.java rename to src/java/org/apache/fop/fo/properties/CondLengthProperty.java index aa2260a41..6eca74439 100644 --- a/src/java/org/apache/fop/fo/CondLengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java @@ -1,5 +1,5 @@ /* - * $Id: CondLengthProperty.java,v 1.5 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,13 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.CompoundDatatype; -import org.apache.fop.fo.properties.CompoundPropertyMaker; +import org.apache.fop.fo.Constants; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that have conditional lengths diff --git a/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java b/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java index 568e3a599..6852b77ae 100644 --- a/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; /** diff --git a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java index c1c324cde..50d03ea20 100644 --- a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; /** diff --git a/src/java/org/apache/fop/fo/EnumProperty.java b/src/java/org/apache/fop/fo/properties/EnumProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/EnumProperty.java rename to src/java/org/apache/fop/fo/properties/EnumProperty.java index 5d09de9c7..600cd8cb0 100644 --- a/src/java/org/apache/fop/fo/EnumProperty.java +++ b/src/java/org/apache/fop/fo/properties/EnumProperty.java @@ -1,5 +1,5 @@ /* - * $Id: EnumProperty.java,v 1.8 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,10 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that wrap an enumeration value diff --git a/src/java/org/apache/fop/datatypes/FixedLength.java b/src/java/org/apache/fop/fo/properties/FixedLength.java similarity index 97% rename from src/java/org/apache/fop/datatypes/FixedLength.java rename to src/java/org/apache/fop/fo/properties/FixedLength.java index 7572c1cf6..c6f2a4b1d 100644 --- a/src/java/org/apache/fop/datatypes/FixedLength.java +++ b/src/java/org/apache/fop/fo/properties/FixedLength.java @@ -1,5 +1,5 @@ /* - * $Id: FixedLength.java,v 1.4 2003/03/05 20:38:23 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,8 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.expr.NumericProperty; /** diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java index 7a19e784e..80344e2b2 100644 --- a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java @@ -51,9 +51,7 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.FixedLength; import org.apache.fop.fo.FOPropertyMapping; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.expr.NumericProperty; diff --git a/src/java/org/apache/fop/fo/KeepProperty.java b/src/java/org/apache/fop/fo/properties/KeepProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/KeepProperty.java rename to src/java/org/apache/fop/fo/properties/KeepProperty.java index a7d659dc3..fb34f7de3 100644 --- a/src/java/org/apache/fop/fo/KeepProperty.java +++ b/src/java/org/apache/fop/fo/properties/KeepProperty.java @@ -1,5 +1,5 @@ /* - * $Id: KeepProperty.java,v 1.3 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,12 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.CompoundDatatype; -import org.apache.fop.fo.properties.CompoundPropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that wrap Keep values @@ -70,7 +71,7 @@ public class KeepProperty extends Property implements CompoundDatatype { /** * @param name name of property for which Maker should be created */ - protected Maker(int propId) { + public Maker(int propId) { super(propId); } diff --git a/src/java/org/apache/fop/fo/LengthPairProperty.java b/src/java/org/apache/fop/fo/properties/LengthPairProperty.java similarity index 96% rename from src/java/org/apache/fop/fo/LengthPairProperty.java rename to src/java/org/apache/fop/fo/properties/LengthPairProperty.java index e56bcab2b..861346b3d 100644 --- a/src/java/org/apache/fop/fo/LengthPairProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthPairProperty.java @@ -1,5 +1,5 @@ /* - * $Id: LengthPairProperty.java,v 1.3 2003/03/05 21:48:02 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,12 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.CompoundDatatype; -import org.apache.fop.fo.properties.CompoundPropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties wrapping a LengthPair value @@ -69,7 +70,7 @@ public class LengthPairProperty extends Property implements CompoundDatatype { /** * @param name name of property for which this Maker should be created */ - protected Maker(int propId) { + public Maker(int propId) { super(propId); } diff --git a/src/java/org/apache/fop/fo/LengthProperty.java b/src/java/org/apache/fop/fo/properties/LengthProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/LengthProperty.java rename to src/java/org/apache/fop/fo/properties/LengthProperty.java index fd69848ce..2588f6f64 100644 --- a/src/java/org/apache/fop/fo/LengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthProperty.java @@ -1,5 +1,5 @@ /* - * $Id: LengthProperty.java,v 1.7 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,13 +48,13 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.AutoLength; import org.apache.fop.datatypes.Length; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.expr.NumericProperty; -import org.apache.fop.fo.properties.PropertyMaker; /** * Superclass for properties wrapping a Length value. diff --git a/src/java/org/apache/fop/fo/LengthRangeProperty.java b/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/LengthRangeProperty.java rename to src/java/org/apache/fop/fo/properties/LengthRangeProperty.java index 218cf5514..3907d0f99 100644 --- a/src/java/org/apache/fop/fo/LengthRangeProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java @@ -1,5 +1,5 @@ /* - * $Id: LengthRangeProperty.java,v 1.5 2003/03/05 21:48:02 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,12 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.CompoundDatatype; -import org.apache.fop.fo.properties.CompoundPropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that contain LengthRange values @@ -75,7 +76,7 @@ public class LengthRangeProperty extends Property implements CompoundDatatype { /** * @param name name of property for which to create Maker */ - protected Maker(int propId) { + public Maker(int propId) { super(propId); } diff --git a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java index b5bf98a76..743786194 100644 --- a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java @@ -51,10 +51,7 @@ package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.PercentLength; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; /** diff --git a/src/java/org/apache/fop/datatypes/LinearCombinationLength.java b/src/java/org/apache/fop/fo/properties/LinearCombinationLength.java similarity index 96% rename from src/java/org/apache/fop/datatypes/LinearCombinationLength.java rename to src/java/org/apache/fop/fo/properties/LinearCombinationLength.java index a853417dd..898bf45ee 100644 --- a/src/java/org/apache/fop/datatypes/LinearCombinationLength.java +++ b/src/java/org/apache/fop/fo/properties/LinearCombinationLength.java @@ -1,5 +1,5 @@ /* - * $Id: LinearCombinationLength.java,v 1.4 2003/03/05 20:38:24 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; import java.util.Vector; -import org.apache.fop.fo.LengthProperty; +import org.apache.fop.datatypes.Length; /** * Class modelling lengths that are build up by combining other lengths diff --git a/src/java/org/apache/fop/fo/ListProperty.java b/src/java/org/apache/fop/fo/properties/ListProperty.java similarity index 96% rename from src/java/org/apache/fop/fo/ListProperty.java rename to src/java/org/apache/fop/fo/properties/ListProperty.java index 1ec8b9d9d..7ed6ac0f4 100644 --- a/src/java/org/apache/fop/fo/ListProperty.java +++ b/src/java/org/apache/fop/fo/properties/ListProperty.java @@ -1,5 +1,5 @@ /* - * $Id: ListProperty.java,v 1.3 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,12 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import java.util.Vector; -import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Superclass for properties that are lists of other properties diff --git a/src/java/org/apache/fop/datatypes/MixedLength.java b/src/java/org/apache/fop/fo/properties/MixedLength.java similarity index 97% rename from src/java/org/apache/fop/datatypes/MixedLength.java rename to src/java/org/apache/fop/fo/properties/MixedLength.java index bc7dd1536..971991121 100644 --- a/src/java/org/apache/fop/datatypes/MixedLength.java +++ b/src/java/org/apache/fop/fo/properties/MixedLength.java @@ -1,5 +1,5 @@ /* - * $Id: MixedLength.java,v 1.6 2003/03/05 20:38:23 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,12 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; import java.util.Enumeration; import java.util.Vector; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.expr.NumericProperty; import org.apache.fop.fo.expr.PropertyException; diff --git a/src/java/org/apache/fop/fo/NumberProperty.java b/src/java/org/apache/fop/fo/properties/NumberProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/NumberProperty.java rename to src/java/org/apache/fop/fo/properties/NumberProperty.java index 9288cb8d7..cccb86ddf 100644 --- a/src/java/org/apache/fop/fo/NumberProperty.java +++ b/src/java/org/apache/fop/fo/properties/NumberProperty.java @@ -1,5 +1,5 @@ /* - * $Id: NumberProperty.java,v 1.6 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,10 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.expr.NumericProperty; -import org.apache.fop.fo.properties.PropertyMaker; /** * Class for handling numeric properties diff --git a/src/java/org/apache/fop/datatypes/PercentLength.java b/src/java/org/apache/fop/fo/properties/PercentLength.java similarity index 97% rename from src/java/org/apache/fop/datatypes/PercentLength.java rename to src/java/org/apache/fop/fo/properties/PercentLength.java index 9d96e7989..7d58df8d2 100644 --- a/src/java/org/apache/fop/datatypes/PercentLength.java +++ b/src/java/org/apache/fop/fo/properties/PercentLength.java @@ -1,5 +1,5 @@ /* - * $Id: PercentLength.java,v 1.6 2003/03/05 20:38:23 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,9 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.LengthProperty; +import org.apache.fop.datatypes.PercentBase; import org.apache.fop.fo.expr.NumericProperty; /** diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/properties/Property.java similarity index 98% rename from src/java/org/apache/fop/fo/Property.java rename to src/java/org/apache/fop/fo/properties/Property.java index 80b68d4ed..855f60a00 100644 --- a/src/java/org/apache/fop/fo/Property.java +++ b/src/java/org/apache/fop/fo/properties/Property.java @@ -1,5 +1,5 @@ /* - * $Id: Property.java,v 1.22 2003/03/05 21:48:02 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,10 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.NumericProperty; + import java.util.Vector; /** diff --git a/src/java/org/apache/fop/fo/properties/PropertyMaker.java b/src/java/org/apache/fop/fo/properties/PropertyMaker.java index 77465a58b..0c130b190 100644 --- a/src/java/org/apache/fop/fo/properties/PropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/PropertyMaker.java @@ -59,8 +59,6 @@ import org.apache.fop.datatypes.LengthBase; import org.apache.fop.datatypes.PercentBase; import org.apache.fop.fo.FOPropertyMapping; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.ListProperty; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.ShorthandParser; import org.apache.fop.fo.expr.PropertyInfo; diff --git a/src/java/org/apache/fop/fo/SpaceProperty.java b/src/java/org/apache/fop/fo/properties/SpaceProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/SpaceProperty.java rename to src/java/org/apache/fop/fo/properties/SpaceProperty.java index 7f2c15425..c67e8042a 100644 --- a/src/java/org/apache/fop/fo/SpaceProperty.java +++ b/src/java/org/apache/fop/fo/properties/SpaceProperty.java @@ -1,5 +1,5 @@ /* - * $Id: SpaceProperty.java,v 1.5 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,10 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.properties.CompoundPropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Base class used for handling properties of the fo:space-before and @@ -70,7 +71,7 @@ public class SpaceProperty extends LengthRangeProperty { /** * @param name name of the property whose Maker is to be created */ - protected Maker(int propId) { + public Maker(int propId) { super(propId); } diff --git a/src/java/org/apache/fop/fo/StringProperty.java b/src/java/org/apache/fop/fo/properties/StringProperty.java similarity index 97% rename from src/java/org/apache/fop/fo/StringProperty.java rename to src/java/org/apache/fop/fo/properties/StringProperty.java index 612e419b5..5ba630957 100644 --- a/src/java/org/apache/fop/fo/StringProperty.java +++ b/src/java/org/apache/fop/fo/properties/StringProperty.java @@ -1,5 +1,5 @@ /* - * $Id: StringProperty.java,v 1.4 2003/03/05 21:48:01 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,10 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.fo; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PropertyMaker; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** * Exists primarily as a container for its Maker inner class, which is diff --git a/src/java/org/apache/fop/datatypes/TableColLength.java b/src/java/org/apache/fop/fo/properties/TableColLength.java similarity index 97% rename from src/java/org/apache/fop/datatypes/TableColLength.java rename to src/java/org/apache/fop/fo/properties/TableColLength.java index 28b9ec436..752fea6a0 100644 --- a/src/java/org/apache/fop/datatypes/TableColLength.java +++ b/src/java/org/apache/fop/fo/properties/TableColLength.java @@ -1,5 +1,5 @@ /* - * $Id: TableColLength.java,v 1.6 2003/03/05 20:38:24 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,9 +48,8 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.expr.NumericProperty; /** diff --git a/src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java similarity index 95% rename from src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java rename to src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java index 8cafe9cf6..77db03940 100644 --- a/src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java +++ b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java @@ -1,5 +1,5 @@ /* - * $Id: ToBeImplementedProperty.java,v 1.6 2003/03/05 20:38:23 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,12 +48,10 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.datatypes; +package org.apache.fop.fo.properties; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; -import org.apache.fop.fo.properties.PropertyMaker; public class ToBeImplementedProperty extends Property { diff --git a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java index 5b153127a..abfacc217 100644 --- a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java @@ -52,9 +52,9 @@ package org.apache.fop.render.rtf; //FOP import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.Property; //RTF import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; diff --git a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java index 994aacfaa..9c2b85139 100644 --- a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java @@ -58,7 +58,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; import org.apache.fop.fo.pagination.Region; import org.apache.fop.fo.pagination.SimplePageMaster; -import org.apache.fop.fo.Property; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.PropertyList; import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfPage; diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 72250b650..68894c3c0 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -59,10 +59,8 @@ import java.util.Iterator; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.Logger; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.EnumProperty; import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.FObj; -import org.apache.fop.datatypes.FixedLength; import org.apache.fop.fo.flow.BasicLink; import org.apache.fop.fo.flow.Block; import org.apache.fop.fo.flow.ExternalGraphic; @@ -84,11 +82,13 @@ 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.EnumProperty; +import org.apache.fop.fo.properties.FixedLength; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.properties.StringProperty; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FOText; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.StringProperty; import org.apache.fop.apps.Document; import org.apache.fop.render.rtf.rtflib.rtfdoc.ITableAttributes; import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfAfterContainer; diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index e7aef684e..57f260c12 100644 --- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java @@ -57,15 +57,15 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.BorderAttributesConverter; 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.expr.NCnameProperty; +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.EnumProperty; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.ListProperty; +import org.apache.fop.fo.properties.NumberProperty; +import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.Constants; -import org.apache.fop.fo.LengthProperty; -import org.apache.fop.fo.ListProperty; import org.apache.fop.fo.PropertyList; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.ColorTypeProperty; -import org.apache.fop.fo.NumberProperty; import org.apache.fop.datatypes.ColorType; import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index d7f7f0d5c..ea26c60d1 100644 --- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java @@ -54,12 +54,12 @@ package org.apache.fop.render.rtf; 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.Constants; -import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.PropertyList; -import org.apache.fop.fo.SpaceProperty; -import org.apache.fop.fo.ColorTypeProperty; +import org.apache.fop.fo.properties.ColorTypeProperty; +import org.apache.fop.fo.properties.EnumProperty; +import org.apache.fop.fo.properties.LengthProperty; +import org.apache.fop.fo.properties.SpaceProperty; import org.apache.fop.datatypes.ColorType; //RTF diff --git a/src/java/org/apache/fop/traits/SpaceVal.java b/src/java/org/apache/fop/traits/SpaceVal.java index b15e8cb49..561721761 100644 --- a/src/java/org/apache/fop/traits/SpaceVal.java +++ b/src/java/org/apache/fop/traits/SpaceVal.java @@ -50,9 +50,9 @@ */ package org.apache.fop.traits; -import org.apache.fop.fo.Property; -import org.apache.fop.fo.SpaceProperty; import org.apache.fop.fo.Constants; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.properties.SpaceProperty; /** * Store a single Space property value in simplified form, with all -- 2.39.5