Skip to content

Commit 4356591

Browse files
committed
remove the flag since it is inconsistent
1 parent 2d18a93 commit 4356591

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener
129129
/** Is change indicator shown, and future been submitted to clear it? */
130130
private final AtomicReference<ScheduledFuture<?>> ongoing_change = new AtomicReference<>();
131131

132-
/** A flag used to help reserve selections during updates, it flags if any of the selections are to be updated */
133-
private final AtomicBoolean selectionChanged = new AtomicBoolean(false);
134-
135132
/** Clear the change indicator */
136133
private final Runnable clear_change_indicator = () ->
137134
Platform.runLater(() ->
@@ -537,7 +534,6 @@ private void performUpdates()
537534
// Remember selection
538535
final ObservableList<TreeItem<AlarmTreeItem<?>>> updatedSelectedItems =
539536
FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems());
540-
selectionChanged.set(false);
541537

542538
// How to update alarm tree cells when data changed?
543539
// `setValue()` with a truly new value (not 'equal') should suffice,
@@ -565,7 +561,6 @@ private void performUpdates()
565561
if (updatedSelectedItems.contains(view_item)) {
566562
updatedSelectedItems.remove(view_item);
567563
updatedSelectedItems.add(update);
568-
selectionChanged.set(true);
569564
}
570565
// Move child links to new item
571566
final ArrayList<TreeItem<AlarmTreeItem<?>>> children = new ArrayList<>(view_item.getChildren());
@@ -577,11 +572,8 @@ private void performUpdates()
577572
parent.getChildren().set(index, update);
578573
}
579574
// Restore selection
580-
if (selectionChanged.get()) {
581-
tree_view.getSelectionModel().clearSelection();
582-
updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item));
583-
selectionChanged.set(false);
584-
}
575+
tree_view.getSelectionModel().clearSelection();
576+
updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item));
585577
}
586578

587579
/** Context menu, details depend on selected items */

0 commit comments

Comments
 (0)