Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add EasyBind.concat(List<ObservableList<T>>) #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions src/main/java/org/fxmisc/easybind/ConcatList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package org.fxmisc.easybind;

import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;

import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.collections.ObservableListBase;

class ConcatList<E> extends ObservableListBase<E> {
private final List<ObservableList<? extends E>> sourceLists;

public ConcatList(List<ObservableList<? extends E>> sourceLists) {
assert sourceLists != null;
this.sourceLists = sourceLists;
for (ObservableList<? extends E> source : sourceLists)
source.addListener(this::onSourceListChanged);
}

private void onSourceListChanged(ListChangeListener.Change<? extends E> change) {
ObservableList<? extends E> source = change.getList();
int indexOffset = 0;
for (int i = 0; sourceLists.get(i) != source; ++i)
indexOffset += sourceLists.get(i).size();

beginChange();
while (change.next()) {
if (change.wasPermutated()) {
int rangeSize = change.getTo() - change.getFrom();
int[] permutation = new int[rangeSize];
for (int i = 0; i < rangeSize; ++i)
permutation[i] = change.getPermutation(i + change.getFrom()) + indexOffset;
nextPermutation(change.getFrom() + indexOffset, change.getTo() + indexOffset, permutation);
} else if (change.wasUpdated()) {
for (int i = change.getFrom(); i < change.getTo(); ++i)
nextUpdate(i+indexOffset);
} else if (change.wasAdded()) {
nextAdd(change.getFrom()+indexOffset, change.getTo()+indexOffset);
} else
nextRemove(change.getFrom()+indexOffset, change.getRemoved());
}
endChange();
}

@Override
public E get(int index) {
if (index < 0)
throw new IndexOutOfBoundsException("List index must be >= 0. Was " + index);

for (ObservableList<? extends E> source : sourceLists) {
if (index < source.size())
return source.get(index);
index -= source.size();
}
throw new IndexOutOfBoundsException("Index too large.");
}

@Override
public Iterator<E> iterator() {
return new Iterator<E>() {
Iterator<ObservableList<? extends E>> sourceIterator = sourceLists.iterator();
Iterator<? extends E> currentIterator = null;

@Override
public boolean hasNext() {
while (currentIterator == null || !currentIterator.hasNext())
if (sourceIterator.hasNext())
currentIterator = sourceIterator.next().iterator();
else
return false;
return true;
}

@Override
public E next() {
while (currentIterator == null || !currentIterator.hasNext())
if (sourceIterator.hasNext())
currentIterator = sourceIterator.next().iterator();
else
throw new NoSuchElementException();
return currentIterator.next();
}
};
}

@Override
public int size() {
return sourceLists.stream().mapToInt(ObservableList<? extends E>::size).sum();
}
}
11 changes: 11 additions & 0 deletions src/main/java/org/fxmisc/easybind/EasyBind.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.fxmisc.easybind;

import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.function.BiFunction;
Expand Down Expand Up @@ -116,6 +117,16 @@ public static <T, U> ObservableList<U> map(
return new MappedList<>(sourceList, f);
}

public static <T> ObservableList<T> concat(
List<ObservableList<? extends T>> sources) {
return new ConcatList<>(sources);
}

public static <T> ObservableList<T> concat(
ObservableList<? extends T>... sources) {
return new ConcatList<>(Arrays.asList(sources));
}

public static <A, B, R> MonadicBinding<R> combine(
ObservableValue<A> src1,
ObservableValue<B> src2,
Expand Down
45 changes: 45 additions & 0 deletions src/test/java/org/fxmisc/easybind/ConcatListTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package org.fxmisc.easybind;

import static org.junit.Assert.*;

import javafx.beans.binding.Bindings;
import javafx.beans.binding.StringBinding;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

import org.junit.Test;

public class ConcatListTest {
@Test
public void test() {
ObservableList<String> a = FXCollections.observableArrayList("zero", "one", "two");
ObservableList<String> b = FXCollections.observableArrayList("three", "four", "five");
ObservableList<String> c = EasyBind.concat(a, b);
ObservableList<String> d = EasyBind.concat(a, a);

StringBinding bindOne = Bindings.stringValueAt(c, 1);
StringBinding bindFour = Bindings.stringValueAt(c, 4);

assertEquals(6, c.size());
assertEquals("one", bindOne.get());
assertEquals("five", c.get(5));

a.remove(1);
assertEquals(5, c.size());
assertEquals("three", c.get(2));
assertEquals("two", bindOne.get());
assertEquals("five", bindFour.get());

b.add(1, "x");
assertEquals(6, c.size());
assertEquals("x", c.get(3));
assertEquals("four", bindFour.get());

a.set(0, "null");
assertEquals("null", c.get(0));

assertEquals(4, d.size());
assertEquals("two", d.get(1));
assertEquals("null", d.get(2));
}
}