Skip to content

Fix alarm tree selection preservations #3667

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.

Sign up for GitHub

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

Open
shroffk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix alarm tree selection preservations #3667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d18a93
preserve the selection for the alarm tree
shroffk Nov 25, 2025
4356591
remove the flag since it is inconsistent
shroffk Nov 25, 2025
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
13 changes: 13 additions & 0 deletions app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.stream.Collectors;

import javafx.collections.FXCollections;
import org.phoebus.applications.alarm.AlarmSystem;
import org.phoebus.applications.alarm.client.AlarmClient;
import org.phoebus.applications.alarm.client.AlarmClientLeaf;
Expand Down Expand Up @@ -529,6 +531,10 @@ private void performUpdates()
items_to_update.clear();
}

// Remember selection
final ObservableList<TreeItem<AlarmTreeItem<?>>> updatedSelectedItems =
FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems());

// How to update alarm tree cells when data changed?
// `setValue()` with a truly new value (not 'equal') should suffice,
// but there are two problems:
Expand All @@ -552,6 +558,10 @@ private void performUpdates()
// Create new TreeItem for that value
final AlarmTreeItem<?> value = view_item.getValue();
final TreeItem<AlarmTreeItem<?>> update = new TreeItem<>(value);
if (updatedSelectedItems.contains(view_item)) {
updatedSelectedItems.remove(view_item);
updatedSelectedItems.add(update);
}
// Move child links to new item
final ArrayList<TreeItem<AlarmTreeItem<?>>> children = new ArrayList<>(view_item.getChildren());
view_item.getChildren().clear();
Expand All @@ -561,6 +571,9 @@ private void performUpdates()
path2view.put(value.getPathName(), update);
parent.getChildren().set(index, update);
}
// Restore selection
tree_view.getSelectionModel().clearSelection();
updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item));
}

/** Context menu, details depend on selected items */
Expand Down