Merge pull request #173 from igorpisarev/build-fixes

Build fixes: Eclipse Oxygen, Oracle JDK 10
saalfeldlab · Dec 17, 2018 · 0e5082c · 0e5082c
2 parents e3793a0 + 98729b7
commit 0e5082c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/src/main/java/org/janelia/saalfeldlab/fx/MenuFromHandlers.java b/src/main/java/org/janelia/saalfeldlab/fx/MenuFromHandlers.java
@@ -144,30 +144,4 @@ public MenuPath parent()
 		}
 
 	}
-
-	public static void main(String[] args)
-	{
-		PlatformImpl.startup(() -> {});
-
-		ContextMenu menu = new MenuFromHandlers(Arrays.asList(
-				new Pair<>("bla>3>4", e -> System.out.println("bla 3 4")),
-				new Pair<>("bla>3", e -> System.out.println("bla 3")),
-				new Pair<>("tl", e -> System.out.println("top level"))
-		)).asContextMenu("MENU");
-
-
-		Platform.runLater(() -> {
-			Stage stage = new Stage();
-			StackPane root = new StackPane();
-			root.addEventHandler(MouseEvent.MOUSE_PRESSED, e -> menu.show(root, e.getScreenX(), e.getScreenY()));
-			Scene scene = new Scene(root, 800, 600);
-			stage.setScene(scene);
-			stage.show();
-		});
-
-
-	}
-
-
-
 }
diff --git a/src/main/java/org/janelia/saalfeldlab/paintera/state/IntersectingSourceState.java b/src/main/java/org/janelia/saalfeldlab/paintera/state/IntersectingSourceState.java
@@ -62,6 +62,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -132,7 +133,7 @@ public <D extends IntegerType<D>, T extends Type<T>, B extends BooleanType<B>> I
 				new SimpleIntegerProperty(),
 				manager,
 				workers,
-				TLongHashSet::toArray,
+				(Function<TLongHashSet, long[]>)TLongHashSet::toArray,
 				hs -> hs
 		);
 		final ObjectBinding<Color> colorProperty = Bindings.createObjectBinding(