PR:

Obtained from:
Submitted by:
Reviewed by:
Moved the property shorthand parser code into the properties package.


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

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

@@ -23,12 +23,14 @@ import java.util.Map;
 
 import org.apache.fop.datatypes.LengthBase;
 import org.apache.fop.fo.properties.BorderWidthPropertyMaker;
+import org.apache.fop.fo.properties.BoxPropShorthandParser;
 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.GenericShorthandParser;
 import org.apache.fop.fo.properties.IndentPropertyMaker;
 import org.apache.fop.fo.properties.KeepProperty;
 import org.apache.fop.fo.properties.LengthPairProperty;
@@ -39,6 +41,7 @@ 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.ShorthandParser;
 import org.apache.fop.fo.properties.SpaceProperty;
 import org.apache.fop.fo.properties.SpacingPropertyMaker;
 import org.apache.fop.fo.properties.StringProperty;

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

@@ -16,11 +16,10 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo;
+package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.ListProperty;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.PropertyMaker;
+import org.apache.fop.fo.FOPropertyMapping;
+import org.apache.fop.fo.PropertyList;
 
 /**
  * Shorthand property parser for Box properties

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

@@ -16,13 +16,10 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo;
+package org.apache.fop.fo.properties;
 
 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;
+import org.apache.fop.fo.PropertyList;
 
 public class GenericShorthandParser implements ShorthandParser {
 

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

@@ -28,7 +28,6 @@ import org.apache.fop.datatypes.PercentBase;
 import org.apache.fop.fo.FOPropertyMapping;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.ShorthandParser;
 import org.apache.fop.fo.expr.PropertyInfo;
 import org.apache.fop.fo.expr.PropertyParser;
 

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

@@ -16,11 +16,9 @@
 
 /* $Id$ */
 
-package org.apache.fop.fo;
+package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.ListProperty;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.PropertyMaker;
+import org.apache.fop.fo.PropertyList;
 
 /**
  * Interface used to provide parsing capabilities to Properties with shorthand