limit the automatic filling only to date

Author: agaget

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

@@ -33,15 +33,7 @@ public class Preferences {
     @Preference
     public static String default_search_query;
     @Preference
-    public static String default_title_snapshot_configuration;
-    @Preference
-    public static String default_title_snapshot_format;
-    @Preference
     public static String default_title_snapshot_date_format;
-    @Preference
-    public static String default_title_snapshot_pv1;
-    @Preference
-    public static String default_title_snapshot_pv2;
 
     static
     {

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

@@ -268,33 +268,6 @@ public void newSnapshot(Node configurationNode) {
         });
     }
 
-    public String getValueVType(String pvEntry, List<SnapshotItem> entries){
-        String valueOutput ="";
-        for (SnapshotItem e : entries) {
-            if (e.getConfigPv().getPvName().equals(pvEntry)){
-                VType newValue=e.getValue();
-                if (newValue instanceof VNumber) {
-                Number newVType = ((VNumber) newValue).getValue();
-                valueOutput=newVType.toString();
-                return valueOutput;
-                } else if (newValue instanceof VString) {
-                String newVType = ((VString) newValue).getValue();
-                valueOutput=newVType.toString();
-                return valueOutput;
-                } else if (newValue instanceof VStringArray) {
-                    List<String> newVType =((VStringArray) newValue).getData();
-                    valueOutput=newVType.toString();
-                    return valueOutput;
-                } else if (newValue instanceof VEnum) {
-                    VEnum newVType = (VEnum) newValue;
-                    valueOutput=newVType.getValue().toString();
-                    return valueOutput;
-                }
-            }
-        }
-        return valueOutput;
-    }
-
     @FXML
     @SuppressWarnings("unused")
     private void takeSnapshot() {
@@ -320,31 +293,11 @@ private void takeSnapshot() {
                     Date now = new Date();
                     formater = new SimpleDateFormat("yy-MM-dd");
                     String defaultTitle="";
-                    if (!Preferences.default_title_snapshot_format.equals("")) {
-                        String[] formatTitle=Preferences.default_title_snapshot_format.split("_");
-                        for (int index = 0; index < formatTitle.length; index++) {
-                            switch (formatTitle[index]) {
-                                case "<date>":
-                                    if (!Preferences.default_title_snapshot_date_format.equals("")){
-                                        formater = new SimpleDateFormat(Preferences.default_title_snapshot_date_format);
-                                        defaultTitle+=defaultTitle+formater.format(now);
-                                    }
-                                    break;
-                                case "<pv1>": 
-                                    defaultTitle+=getValueVType(Preferences.default_title_snapshot_pv1,entries);
-                                    break;
-                                case "<pv2>":
-                                    defaultTitle+=getValueVType(Preferences.default_title_snapshot_pv2,entries);
-                                    break;
-                                default:
-                                    System.out.println("nothing");
-                                    break;
-                            }
-                            if (index<formatTitle.length-1)
-                                defaultTitle+="_";
-                        }            
+                    if (!Preferences.default_title_snapshot_date_format.equals("")) {
+                            formater = new SimpleDateFormat(Preferences.default_title_snapshot_date_format);
+                            defaultTitle+=defaultTitle+formater.format(now);
+                            snapshotNameProperty.set(defaultTitle);
                     }
-                    snapshotNameProperty.set(defaultTitle);
 
                 })
         );

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

@@ -22,9 +22,5 @@ search_result_page_size=30
 # Default save-and-restore search query. Used unless a saved query is located.
 default_search_query=tags=golden
 
-# Configure the default snapshot name when "Take Snapshot"
-#default_title_snapshot_configuration=TuneList
-#default_title_snapshot_format=<date>_<pv1>_<pv2>
+# If declared add a date automatically in the name of the snapshot "Take Snapshot"
 #default_title_snapshot_date_format=YYYYMMHH_hhmmss
-#default_title_snapshot_pv1=SL-APP-MCS:BOM-CPU:IonSet
-#default_title_snapshot_pv2=SL-APP-MCS:BOM-CPU:BeamDestSet