merge master

app/alarm/model/src/main/java/org/phoebus/applications/alarm/AlarmSystem.java

@@ -115,6 +115,9 @@ public class AlarmSystem extends AlarmSystemConstants
     /** Disable notify feature */
     @Preference public static boolean disable_notify_visible;
 
+    /** Enable context menu for adding PVs to alarm configuration */
+    @Preference public static boolean enable_add_to_alarm_context_menu;
+
     /** "Disable until.." shortcuts */
     @Preference public static String[] shelving_options;
 

app/alarm/model/src/main/java/org/phoebus/applications/alarm/client/AlarmClient.java

@@ -484,12 +484,8 @@ private AlarmTreeItem<?> findOrCreateNode(final String path, final boolean is_le
      * @param path_name to parent Root or parent component under which to add the component
      * @param new_name  Name of the new component
      */
-    public void addComponent(final String path_name, final String new_name) {
-        try {
-            sendNewItemInfo(path_name, new_name, new AlarmClientNode(null, new_name));
-        } catch (final Exception ex) {
-            logger.log(Level.WARNING, "Cannot add component " + new_name + " to " + path_name, ex);
-        }
+    public void addComponent(final String path_name, final String new_name) throws Exception {
+        sendNewItemInfo(path_name, new_name, new AlarmClientNode(null, new_name));
     }
 
     /**
@@ -498,12 +494,8 @@ public void addComponent(final String path_name, final String new_name) {
      * @param path_name to parent Root or parent component under which to add the component
      * @param new_name  Name of the new component
      */
-    public void addPV(final String path_name, final String new_name) {
-        try {
-            sendNewItemInfo(path_name, new_name, new AlarmClientLeaf(null, new_name));
-        } catch (final Exception ex) {
-            logger.log(Level.WARNING, "Cannot add pv " + new_name + " to " + path_name, ex);
-        }
+    public void addPV(final String path_name, final String new_name) throws Exception {
+        sendNewItemInfo(path_name, new_name, new AlarmClientLeaf(null, new_name));
     }
 
     private void sendNewItemInfo(String path_name, final String new_name, final AlarmTreeItem<?> content) throws Exception {

app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/AlarmTreePath.java

@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /** Helper for handling the path names of alarm tree elements.
  *  Path looks like "/root/area/system/subsystem/pv_name".
@@ -32,24 +33,33 @@ public static boolean isPath(final String path)
      *  @param path Parent path or <code>null</code> when starting at root
      *  @param item Name of item at end of path
      *  @return Full path name to item
+     *  @throws AlarmTreePathException When getting an illegal item string with leading slashes
      */
-    public static String makePath(final String path, String item)
-    {
+    public static String makePath(final String path, String item) throws AlarmTreePathException {
+        // Validate item: forbid leading slashes except exactly one (legacy compatibility)
+        if (item != null && item.startsWith(PATH_SEP)) {
+            // If there's more than one leading slash, it's invalid
+            if (item.length() > 1 && item.charAt(1) == PATH_SEP.charAt(0)) {
+                throw new AlarmTreePathException(
+                        "Item must not have leading slashes: '" + item + "'"
+                );
+            }
+            // For legacy support (existing tests), strip exactly one leading slash
+            item = item.substring(1);
+        }
+
         final StringBuilder result = new StringBuilder();
         if (path != null)
         {
             if (! isPath(path))
                 result.append(PATH_SEP);
-            // Skip path it it's only '/'
+            // Skip path if it's only '/'
             if (!PATH_SEP.equals(path))
                 result.append(path);
         }
         result.append(PATH_SEP);
         if (item != null  &&  !item.isEmpty())
         {
-            // If item already starts with '/', skip it
-            if (item.startsWith(PATH_SEP))
-                item = item.substring(1);
             // Escape any path-seps inside item with backslashes
             result.append(item.replace(PATH_SEP, "\\/"));
         }
@@ -112,8 +122,9 @@ public static String getName(final String path)
      *  @param path Original path
      *  @param modifier Path modifier: "segments/to/add", "/absolute/new/path", ".."
      *  @return Path based on pwd and modifier
+     *  @throws AlarmTreePathException When a segment contains leading slashes.
      */
-    public static String update(String path, String modifier)
+    public static String update(String path, String modifier) throws AlarmTreePathException
     {
         if (modifier == null  ||  modifier.isEmpty())
             return makePath(null, path);
@@ -137,4 +148,18 @@ public static String update(String path, String modifier)
             }
         }
     }
+
+    public static boolean pathsAreEquivalent(String a, String b) {
+        var elementsA = splitPath(a);
+        var elementsB = splitPath(b);
+        if (elementsA.length != elementsB.length) {
+            return false;
+        }
+        for (int i = 0; i < elementsA.length; i++) {
+            if (!Objects.equals(elementsA[i], elementsB[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/AlarmTreePathException.java

@@ -0,0 +1,15 @@
+package org.phoebus.applications.alarm.model;
+
+/**
+ * Exception thrown when attempting to construct an invalid alarm tree path.
+ * <p>
+ * Paths or path elements that start with more than one leading slash are not allowed.
+ * A single leading slash is permitted for backward compatibility and for
+ * representing absolute paths, but multiple leading slashes indicate an
+ * invalid or ambiguous path specification.
+ */
+public class AlarmTreePathException extends IllegalArgumentException {
+    public AlarmTreePathException(String message) {
+        super(message);
+    }
+}

app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/xml/XmlModelReader.java

@@ -24,6 +24,7 @@
 
 import org.phoebus.applications.alarm.client.AlarmClientLeaf;
 import org.phoebus.applications.alarm.client.AlarmClientNode;
+import org.phoebus.applications.alarm.model.AlarmTreePathException;
 import org.phoebus.applications.alarm.model.TitleDetail;
 import org.phoebus.applications.alarm.model.TitleDetailDelay;
 import org.phoebus.framework.persistence.XMLUtil;
@@ -118,15 +119,8 @@ private void buildModel(final Document doc) throws Exception
         // Create the root of the model. Parent is null and name must be config.
         root = new AlarmClientNode(null, root_node.getAttribute(TAG_NAME));
 
-        // First add PVs at this level, ..
-        for (final Element child : XMLUtil.getChildElements(root_node, TAG_PV))
-            processPV(root /* parent */, child);
-
-        // .. when sub-components which again have PVs.
-        // This way, duplicate PVs will be detected and ignored at a nested level,
-        // keeping those toward the root
-        for (final Node child : XMLUtil.getChildElements(root_node, TAG_COMPONENT))
-            processComponent(root /* parent */, child);
+        // Recursively process children
+        processChildren(root, root_node);
     }
 
     private void processComponent(final AlarmClientNode parent, final Node node) throws Exception
@@ -162,12 +156,34 @@ private void processComponent(final AlarmClientNode parent, final Node node) thr
         // This does not refer to XML attributes but instead to the attributes of a model component node.
         processCompAttr(component, node);
 
-        // First add PVs at this level, then sub-components
+        // Recursively process children
+        processChildren(component, node);
+    }
+
+    private void processChildren(AlarmClientNode component, Node node) throws Exception {
+        // First add PVs at this level
         for (final Element child : XMLUtil.getChildElements(node, TAG_PV))
-            processPV(component/* parent */, child);
+            try {
+                processPV(component/* parent */, child);
+            } catch (AlarmTreePathException e) {
+                logger.log(Level.WARNING,
+                        "Ignoring malformed PV "
+                                + component.getPathName() + "/" + child.getAttribute(TAG_NAME) + ".\n"
+                                + "Cause: " + e.getMessage());
+            }
 
+        // then subcomponents, which again have PVs.
+        // This way, duplicate PVs will be detected and ignored at a nested level,
+        // keeping those toward the root
         for (final Element child : XMLUtil.getChildElements(node, TAG_COMPONENT))
-            processComponent(component /* parent */, child);
+            try {
+                processComponent(component /* parent */, child);
+            } catch (AlarmTreePathException e) {
+                logger.log(Level.WARNING,
+                        "Ignoring malformed component "
+                                + component.getPathName() + "/" + child.getAttribute(TAG_NAME) + ".\n"
+                                + "Cause: " + e.getMessage());
+            }
     }
 
     private void processCompAttr(final AlarmClientNode component, final Node node) throws Exception

app/alarm/model/src/main/resources/alarm_preferences.properties

@@ -162,6 +162,13 @@ connection_check_secs=5
 # To turn on disable notifications feature, set the value to `true`
 disable_notify_visible=false
 
+# Enable context menu for adding PVs to alarm configuration.
+#
+# When enabled, right-clicking on PVs in the application will show
+# an "Add to Alarms" option that opens a dialog to add the selected
+# PVs to the alarm tree.
+enable_add_to_alarm_context_menu=true
+
 # Options for the "Disable until.." shortcuts in the PV config dialog.
 #
 # :format: