FXBindings: fixed warnings
Change-Id: Id3a6a911af0510e434e2770e2935b144bf1ee9e9
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/FXBindings.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/FXBindings.java
index 54e65dc..dc920ad 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/FXBindings.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/FXBindings.java
@@ -12,7 +12,6 @@
import java.util.function.Function;
-import org.eclipse.fx.core.Subscription;
import org.eclipse.fx.core.ThreadSynchronize;
import org.eclipse.fx.core.bindings.internal.ConcatListBinding;
import org.eclipse.fx.core.bindings.internal.FlatMapListBinding;
@@ -21,7 +20,6 @@
import org.eclipse.fx.core.bindings.internal.SyncListBinding;
import org.eclipse.fx.core.bindings.internal.SyncObjectBinding;
-import javafx.beans.binding.Bindings;
import javafx.beans.binding.ListBinding;
import javafx.beans.binding.ObjectBinding;
import javafx.beans.value.ObservableValue;
@@ -38,8 +36,9 @@
/**
* Concatenates multiple observable lists together.
* @param sources
- * @return
+ * @return the concatinated list binding
*/
+ @SuppressWarnings("unchecked")
public static <A> ListBinding<A> concat(ObservableList<A>... sources) {
return new ConcatListBinding<>(sources);
}
@@ -48,17 +47,17 @@
* Maps an obserbable list
* @param source
* @param map
- * @return
+ * @return the mapped list binding
*/
public static <A, B> ListBinding<B> map(ObservableList<A> source, Function<A, B> map) {
- return new MapListBinding(source, map);
+ return new MapListBinding<A, B>(source, map);
}
/**
* Flat maps an observable list with observable lists
* @param source
* @param map
- * @return
+ * @return the flat mapped list binding
*/
public static <A, B> ListBinding<B> flatMapList(ObservableList<A> source, Function<A, ObservableList<B>> map) {
return new FlatMapListBinding<A, B>(source, map);
@@ -68,7 +67,7 @@
* Flat maps an observable list with observable values
* @param source
* @param map
- * @return
+ * @return the flat mapped list binding
*/
public static <A, B> ListBinding<B> flatMapValue(ObservableList<A> source, Function<A, ObservableValue<B>> map) {
return new FlatMapValueListBinding<>(source, map);
@@ -78,7 +77,7 @@
* allows to sync between threads
* @param source
* @param thread
- * @return
+ * @return the synced list binding
*/
public static <A> ListBinding<A> syncList(ObservableList<A> source, ThreadSynchronize thread) {
return new SyncListBinding<>(source, thread);
@@ -88,7 +87,7 @@
* allows to sync between threads
* @param source
* @param thread
- * @return
+ * @return the synced object binding
*/
public static <A> ObjectBinding<A> syncValue(ObservableValue<A> source, ThreadSynchronize thread) {
return new SyncObjectBinding<>(source, thread);
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/ConcatListBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/ConcatListBinding.java
index 4c2dbe7..02c2727 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/ConcatListBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/ConcatListBinding.java
@@ -16,6 +16,7 @@
import javafx.collections.ObservableList;
+@SuppressWarnings("javadoc")
public class ConcatListBinding<A> extends ListBinding<A> {
private ObservableList<A>[] source;
@@ -34,6 +35,7 @@
}
}
+ @SuppressWarnings("unchecked")
public ConcatListBinding(ObservableList<A>... source) {
this.source = source;
initListeners();
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapListBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapListBinding.java
index 4226517..0eaf081 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapListBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapListBinding.java
@@ -20,6 +20,7 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+@SuppressWarnings("javadoc")
public class FlatMapListBinding<A, B> extends ListBinding<B> {
private Set<ObservableList<?>> cur = new HashSet<>();
@@ -38,9 +39,9 @@
}
private void fixListener() {
- Set<ObservableList<?>> toWatch = source.stream().map(map).collect(Collectors.toSet());
- Set<ObservableList<?>> toDispose = new HashSet<>(cur); toDispose.removeIf(x->toWatch.stream().anyMatch(c->System.identityHashCode(c) == System.identityHashCode(x)));
- Set<ObservableList<?>> toAdd = new HashSet<>(toWatch); toAdd.removeIf(x->cur.stream().anyMatch(c->System.identityHashCode(c) == System.identityHashCode(x)));
+ Set<ObservableList<?>> toWatch = this.source.stream().map(this.map).collect(Collectors.toSet());
+ Set<ObservableList<?>> toDispose = new HashSet<>(this.cur); toDispose.removeIf(x->toWatch.stream().anyMatch(c->System.identityHashCode(c) == System.identityHashCode(x)));
+ Set<ObservableList<?>> toAdd = new HashSet<>(toWatch); toAdd.removeIf(x->this.cur.stream().anyMatch(c->System.identityHashCode(c) == System.identityHashCode(x)));
for (ObservableList<?> d : toDispose) {
d.removeListener(this.onInvalidate);
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapValueListBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapValueListBinding.java
index 6212666..dfbf5a6 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapValueListBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/FlatMapValueListBinding.java
@@ -21,6 +21,7 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+@SuppressWarnings("javadoc")
public class FlatMapValueListBinding<A, B> extends ListBinding<B> {
private Set<ObservableValue<?>> cur = new HashSet<>();
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/MapListBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/MapListBinding.java
index 5bea4ab..12afbeb 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/MapListBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/MapListBinding.java
@@ -18,6 +18,7 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+@SuppressWarnings("javadoc")
public class MapListBinding<A, B> extends ListBinding<B> {
private ObservableList<A> source;
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncListBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncListBinding.java
index b697d45..77cc286 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncListBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncListBinding.java
@@ -17,6 +17,7 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+@SuppressWarnings("javadoc")
public class SyncListBinding<A> extends ListBinding<A> {
private ObservableList<A> source;
@@ -45,7 +46,7 @@
@Override
protected ObservableList<A> computeValue() {
- return FXCollections.observableArrayList(source);
+ return FXCollections.observableArrayList(this.source);
}
}
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncObjectBinding.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncObjectBinding.java
index a3d85d2..fd52f27 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncObjectBinding.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/bindings/internal/SyncObjectBinding.java
@@ -16,6 +16,7 @@
import javafx.beans.binding.ObjectBinding;
import javafx.beans.value.ObservableValue;
+@SuppressWarnings("javadoc")
public class SyncObjectBinding<A> extends ObjectBinding<A> {
private ObservableValue<A> source;
