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 2005/08/08 16:28:16 UTC
svn commit: r230806 -
/xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Author: jeremias
Date: Mon Aug 8 07:28:13 2005
New Revision: 230806
URL: http://svn.apache.org/viewcvs?rev=230806&view=rev
Log:
Earlier fix was not quite right. TODO can be removed now.
Early null check to make debugging easier.
Modified:
xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Modified: xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=230806&r1=230805&r2=230806&view=diff
==============================================================================
--- xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Mon Aug 8 07:28:13 2005
@@ -287,10 +287,9 @@
// the letter space is added to <aux glue>,
// while the other elements are not changed
oldList.add(prevBox);
- // TODO check if this is the correct place; merge was not correct
- // already done by above call???? oldList.addFirst((KnuthBox) removeLast());
oldList.addFirst((KnuthGlue) removeLast());
oldList.addFirst((KnuthPenalty) removeLast());
+ oldList.addFirst((KnuthBox) removeLast());
}
// adding a letter space could involve, according to the text
// represented by oldList, replacing a glue element or adding
@@ -682,6 +681,10 @@
lastElement = singleElement;
} else {
lastElement = (KnuthElement) sequence.getLast();
+ if (lastElement == null) {
+ throw new NullPointerException(
+ "Sequence was empty! lastElement is null");
+ }
}
bPrevWasKnuthBox = lastElement.isBox();
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org