aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/area/inline/InlineArea.java
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2011-02-10 14:09:42 +0000
committerJeremias Maerki <jeremias@apache.org>2011-02-10 14:09:42 +0000
commitdf68e0c99457e88e53bb6a434487712902ff382d (patch)
tree919f2e9441c2c188e98ab52a2b1144f7562d5941 /src/java/org/apache/fop/area/inline/InlineArea.java
parentb190db6910a3e133d8c1696b4730d77383f98c92 (diff)
parentf1269cc280b846cd6da396177bc74c4c9808579e (diff)
downloadxmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.tar.gz
xmlgraphics-fop-df68e0c99457e88e53bb6a434487712902ff382d.zip
Merge from Trunk, revisions 1060235 to 1069383.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color@1069397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/area/inline/InlineArea.java')
-rw-r--r--src/java/org/apache/fop/area/inline/InlineArea.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java
index 3450b99be..515f45b68 100644
--- a/src/java/org/apache/fop/area/inline/InlineArea.java
+++ b/src/java/org/apache/fop/area/inline/InlineArea.java
@@ -178,6 +178,7 @@ public class InlineArea extends Area {
*
* {@inheritDoc}
*/
+ @Override
public void addChildArea(Area childArea) {
super.addChildArea(childArea);
if (childArea instanceof InlineArea) {
@@ -185,9 +186,7 @@ public class InlineArea extends Area {
}
}
- /**
- *@return true if the inline area is underlined.
- */
+ /** @return true if the inline area is underlined. */
public boolean hasUnderline() {
return getTraitAsBoolean(Trait.UNDERLINE);
}