eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-15 10:18:45 +00:00
Code Activity

Merge branch 'bug5784_fix' into bug5784

Browse Source
This commit is contained in:
Axel Uhl
2023-01-17 15:10:03 +01:00
parent 49cc18acfa 9f00303fba
commit f9aeedce10
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.common/src/com/sap/sse/common/Util.java
+21 -21
View File
@@ -391,16 +391,15 @@ public class Util {
*/
public static <T> Iterable<T> concat(final Iterable<Iterable<T>> iterables) {
return new Iterable<T>() {
final Iterator<Iterable<T>> iterableIter = iterables.iterator();
Iterable<T> iterable = null;
Iterator<T> iter; // loops over the "iterable"; when iterable is not null, iter is not null
boolean nextValid;
T next;
@Override
public Iterator<T> iterator() {
advance();
return new Iterator<T>() {
final Iterator<Iterable<T>> iterableIter = iterables.iterator();
Iterable<T> iterable = null;
Iterator<T> iter; // loops over the "iterable"; when iterable is not null, iter is not null
boolean nextValid;
T next;
@Override
public boolean hasNext() {
return nextValid;
@@ -412,21 +411,22 @@ public class Util {
advance();
return result;
}
};
}
private void advance() {
// first ensure we have a valid iterable with a next element if possible:
while ((iterable == null || !iter.hasNext()) && iterableIter.hasNext()) {
iterable = iterableIter.next();
if (iterable != null) {
iter = iterable.iterator();
private Iterator<T> advance() {
// first ensure we have a valid iterable with a next element if possible:
while ((iterable == null || !iter.hasNext()) && iterableIter.hasNext()) {
iterable = iterableIter.next();
if (iterable != null) {
iter = iterable.iterator();
}
}
nextValid = iter != null && iter.hasNext();
if (nextValid) {
next = iter.next();
}
return this;
}
}
nextValid = iter != null && iter.hasNext();
if (nextValid) {
next = iter.next();
}
}.advance();
}
};
}