GUI Threads

matsim-org · Jul 23, 2016 · 79c2eb1 · 79c2eb1
1 parent a018657
commit 79c2eb1
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/main/java/org/matsim/contrib/josm/gui/PTToggleDialog.java b/src/main/java/org/matsim/contrib/josm/gui/PTToggleDialog.java
@@ -57,8 +57,17 @@ public class PTToggleDialog extends ToggleDialog implements ActiveLayerChangeLis
 	private final TableView<Route> table_pt = new TableView<>();
 	private final StringProperty title = new SimpleStringProperty("Lines/Routes");
 
-	private final SelectionChangedListener selectionListener = osmPrimitives -> selectionChanged();
 	private FilteredList<Route> selectedRoutes;
+	private final SelectionChangedListener selectionListener = osmPrimitives -> {
+		if (Main.getLayerManager().getEditDataSet() != null) {
+			HashSet<OsmPrimitive> selection = new HashSet<>(Main.main.getInProgressSelection());
+			Platform.runLater(() -> selectedRoutes.setPredicate(route ->
+					selection.contains(route.getRelation()) ||
+							!Collections.disjoint(selection, route.getRelation().getMemberPrimitives())));
+		} else {
+			Platform.runLater(() -> selectedRoutes.setPredicate(route -> false));
+		}
+	};
 
 	@Override
 	public void showNotify() {
@@ -156,22 +165,12 @@ public void init() {
 		enabledness();
 	}
 
-	void selectionChanged() {
-		if (Main.getLayerManager().getEditDataSet() != null) {
-			HashSet<OsmPrimitive> selection = new HashSet<>(Main.main.getInProgressSelection());
-			Platform.runLater(() -> selectedRoutes.setPredicate(route ->
-					selection.contains(route.getRelation()) ||
-					!Collections.disjoint(selection, route.getRelation().getMemberPrimitives())));
-		} else {
-			Platform.runLater(() -> selectedRoutes.setPredicate(route -> false));
-		}
-	}
-
 	@Override
 	public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
 		OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
-		Platform.runLater(() -> {
-			if (editLayer != null) {
+		if (editLayer != null) {
+			HashSet<OsmPrimitive> selection = new HashSet<>(Main.main.getInProgressSelection());
+			Platform.runLater(() -> {
 				NetworkModel networkModel = NetworkModel.createNetworkModel(editLayer.data);
 				ObservableList<Line> lineList = FXCollections.observableArrayList();
 				ObservableList<Route> routeList = FXCollections.observableArrayList();
@@ -190,7 +189,9 @@ public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
 				networkModel.visitAll();
 				selectedRoutes = new FilteredList<>(routeList);
 				table_pt.setItems(selectedRoutes);
-				selectionChanged();
+				selectedRoutes.setPredicate(route ->
+						selection.contains(route.getRelation()) ||
+						!Collections.disjoint(selection, route.getRelation().getMemberPrimitives()));
 				FilteredList<Line> selectedLines = new FilteredList<>(lineList, line -> !Collections.disjoint(line.getRoutes(), selectedRoutes));
 				title.bind(Bindings.createStringBinding(() -> {
 					if (selectedRoutes.isEmpty()) {
@@ -199,11 +200,13 @@ public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
 						return tr("Lines: {0} / Routes: {1}", selectedLines.size(), selectedRoutes.size());
 					}
 				}, selectedLines, selectedRoutes));
-			} else {
+			});
+		} else {
+			Platform.runLater(() -> {
 				table_pt.setItems(FXCollections.emptyObservableList());
 				title.bind(Bindings.createStringBinding(() -> "Lines/Routes"));
-			}
-		});
+			});
+		}
 	}
 
 	@Override