diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2008-12-09 15:00:35 +0000 |
| commit | a6ddced309701a1ca8d79a9e7bec3288afba2cc8 (patch) | |
| tree | c3d2bcfe7277246d9a2acc3675721a99f4de5727 /src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java | |
| parent | 9d339f0968314f0cfcc4a720628fed1845292ce1 (diff) | |
| parent | f9d4720b99f5e0fb423b097d7207dfab446d911c (diff) | |
| download | xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.tar.gz xmlgraphics-fop-a6ddced309701a1ca8d79a9e7bec3288afba2cc8.zip | |
Merge from Trunk revisions 719662 - 724689.
Conflict for ImageHandler interface resolved by renaming Trunk's ImageHandler to ImageHandlerBase and extending the other ImageHandler from that.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@724729 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java')
| -rwxr-xr-x | src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java b/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java index 665a77562..6b4bc4eb9 100755 --- a/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java @@ -19,14 +19,13 @@ package org.apache.fop.render.afp.extensions; -import org.apache.fop.apps.FOPException; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.StringProperty; /** * This class extends the org.apache.fop.fo.StringProperty.Maker inner class - * in order to provide a static property maker. The object faciliates + * in order to provide a static property maker. The object facilitates * extraction of attributes from formatted objects based on the static list * as defined in the AFPElementMapping implementation. * <p/> @@ -58,5 +57,4 @@ public class AFPAttribute extends StringProperty.Maker { } return property; } - }
\ No newline at end of file |