Improve feedback when duplicate PV names are detected

Author: georgweiss

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/Messages.java

@@ -79,6 +79,7 @@ public class Messages {
     public static String duplicatePVNamesAdditionalItems;
     public static String duplicatePVNamesCheckFailed;
     public static String duplicatePVNamesFoundInSelection;
+    public static String duplicatePVNamesNotSupported;
     public static String Edit;
     public static String editFilter;
     public static String errorActionFailed;

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigurationController.java

@@ -413,14 +413,13 @@ public void addPv() {
             String[] pvNames = pvNameProperty.get().trim().split("[\\s;]+");
             String[] readbackPvNames = readbackPvNameProperty.get().trim().split("[\\s;]+");
 
+            if(!checkForDuplicatePvNames(pvNames)){
+                return;
+            }
+
             ArrayList<ConfigPvEntry> configPVs = new ArrayList<>();
             for (int i = 0; i < pvNames.length; i++) {
-                // Disallow duplicate PV names as in a restore operation this would mean that a PV is written
-                // multiple times, possibly with different values.
                 String pvName = pvNames[i].trim();
-                if (configurationEntries.stream().anyMatch(s -> s.getPvNameProperty().get().equals(pvName))) {
-                    continue;
-                }
                 String readbackPV = i >= readbackPvNames.length ? null : readbackPvNames[i] == null || readbackPvNames[i].isEmpty() ? null : readbackPvNames[i].trim();
                 ConfigPv configPV = ConfigPv.builder()
                         .pvName(pvName)
@@ -432,7 +431,26 @@ public void addPv() {
             configurationEntries.addAll(configPVs);
             resetAddPv();
         });
+    }
 
+    /**
+     * Checks that added PV names are not added multiple times
+     * @param addedPvNames New PV names added in the UI
+     * @return <code>true</code> if no duplicates are detected, otherwise <code>false</code>
+     */
+    private boolean checkForDuplicatePvNames(String[] addedPvNames){
+        List<String> pvNamesAsList = new ArrayList<>();
+        pvNamesAsList.addAll(Arrays.asList(addedPvNames));
+        pvTable.itemsProperty().get().forEach(i -> pvNamesAsList.add(i.getPvNameProperty().get()));
+        List<String> duplicatePvNames = pvNamesAsList.stream().filter(n -> Collections.frequency(pvNamesAsList, n) > 1).toList();
+
+        if(duplicatePvNames.size() > 0){
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setHeaderText(Messages.duplicatePVNamesNotSupported);
+            alert.showAndWait();
+            return false;
+        }
+        return true;
     }
 
     private void resetAddPv() {

app/save-and-restore/app/src/main/resources/org/phoebus/applications/saveandrestore/messages.properties

@@ -69,8 +69,9 @@ deleteFilterFailed=Failed to delete filter
 description=Description
 descriptionHint=Specify non-empty description
 duplicatePVNamesAdditionalItems={0} additional PV names
-duplicatePVNamesFoundInSelection=Cannot add selected snapshots, duplicate PV names found
 duplicatePVNamesCheckFailed=Cannot check if snapshots may be added, remote service off-line?
+duplicatePVNamesFoundInSelection=Cannot add selected snapshots, duplicate PV names found
+duplicatePVNamesNotSupported=Duplicate PV names detected. This is not supported.
 editFilter=Edit filter
 errorActionFailed=Action failed
 errorAddTagFailed=Failed to add tag