Update save&restore configuration editor

Author: georgweiss

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

@@ -25,7 +25,7 @@ public class ConfigPvEntry implements Comparable<ConfigPvEntry> {
     private final StringProperty readBackPvNameProperty;
     private final BooleanProperty readOnlyProperty;
     private final ObjectProperty<CompareMode> compareModeProperty;
-    private ObjectProperty<Double> toleranceProperty;
+    private final ObjectProperty<Double> toleranceProperty;
 
     public ConfigPvEntry(ConfigPv configPv) {
         this.pvNameProperty = new SimpleStringProperty(this, "pvNameProperty", configPv.getPvName());
@@ -64,10 +64,6 @@ public void setReadBackPvNameProperty(String readBackPvNameProperty) {
         this.readBackPvNameProperty.set(readBackPvNameProperty);
     }
 
-    public void setReadOnlyProperty(boolean readOnlyProperty) {
-        this.readOnlyProperty.set(readOnlyProperty);
-    }
-
     public void setCompareModeProperty(CompareMode compareModeProperty) {
         this.compareModeProperty.set(compareModeProperty);
     }
@@ -83,6 +79,9 @@ public ConfigPv toConfigPv() {
                 .readOnly(readOnlyProperty.get())
                 .compareMode(compareModeProperty.get())
                 .build();
+        if(toleranceProperty != null){
+            configPv.setTolerance(toleranceProperty.get());
+        }
         return configPv;
     }
 

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

@@ -215,10 +215,7 @@ public void initialize() {
 
         ContextMenu contextMenu = new ContextMenu();
         MenuItem setComparisonData = new MenuItem("Add comparison on selection");
-        setComparisonData.setOnAction(e -> {
-            List<ConfigPvEntry> selectedItems = pvTable.getSelectionModel().getSelectedItems();
-            launchComparisonEditor();
-        });
+        setComparisonData.setOnAction(e -> launchComparisonEditor());
         contextMenu.getItems().add(setComparisonData);
         pvTable.setOnContextMenuRequested(event -> {
             contextMenu.getItems().clear();
@@ -247,10 +244,6 @@ public void initialize() {
         readbackPvNameColumn.setCellValueFactory(cell -> cell.getValue().getReadBackPvNameProperty());
         readbackPvNameColumn.setOnEditCommit(t -> {
             t.getTableView().getItems().get(t.getTablePosition().getRow()).setReadBackPvNameProperty(t.getNewValue());
-            if (t.getNewValue() == null || t.getNewValue().isEmpty()) {
-                t.getTableView().getItems().get(t.getTablePosition().getRow()).setCompareModeProperty(null);
-                t.getTableView().getItems().get(t.getTablePosition().getRow()).setToleranceProperty(null);
-            }
             setDirty(true);
         });
 
@@ -267,27 +260,12 @@ public void initialize() {
             values.add(0, null);
             ComboBoxTableCell<ConfigPvEntry, CompareMode> tableCell = new ComboBoxTableCell<>(values) {
 
-                /*
-                @Override
-                public void startEdit() {
-                    String readBackPvName = getTableView().getItems().get(getIndex()).getReadBackPvNameProperty().get();
-                    if (readBackPvName == null || readBackPvName.isEmpty()) {
-                        cancelEdit();
-                        return;
-                    }
-                    super.startEdit();
-                }
-
-                 */
-
                 @Override
                 public void commitEdit(CompareMode pvCompareMode) {
+                    getTableView().getItems().get(getIndex()).setCompareModeProperty(pvCompareMode);
                     if (pvCompareMode == null) {
                         getTableView().getItems().get(getIndex()).setToleranceProperty(null);
-                    } else if (getTableView().getItems().get(getIndex()).getToleranceProperty().get() == null) {
-                        getTableView().getItems().get(getIndex()).setToleranceProperty(0.0);
                     }
-                    getTableView().getItems().get(getIndex()).setCompareModeProperty(pvCompareMode);
                     setDirty(true);
                     super.commitEdit(pvCompareMode);
                 }
@@ -323,33 +301,24 @@ public String toString(Double value) {
             @Override
             public Double fromString(String string) {
                 try {
-                    Double value = Double.parseDouble(string);
-                    if(value < 0){
+                    double value = Double.parseDouble(string);
+                    if(value >= 0){
                         // Tolerance must be >= 0.
-                        return null;
+                        return value;
                     }
-                    return value;
+                    return null;
                 } catch (Exception e) {
                     // No logging needed: user has entered text that cannot be parsed as double.
                     return null;
                 }
             }
         }) {
-            @Override
-            public void startEdit() {
-                String readBackPvName = getTableView().getItems().get(getIndex()).getReadBackPvNameProperty().get();
-                if (readBackPvName == null || readBackPvName.isEmpty()) {
-                    cancelEdit();
-                    return;
-                }
-                super.startEdit();
-            }
-
             @Override
             public void commitEdit(Double value) {
                 if (value == null) {
                     return;
                 }
+                getTableView().getItems().get(getIndex()).setToleranceProperty(value);
                 setDirty(true);
                 super.commitEdit(value);
             }
@@ -464,7 +433,6 @@ public void addPv() {
                 configPVs.add(new ConfigPvEntry(configPV));
             }
             configurationEntries.addAll(configPVs);
-            //configurationTab.annotateDirty(true);
             resetAddPv();
         });
 
@@ -560,7 +528,7 @@ private void setDirty(boolean dirty) {
         this.dirty.set(dirty && !loadInProgress.get());
     }
 
-    private ComparisonData launchComparisonEditor(){
+    private void launchComparisonEditor(){
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
         alert.setHeaderText(null);
         alert.setGraphic(null);
@@ -575,8 +543,6 @@ private ComparisonData launchComparisonEditor(){
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-
-        return null;
     }
 
     public record ComparisonData(CompareMode pvCompareMode, Double tolerance){