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

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.

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;
 
 /**

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

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;

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 {

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;
 
 /**

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;

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;
 
 /**

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.

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.

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 {
 

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 {

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;
 
 
 /**

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;
 
 
 /**

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.

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;
 
 /**

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

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

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

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

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;
 
 /**

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

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

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

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;
 

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 {

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() {

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

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;
 
 /**

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.

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

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;
 
 
 /**

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;
 
 /**

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;
 

src/java/org/apache/fop/datatypes/AutoLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */ 
-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".

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;
 
 /**

src/java/org/apache/fop/fo/CharacterProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/fo/ColorTypeProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

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.

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;
 
 /**

src/java/org/apache/fop/fo/CondLengthProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

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;
 
 /**

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;
 
 /**

src/java/org/apache/fop/fo/EnumProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/datatypes/FixedLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.datatypes;
+package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.expr.NumericProperty;
 
 /**

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;
 

src/java/org/apache/fop/fo/KeepProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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);
         }
 

src/java/org/apache/fop/fo/LengthPairProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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);
         }
 

src/java/org/apache/fop/fo/LengthProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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.

src/java/org/apache/fop/fo/LengthRangeProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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);
         }
 

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;
 
 /**

src/java/org/apache/fop/datatypes/LinearCombinationLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/fo/ListProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/datatypes/MixedLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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;
 

src/java/org/apache/fop/fo/NumberProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/datatypes/PercentLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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;
 
 /**

src/java/org/apache/fop/fo/Property.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.fo;
+package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.NumericProperty;
+
 import java.util.Vector;
 
 /**

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;

src/java/org/apache/fop/fo/SpaceProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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);
         }
 

src/java/org/apache/fop/fo/StringProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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

src/java/org/apache/fop/datatypes/TableColLength.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.datatypes;
+package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.expr.NumericProperty;
 
 /**

src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java → 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 <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-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 {
 

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;

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;

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;

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;

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

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