aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/area/inline
diff options
context:
space:
mode:
authorPeter Hancock <phancock@apache.org>2012-12-13 11:41:49 +0000
committerPeter Hancock <phancock@apache.org>2012-12-13 11:41:49 +0000
commit3f386d59ca9abaf9eecbee57966fd3ada3a6e8c6 (patch)
treef4937adb34e7cb9b5c0f3f1cf1ac3017bef5740c /src/java/org/apache/fop/area/inline
parent50ec77f77b34bcaeec2d2525a9e102da04b9b6fd (diff)
downloadxmlgraphics-fop-3f386d59ca9abaf9eecbee57966fd3ada3a6e8c6.tar.gz
xmlgraphics-fop-3f386d59ca9abaf9eecbee57966fd3ada3a6e8c6.zip
Bugzilla 37114: Implementation of changes necessary to warn of invalid property values.
Contributed by Robert Meyer. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1421238 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/area/inline')
-rw-r--r--src/java/org/apache/fop/area/inline/InlineArea.java2
-rw-r--r--src/java/org/apache/fop/area/inline/InlineParent.java8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java
index 5fa156ac8..37930f3ba 100644
--- a/src/java/org/apache/fop/area/inline/InlineArea.java
+++ b/src/java/org/apache/fop/area/inline/InlineArea.java
@@ -270,7 +270,7 @@ public class InlineArea extends Area {
storedIPDVariation += ipdVariation;
}
}
-
+
/**
* Returns the offset that this area would have if its offset and size were taking
* children areas into account. The bpd of an inline area is taken from its nominal
diff --git a/src/java/org/apache/fop/area/inline/InlineParent.java b/src/java/org/apache/fop/area/inline/InlineParent.java
index 405d71a50..4d3f27b30 100644
--- a/src/java/org/apache/fop/area/inline/InlineParent.java
+++ b/src/java/org/apache/fop/area/inline/InlineParent.java
@@ -20,7 +20,9 @@
package org.apache.fop.area.inline;
import java.util.Iterator;
+import java.util.ArrayList;
import java.util.List;
+import java.lang.Math;
import org.apache.fop.area.Area;
@@ -35,14 +37,14 @@ public class InlineParent extends InlineArea {
/**
* The list of inline areas added to this inline parent.
*/
- protected List<InlineArea> inlines = new java.util.ArrayList<InlineArea>();
+ protected List<InlineArea> inlines = new ArrayList<InlineArea>();
/** Controls whether the IPD is automatically adjusted based on the area's children. */
protected transient boolean autoSize;
-
+
/** The offset of the <q>beforest</q> child area of this area. */
protected int minChildOffset;
-
+
/**
* The offset of the <q>afterest</q> child area of this area. Offset from the
* before-edge of this area's content-rectangle and the after-edge of the child area's