diff options
| author | Simon Pepping <spepping@apache.org> | 2008-06-30 20:11:41 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2008-06-30 20:11:41 +0000 |
| commit | 1aa96c98e760aa42a7e9771936e0e4317dddb424 (patch) | |
| tree | 443d32d93318cbe3cfb8ee6e66084c70764854d4 | |
| parent | e8d9ad9df0f59c48b00dd191b8bec8f7deb39708 (diff) | |
| download | xmlgraphics-fop-1aa96c98e760aa42a7e9771936e0e4317dddb424.tar.gz xmlgraphics-fop-1aa96c98e760aa42a7e9771936e0e4317dddb424.zip | |
Undoing change committed in r670735, because the modified features are
valid Java6 features
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking@672892 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java | 8 | ||||
| -rw-r--r-- | prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java b/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java index a319a8e04..adcb4e98b 100644 --- a/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java +++ b/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java @@ -67,6 +67,7 @@ class ActiveLayouts<L extends Layout> implements Iterable<L> { private Set<V> nextSet; + @Override public boolean hasNext() { while (keyIter.hasNext()) { nextSet = keyIter.next().getValue(); @@ -77,10 +78,12 @@ class ActiveLayouts<L extends Layout> implements Iterable<L> { return false; } + @Override public Iterator<V> next() { return nextSet.iterator(); } + @Override public void remove() { throw new UnsupportedOperationException("Not implemented"); } @@ -150,15 +153,18 @@ class ActiveLayouts<L extends Layout> implements Iterable<L> { L currentLayout; + @Override public boolean hasNext() { return backingIter.hasNext(); } + @Override public L next() { currentLayout = backingIter.next(); return currentLayout; } + @Override public void remove() { backingIter.remove(); other.removeValue(getKey(currentLayout), currentLayout); @@ -168,6 +174,7 @@ class ActiveLayouts<L extends Layout> implements Iterable<L> { } /** {@inheritDoc} */ + @Override public void remove() { throw new UnsupportedOperationException("Not implemented"); } @@ -194,6 +201,7 @@ class ActiveLayouts<L extends Layout> implements Iterable<L> { } /** {@inheritDoc} */ + @Override public Iterator<L> iterator() { return layouts.iterator(); } diff --git a/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java b/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java index 346b4d84a..8136a91e6 100644 --- a/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java +++ b/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java @@ -57,7 +57,7 @@ public class KnuthElement implements TypographicElement { /** {@inheritDoc} */ @Override public String toString() { - if (content.equals("")) { + if (content.isEmpty()) { return ""; } else { return " \"" + content + "\""; |