diff options
Diffstat (limited to 'src/java/org/apache/fop/fo')
| -rw-r--r-- | src/java/org/apache/fop/fo/FOPropertyMapping.java | 3 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java (renamed from src/java/org/apache/fop/fo/BoxPropShorthandParser.java) | 7 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/GenericShorthandParser.java (renamed from src/java/org/apache/fop/fo/GenericShorthandParser.java) | 7 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/PropertyMaker.java | 1 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/ShorthandParser.java (renamed from src/java/org/apache/fop/fo/ShorthandParser.java) | 6 |
5 files changed, 10 insertions, 14 deletions
diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 54d89b247..a821654f4 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/BoxPropShorthandParser.java b/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java index 524458917..5e0d079ca 100644 --- a/src/java/org/apache/fop/fo/BoxPropShorthandParser.java +++ b/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 diff --git a/src/java/org/apache/fop/fo/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java index cf1d8da60..54be52421 100644 --- a/src/java/org/apache/fop/fo/GenericShorthandParser.java +++ b/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 { diff --git a/src/java/org/apache/fop/fo/properties/PropertyMaker.java b/src/java/org/apache/fop/fo/properties/PropertyMaker.java index 5a32d02a6..228e3472c 100644 --- a/src/java/org/apache/fop/fo/properties/PropertyMaker.java +++ b/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; diff --git a/src/java/org/apache/fop/fo/ShorthandParser.java b/src/java/org/apache/fop/fo/properties/ShorthandParser.java index 38fcc7a7f..b8045b759 100644 --- a/src/java/org/apache/fop/fo/ShorthandParser.java +++ b/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 |