You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/11/13 14:07:34 UTC
svn commit: r594522 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Author: jeremias
Date: Tue Nov 13 05:07:33 2007
New Revision: 594522
URL: http://svn.apache.org/viewvc?rev=594522&view=rev
Log:
More informative overflow message (sometimes the overflow is just a few millipoints and it's nice to know how many).
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=594522&r1=594521&r2=594522&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Tue Nov 13 05:07:33 2007
@@ -19,14 +19,26 @@
package org.apache.fop.layoutmgr.inline;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.area.Area;
+import org.apache.fop.area.LineArea;
+import org.apache.fop.area.Trait;
+import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.Block;
import org.apache.fop.fo.properties.CommonHyphenation;
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.hyphenation.Hyphenation;
import org.apache.fop.hyphenation.Hyphenator;
import org.apache.fop.layoutmgr.BlockLevelLayoutManager;
@@ -49,19 +61,6 @@
import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.layoutmgr.SpaceSpecifier;
-import org.apache.fop.area.Area;
-import org.apache.fop.area.LineArea;
-import org.apache.fop.area.inline.InlineArea;
-
-import java.util.ListIterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import org.apache.fop.area.Trait;
-import org.apache.fop.fonts.Font;
-import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.fonts.FontTriplet;
-
import org.apache.fop.traits.MinOptMax;
/**
@@ -381,11 +380,14 @@
addedPositions = 0;
}
- if (difference + bestActiveNode.availableShrink < 0) {
- if (super.log.isWarnEnabled()) {
- super.log.warn(FONode.decorateWithContextInfo(
+ if (log.isWarnEnabled()) {
+ int lack = difference + bestActiveNode.availableShrink;
+ if (lack < 0) {
+ String textDiff = (lack < -50000 ? "more than 50 points" : (-lack) + "mpt");
+ log.warn(FONode.decorateWithContextInfo(
"Line " + (addedPositions + 1)
- + " of a paragraph overflows the available area.", getFObj()));
+ + " of a paragraph overflows the available area by "
+ + textDiff + ".", getFObj()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org