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 sp...@apache.org on 2008/06/30 22:11:41 UTC
svn commit: r672892 - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype:
breaking/ActiveLayouts.java knuth/KnuthElement.java
Author: spepping
Date: Mon Jun 30 13:11:41 2008
New Revision: 672892
URL: http://svn.apache.org/viewvc?rev=672892&view=rev
Log:
Undoing change committed in r670735, because the modified features are
valid Java6 features
Modified:
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java?rev=672892&r1=672891&r2=672892&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java Mon Jun 30 13:11:41 2008
@@ -67,6 +67,7 @@
private Set<V> nextSet;
+ @Override
public boolean hasNext() {
while (keyIter.hasNext()) {
nextSet = keyIter.next().getValue();
@@ -77,10 +78,12 @@
return false;
}
+ @Override
public Iterator<V> next() {
return nextSet.iterator();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException("Not implemented");
}
@@ -150,15 +153,18 @@
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 @@
}
/** {@inheritDoc} */
+ @Override
public void remove() {
throw new UnsupportedOperationException("Not implemented");
}
@@ -194,6 +201,7 @@
}
/** {@inheritDoc} */
+ @Override
public Iterator<L> iterator() {
return layouts.iterator();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java?rev=672892&r1=672891&r2=672892&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java Mon Jun 30 13:11:41 2008
@@ -57,7 +57,7 @@
/** {@inheritDoc} */
@Override
public String toString() {
- if (content.equals("")) {
+ if (content.isEmpty()) {
return "";
} else {
return " \"" + content + "\"";
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org