Merge pull request #2602 from agaget/master

Save-and-restore : Add snapshot name automatically after a "Take Snapshot"

Author: georgweiss

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

@@ -32,6 +32,8 @@ public class Preferences {
     public static int search_result_page_size;
     @Preference
     public static String default_search_query;
+    @Preference
+    public static String default_snapshot_name_date_format;
 
     static
     {

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java

@@ -67,8 +67,10 @@
 import org.phoebus.ui.dialog.DialogHelper;
 import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -265,7 +267,7 @@ public void newSnapshot(Node configurationNode) {
             });
         });
     }
-
+    
     @FXML
     @SuppressWarnings("unused")
     private void takeSnapshot() {
@@ -286,6 +288,12 @@ private void takeSnapshot() {
                     snapshots.set(0, snapshot);
                     List<TableEntry> tableEntries = createTableEntries(snapshots.get(0));
                     snapshotTable.updateTable(tableEntries, snapshots, showLiveReadbackProperty.get(), false, showDeltaPercentage);
+                
+                    if (!Preferences.default_snapshot_name_date_format.equals("")) {
+                            SimpleDateFormat formater = new SimpleDateFormat(Preferences.default_snapshot_name_date_format);
+                            snapshotNameProperty.set(formater.format(new Date()));
+                    }
+                
                 })
         );
     }

app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties

@@ -21,3 +21,6 @@ search_result_page_size=30
 
 # Default save-and-restore search query. Used unless a saved query is located.
 default_search_query=tags=golden
+
+# If declared add a date automatically in the name of the snapshot "Take Snapshot"
+#default_snapshot_name_date_format=yyyy-MM-dd HH:mm:ss