From e7dabf2fb75a53de7dc36c1c42d313339161e54d Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Thu, 22 Oct 2026 16:06:07 +0100 Subject: [PATCH 1/7] Add editing mode to alarm tree --- .../alarm/ui/tree/AlarmTreeInstance.java | 9 +++++++ .../alarm/ui/tree/AlarmTreeView.java | 25 +++++++++++++------ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java index f9254c349f..913d757fd5 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java @@ -15,9 +15,11 @@ import java.util.concurrent.CompletableFuture; import java.util.logging.Level; +import javafx.scene.control.CheckBox; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.ui.AlarmConfigSelector; +import org.phoebus.applications.alarm.ui.AlarmUI; import org.phoebus.applications.alarm.ui.AlarmURI; import org.phoebus.framework.spi.AppDescriptor; import org.phoebus.framework.spi.AppInstance; @@ -96,6 +98,13 @@ private Node create(final URI input, String itemName) throws Exception tree_view.getToolbar().getItems().add(0, configs); } + if (AlarmUI.mayConfigure(client)) { + final CheckBox editingModeCheckbox = new CheckBox("Editing mode"); + editingModeCheckbox.setSelected(false); + editingModeCheckbox.setOnAction(_ -> tree_view.toggleEditingMode()); + tree_view.getToolbar().getItems().add(1, editingModeCheckbox); + } + return tree_view; } catch (final Exception ex) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index f3d65c9801..0ee582566d 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -23,6 +23,8 @@ import java.util.logging.Level; import java.util.stream.Collectors; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; @@ -140,6 +142,8 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener items.remove(changing); }); + private SimpleBooleanProperty isEditingMode = new SimpleBooleanProperty(false); + // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. // @@ -331,7 +335,7 @@ private void indicateChange() setCursor(Cursor.WAIT); final ObservableList items = getToolbar().getItems(); if (! items.contains(changing)) - items.add(1, changing); + items.add(2, changing); } else previous.cancel(false); @@ -344,8 +348,7 @@ private void showServerState(final boolean alive) items.remove(no_server); if (! alive) // Place left of spring, collapse, expand_alarms, - // i.e. right of potential AlarmConfigSelector - items.add(items.size()-3, no_server); + items.add(items.size()-4, no_server); } // AlarmClientModelListener @@ -593,7 +596,7 @@ private void createContextMenu() if (menu_items.size() > 0) menu_items.add(new SeparatorMenuItem()); - if (AlarmUI.mayConfigure(model)) + if (AlarmUI.mayConfigure(model) && isEditingMode.get()) { if (selection.size() <= 0) // Add first item to empty config @@ -621,9 +624,10 @@ else if (selection.size() == 1) menu_items.add(new RemoveComponentAction(tree_view, model, selection)); } + + menu_items.add(new SeparatorMenuItem()); } - menu_items.add(new SeparatorMenuItem()); menu_items.add(new PrintAction(tree_view)); menu_items.add(new SaveSnapshotAction(DockPane.getActiveDockPane())); @@ -657,9 +661,10 @@ private void addClickSupport() { tree_view.setOnMouseClicked(event -> { - if (!AlarmUI.mayConfigure(model) || - event.getClickCount() != 2 || - tree_view.getSelectionModel().getSelectedItems().size() != 1) + if (!AlarmUI.mayConfigure(model) + || !isEditingMode.get() + || event.getClickCount() != 2 + || tree_view.getSelectionModel().getSelectedItems().size() != 1) return; final AlarmTreeItem item = tree_view.getSelectionModel().getSelectedItems().get(0).getValue(); @@ -717,4 +722,8 @@ private void dumpTree(TreeItem> item) dumpTree(child); } } + + public void toggleEditingMode() { + isEditingMode.set(!isEditingMode.get()); + } } From e5175a244aaaaf8af805dadcc0986cb88e708395 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 12:22:38 +0000 Subject: [PATCH 2/7] Address sonar cloud lint, remove unused import --- .../org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 0ee582566d..34614854bb 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import java.util.stream.Collectors; -import javafx.beans.property.BooleanProperty; + import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; import org.phoebus.applications.alarm.AlarmSystem; @@ -142,7 +142,7 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener items.remove(changing); }); - private SimpleBooleanProperty isEditingMode = new SimpleBooleanProperty(false); + private final SimpleBooleanProperty isEditingMode = new SimpleBooleanProperty(false); // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. From e18a48930371486a592fd5e60792b5af093e7d39 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 15:09:37 +0000 Subject: [PATCH 3/7] Change editing mode checkbox to icon button --- .../alarm/ui/tree/AlarmTreeInstance.java | 9 --------- .../alarm/ui/tree/AlarmTreeView.java | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java index 913d757fd5..f9254c349f 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeInstance.java @@ -15,11 +15,9 @@ import java.util.concurrent.CompletableFuture; import java.util.logging.Level; -import javafx.scene.control.CheckBox; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.ui.AlarmConfigSelector; -import org.phoebus.applications.alarm.ui.AlarmUI; import org.phoebus.applications.alarm.ui.AlarmURI; import org.phoebus.framework.spi.AppDescriptor; import org.phoebus.framework.spi.AppInstance; @@ -98,13 +96,6 @@ private Node create(final URI input, String itemName) throws Exception tree_view.getToolbar().getItems().add(0, configs); } - if (AlarmUI.mayConfigure(client)) { - final CheckBox editingModeCheckbox = new CheckBox("Editing mode"); - editingModeCheckbox.setSelected(false); - editingModeCheckbox.setOnAction(_ -> tree_view.toggleEditingMode()); - tree_view.getToolbar().getItems().add(1, editingModeCheckbox); - } - return tree_view; } catch (final Exception ex) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 34614854bb..53cea5a340 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -26,6 +26,7 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; +import javafx.scene.control.ToggleButton; import org.phoebus.applications.alarm.AlarmSystem; import org.phoebus.applications.alarm.client.AlarmClient; import org.phoebus.applications.alarm.client.AlarmClientLeaf; @@ -180,7 +181,7 @@ public AlarmTreeView(final AlarmClient model, String itemName) tree_view.setCellFactory(view -> new AlarmTreeViewCell()); tree_view.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); - setTop(createToolbar()); + setTop(createToolbar(model)); setCenter(tree_view); createContextMenu(); @@ -238,8 +239,16 @@ private void startup() }); } - private ToolBar createToolbar() + private ToolBar createToolbar(final AlarmClient model) { + final ToggleButton editing = new ToggleButton("", + ImageCache.getImageView(AlarmUI.class, "/icons/edit.png") + ); + isEditingMode.bind(editing.selectedProperty()); + if (!AlarmUI.mayConfigure(model)) { + editing.setDisable(true); + } + final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); collapse.setTooltip(new Tooltip("Collapse alarm tree")); @@ -259,7 +268,7 @@ private ToolBar createToolbar() show_disabled.setTooltip(new Tooltip("Expand alarm tree to show disabled PVs")); show_disabled.setOnAction(event -> expandDisabledPVs(tree_view.getRoot())); - return new ToolBar(no_server, changing, ToolbarHelper.createSpring(), collapse, show_alarms, show_disabled); + return new ToolBar(no_server, changing, ToolbarHelper.createSpring(), editing, collapse, show_alarms, show_disabled); } ToolBar getToolbar() @@ -722,8 +731,4 @@ private void dumpTree(TreeItem> item) dumpTree(child); } } - - public void toggleEditingMode() { - isEditingMode.set(!isEditingMode.get()); - } } From 22c6084f1990cfa81e199082a5cc55b5c234772e Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 15:14:11 +0000 Subject: [PATCH 4/7] Show enable/disable alarms when not in editing mode --- .../alarm/ui/tree/AlarmTreeView.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 53cea5a340..12a55101bf 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -626,17 +626,18 @@ else if (selection.size() == 1) menu_items.add(new MoveTreeItemAction(tree_view, model, item)); } - if (selection.size() >= 1) - { - menu_items.add(new EnableComponentAction(tree_view, model, selection)); - menu_items.add(new DisableAction(tree_view, model, selection)); - menu_items.add(new RemoveComponentAction(tree_view, model, selection)); - - } + } - menu_items.add(new SeparatorMenuItem()); + if (selection.size() >= 1) + { + menu_items.add(new EnableComponentAction(tree_view, model, selection)); + menu_items.add(new DisableAction(tree_view, model, selection)); + if (AlarmUI.mayConfigure(model) && isEditingMode.get()) + menu_items.add(new RemoveComponentAction(tree_view, model, selection)); } + menu_items.add(new SeparatorMenuItem()); + menu_items.add(new PrintAction(tree_view)); menu_items.add(new SaveSnapshotAction(DockPane.getActiveDockPane())); From 98c34021f35c2353fe2c31ca1b1328bd562009db Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 15:16:07 +0000 Subject: [PATCH 5/7] enable editing mode by default --- .../org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 12a55101bf..59696d567b 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -245,6 +245,7 @@ private ToolBar createToolbar(final AlarmClient model) ImageCache.getImageView(AlarmUI.class, "/icons/edit.png") ); isEditingMode.bind(editing.selectedProperty()); + editing.setSelected(true); if (!AlarmUI.mayConfigure(model)) { editing.setDisable(true); } From 27131d6e326c0a8153443341c152f2b963cba1c2 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Tue, 27 Oct 2026 15:25:34 +0000 Subject: [PATCH 6/7] Add editing mode tooltip + migrate collapse/expand tooltips to use Messages --- .../applications/alarm/ui/Messages.java | 4 ++++ .../alarm/ui/tree/AlarmTreeView.java | 21 ++++++++++--------- .../applications/alarm/ui/messages.properties | 4 ++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java index 13272352db..a32d13d6d1 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/Messages.java @@ -17,6 +17,7 @@ public class Messages public static String addComponentFailed; public static String automatedActions; public static String commands; + public static String collapseTooltip; public static String configure; public static String delayTooltip0; public static String delayTooltip1; @@ -30,6 +31,7 @@ public class Messages public static String disabledCommonEnableDate; public static String disabledVaryingEnableDate; public static String displays; + public static String editingModeTooltip; public static String enableAlarmFailed; public static String enableAlarms; public static String guidance; @@ -43,6 +45,8 @@ public class Messages public static String promptTitle; public static String removeComponentFailed; public static String renameItemFailed; + public static String showAlarmsTooltip; + public static String showDisabledTooltip; public static String totalPVs; public static String unacknowledgeFailed; public static String withEnableDate; diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 59696d567b..071ef5c5c2 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -36,6 +36,7 @@ import org.phoebus.applications.alarm.model.BasicState; import org.phoebus.applications.alarm.ui.AlarmContextMenuHelper; import org.phoebus.applications.alarm.ui.AlarmUI; +import org.phoebus.applications.alarm.ui.Messages; import org.phoebus.applications.alarm.ui.config.ItemConfigDialog; import org.phoebus.framework.selection.Selection; import org.phoebus.framework.selection.SelectionService; @@ -241,18 +242,18 @@ private void startup() private ToolBar createToolbar(final AlarmClient model) { - final ToggleButton editing = new ToggleButton("", - ImageCache.getImageView(AlarmUI.class, "/icons/edit.png") - ); - isEditingMode.bind(editing.selectedProperty()); - editing.setSelected(true); + final ToggleButton editing_mode = new ToggleButton("", + ImageCache.getImageView(AlarmUI.class, "/icons/edit.png")); + editing_mode.setTooltip(new Tooltip(Messages.editingModeTooltip)); + isEditingMode.bind(editing_mode.selectedProperty()); + editing_mode.setSelected(true); if (!AlarmUI.mayConfigure(model)) { - editing.setDisable(true); + editing_mode.setDisable(true); } final Button collapse = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/collapse.png")); - collapse.setTooltip(new Tooltip("Collapse alarm tree")); + collapse.setTooltip(new Tooltip(Messages.collapseTooltip)); collapse.setOnAction(event -> { for (TreeItem> sub : tree_view.getRoot().getChildren()) @@ -261,15 +262,15 @@ private ToolBar createToolbar(final AlarmClient model) final Button show_alarms = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/expand_alarms.png")); - show_alarms.setTooltip(new Tooltip("Expand alarm tree to show active alarms")); + show_alarms.setTooltip(new Tooltip(Messages.showAlarmsTooltip)); show_alarms.setOnAction(event -> expandAlarms(tree_view.getRoot())); final Button show_disabled = new Button("", ImageCache.getImageView(AlarmUI.class, "/icons/expand_disabled.png")); - show_disabled.setTooltip(new Tooltip("Expand alarm tree to show disabled PVs")); + show_disabled.setTooltip(new Tooltip(Messages.showDisabledTooltip)); show_disabled.setOnAction(event -> expandDisabledPVs(tree_view.getRoot())); - return new ToolBar(no_server, changing, ToolbarHelper.createSpring(), editing, collapse, show_alarms, show_disabled); + return new ToolBar(no_server, changing, ToolbarHelper.createSpring(), editing_mode, collapse, show_alarms, show_disabled); } ToolBar getToolbar() diff --git a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties index 83b48427d4..1df3845fd2 100644 --- a/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties +++ b/app/alarm/ui/src/main/resources/org/phoebus/applications/alarm/ui/messages.properties @@ -28,6 +28,7 @@ automatedActions=Automated Actions: behavior=Behavior: behaviorTooltip=Enable alarms? See also 'Enabling Filter' commands=Commands: +collapseTooltip=Collapse alarm tree configure=Configure dateTimePickerTooltip=Select a date until which the alarm should be disabled delay=Delay @@ -47,6 +48,7 @@ disableUntil=Disable until: disabledCommonEnableDate=Disabled until {0}: {1} disabledVaryingEnableDate=Disabled (varying enable date): {0} displays=Displays: +editingModeTooltip=Toggle editing mode enabled=Enabled enablingFilter=Enabling Filter: enablingFilterTooltip=Optional expression for enabling the alarm @@ -73,6 +75,8 @@ relativeDateLabel=Relative Date: relativeDateTooltip=Select a predefined duration for disabling the alarm removeComponentFailed=Failed to remove component renameItemFailed=Failed to rename item +showAlarmsTooltip=Expand alarm tree to show active alarms +showDisabledTooltip=Expand alarm tree to show disabled PVs timer=Timer title=Title tooltipAddTableItem=Add a new table item From 9b8c5fbab5077e23f5fb0aeb00c3fac836011153 Mon Sep 17 00:00:00 2001 From: Percy Baker Date: Wed, 28 Oct 2026 10:40:46 +0000 Subject: [PATCH 7/7] Use correct editing icon --- .../alarm/ui/tree/AlarmTreeView.java | 19 +++++++++--------- .../icons/{edit.png => alarm_edit.png} | Bin .../icons/{edit@2x.png => alarm_edit@2x.png} | Bin phoebus-product/pom.xml | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) rename app/alarm/ui/src/main/resources/icons/{edit.png => alarm_edit.png} (100%) rename app/alarm/ui/src/main/resources/icons/{edit@2x.png => alarm_edit@2x.png} (100%) diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java index 071ef5c5c2..68acf1b14b 100644 --- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java +++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java @@ -144,7 +144,7 @@ public class AlarmTreeView extends BorderPane implements AlarmClientListener items.remove(changing); }); - private final SimpleBooleanProperty isEditingMode = new SimpleBooleanProperty(false); + private final SimpleBooleanProperty is_editing_mode = new SimpleBooleanProperty(false); // Javadoc for TreeItem shows example for overriding isLeaf() and getChildren() // to dynamically create TreeItem as TreeView requests information. @@ -243,11 +243,12 @@ private void startup() private ToolBar createToolbar(final AlarmClient model) { final ToggleButton editing_mode = new ToggleButton("", - ImageCache.getImageView(AlarmUI.class, "/icons/edit.png")); + ImageCache.getImageView(AlarmUI.class, "/icons/alarm_edit.png")); editing_mode.setTooltip(new Tooltip(Messages.editingModeTooltip)); - isEditingMode.bind(editing_mode.selectedProperty()); - editing_mode.setSelected(true); - if (!AlarmUI.mayConfigure(model)) { + is_editing_mode.bind(editing_mode.selectedProperty()); + if (AlarmUI.mayConfigure(model)) { + editing_mode.setSelected(true); + } else { editing_mode.setDisable(true); } @@ -346,7 +347,7 @@ private void indicateChange() setCursor(Cursor.WAIT); final ObservableList items = getToolbar().getItems(); if (! items.contains(changing)) - items.add(2, changing); + items.add(1, changing); } else previous.cancel(false); @@ -607,7 +608,7 @@ private void createContextMenu() if (menu_items.size() > 0) menu_items.add(new SeparatorMenuItem()); - if (AlarmUI.mayConfigure(model) && isEditingMode.get()) + if (AlarmUI.mayConfigure(model) && is_editing_mode.get()) { if (selection.size() <= 0) // Add first item to empty config @@ -634,7 +635,7 @@ else if (selection.size() == 1) { menu_items.add(new EnableComponentAction(tree_view, model, selection)); menu_items.add(new DisableAction(tree_view, model, selection)); - if (AlarmUI.mayConfigure(model) && isEditingMode.get()) + if (AlarmUI.mayConfigure(model) && is_editing_mode.get()) menu_items.add(new RemoveComponentAction(tree_view, model, selection)); } @@ -674,7 +675,7 @@ private void addClickSupport() tree_view.setOnMouseClicked(event -> { if (!AlarmUI.mayConfigure(model) - || !isEditingMode.get() + || !is_editing_mode.get() || event.getClickCount() != 2 || tree_view.getSelectionModel().getSelectedItems().size() != 1) return; diff --git a/app/alarm/ui/src/main/resources/icons/edit.png b/app/alarm/ui/src/main/resources/icons/alarm_edit.png similarity index 100% rename from app/alarm/ui/src/main/resources/icons/edit.png rename to app/alarm/ui/src/main/resources/icons/alarm_edit.png diff --git a/app/alarm/ui/src/main/resources/icons/edit@2x.png b/app/alarm/ui/src/main/resources/icons/alarm_edit@2x.png similarity index 100% rename from app/alarm/ui/src/main/resources/icons/edit@2x.png rename to app/alarm/ui/src/main/resources/icons/alarm_edit@2x.png diff --git a/phoebus-product/pom.xml b/phoebus-product/pom.xml index f954133b88..43f7872930 100644 --- a/phoebus-product/pom.xml +++ b/phoebus-product/pom.xml @@ -204,7 +204,7 @@ org.phoebus - app-alarm-freetts-annunciator + app-alarm-audio-annunciator 7.0.0-SNAPSHOT true