diff options
author | Andreas L. Delmelle <adelmelle@apache.org> | 2011-02-01 23:51:21 +0000 |
---|---|---|
committer | Andreas L. Delmelle <adelmelle@apache.org> | 2011-02-01 23:51:21 +0000 |
commit | e1d2e4628bf358cfe74681722013292668517779 (patch) | |
tree | 4dc90269d3868211fc557eae0dccdc9125474115 /src/java/org/apache/fop/fo | |
parent | 587a85e03571738a93cbd69458725bf276dcc541 (diff) | |
download | xmlgraphics-fop-e1d2e4628bf358cfe74681722013292668517779.tar.gz xmlgraphics-fop-e1d2e4628bf358cfe74681722013292668517779.zip |
Commit file necessary to avoid compile error after r1066198
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1066277 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo')
-rw-r--r-- | src/java/org/apache/fop/fo/properties/ListProperty.java | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/fo/properties/ListProperty.java b/src/java/org/apache/fop/fo/properties/ListProperty.java index 4c5208505..6b1ffcea0 100644 --- a/src/java/org/apache/fop/fo/properties/ListProperty.java +++ b/src/java/org/apache/fop/fo/properties/ListProperty.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.fop.fo.FObj; import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.expr.PropertyException; /** * Superclass for properties that are lists of other properties @@ -30,22 +31,23 @@ import org.apache.fop.fo.PropertyList; public class ListProperty extends Property { /** - * Inner class for creating instances of ListProperty + * Inner class for creating instances of {@code ListProperty} */ public static class Maker extends PropertyMaker { /** + * Create a maker for the given property id. * @param propId ID of the property for which Maker should be created */ public Maker(int propId) { super(propId); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ + @Override public Property convertProperty(Property p, - PropertyList propertyList, FObj fo) { + PropertyList propertyList, FObj fo) + throws PropertyException { if (p instanceof ListProperty) { return p; } else { @@ -56,7 +58,7 @@ public class ListProperty extends Property { } /** Vector containing the list of sub-properties */ - protected List list = new java.util.Vector(); + protected final List<Property> list = new java.util.Vector<Property>(); /** * Simple constructor used by subclasses to do some special processing. @@ -66,7 +68,9 @@ public class ListProperty extends Property { } /** - * @param prop the first Property to be added to the list + * Create a new instance, using the given {@link Property} as the first + * element in the list. + * @param prop the first property to be added to the list */ public ListProperty(Property prop) { this(); @@ -82,15 +86,21 @@ public class ListProperty extends Property { } /** - * @return this.list + * Return the {@code java.util.List} of {@link Property} instances + * contained in this property. + * @return the list of properties contained in this instance */ - public List getList() { + @Override + public List<Property> getList() { return list; } /** + * Return the {@code java.util.List} of {@link Property} instances, + * cast as a {@code java.lang.Object}. * @return this.list cast as an Object */ + @Override public Object getObject() { return list; } |