Merge branch 'master' into SaveRestoreLogFix

Author: georgweiss

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/menu/SendToLogBookApp.java

@@ -45,8 +45,10 @@ public AppInstance create() {
         if(selection.getSelections().isEmpty()){
             ologLog = new OlogLog();
         }
-        else{
-            ologLog = AdapterService.adapt(selection.getSelections().get(0), LogEntry.class).get();
+        else {
+            ologLog = AdapterService
+                        .adapt(selection.getSelections().get(0), LogEntry.class)
+                        .orElse(new OlogLog());
         }
         new LogEntryEditorStage(ologLog).show();
         return null;

core/framework/src/main/java/org/phoebus/framework/selection/SelectionService.java

@@ -85,4 +85,16 @@ public void setSelection(Object source, Selection selection) {
         for (SelectionChangeListener listener : listeners)
             listener.selectionChanged(source, oldValue, newValue);
     }
+
+    /**
+     * Clear the selection
+     *
+     * @param source    the source of the new selection
+     */
+    public void clearSelection(Object source) {
+        final Selection newValue = SelectionUtil.emptySelection();
+        final Selection oldValue = SelectionService.selection.getAndSet(newValue);
+        for (SelectionChangeListener listener : listeners)
+            listener.selectionChanged(source, oldValue, newValue);
+    }
 }

core/pv/src/main/java/org/phoebus/pv/pva/PVAStructureHelper.java

@@ -69,29 +69,28 @@ public static VType getVType(final PVAStructure struct, final PVNameHelper name_
                 actual = (PVAStructure) field;
             else if (field instanceof PVANumber)
                 return Decoders.decodeNumber(struct, (PVANumber) field);
-            else if (field instanceof PVAArray)
-                return Decoders.decodeArray(struct, (PVAArray) field);
-            else if (field instanceof PVAString)
-                return Decoders.decodeString(struct, (PVAString) field);
-        }
-
-        // Handle element references in arrays
-        if (elementIndex.isPresent())
-        {
-            final PVAData field = struct.get(name_helper.getField());
-            if (field instanceof PVAStructureArray)
+            else if (field instanceof PVAStructureArray)
             {
-                actual = ((PVAStructureArray) field).get()[elementIndex.get()];
+                if (elementIndex.isPresent())
+                {
+                    actual = ((PVAStructureArray) field).get()[elementIndex.get()];
+                }
             }
-            else if(field instanceof PVAArray)
-            {
-                return decodeNTArray(actual, elementIndex.get());
-            }
-            else
+            else if (field instanceof PVAArray)
             {
-                throw new Exception("Expected struct array for field " + name_helper.getField() + ", got " + struct);
+                if (elementIndex.isPresent())
+                {
+                    return decodeNTArray(struct, elementIndex.get());
+                }
+                else
+                {
+                    return Decoders.decodeArray(struct, (PVAArray) field);
+                }
             }
+            else if (field instanceof PVAString)
+                return Decoders.decodeString(struct, (PVAString) field);
         }
+
         // Handle normative types
         String type = actual.getStructureName();
         if (type.startsWith("epics:nt/"))

core/ui/src/main/java/org/phoebus/ui/dialog/SaveAsDialog.java

@@ -30,7 +30,7 @@ public class SaveAsDialog
      *  @param title Title
      *  @param file Suggested file, may be <code>null</code>
      *  @param filters Filters, may be <code>null</code>
-     *  @return 
+     *  @return
      */
     public File promptForFile(final Window window, final String title, final File file, final ExtensionFilter[] filters)
     {
@@ -62,35 +62,38 @@ private File doPromptForFile(final Window window, final String title, File file,
         File initial_directory;
         final FileChooser dialog = new FileChooser();
         dialog.setTitle(title);
-        
+
         if (!Preferences.default_save_path.isEmpty()){
             initial_directory = new File(Preferences.default_save_path);
             dialog.setInitialDirectory(initial_directory);
         }
-        
+
         if (file != null)
         {
             // Dialog will fail if the directory does not exist
-        	if(file.exists()) 
-        	{
-        		
-        		if(file.isDirectory()) 
-        		{
-        			dialog.setInitialDirectory(file);
-        		}
-        		else if (null != file.getParentFile() && file.getParentFile().exists()) 
-        		{
+            if (file.exists())
+            {
+                if (file.isDirectory())
+                {
+                    dialog.setInitialDirectory(file);
+                }
+                else if (null != file.getParentFile() && file.getParentFile().exists())
+                {
                     dialog.setInitialDirectory(file.getParentFile());
                     dialog.setInitialFileName(file.getName());
-        			
-        		}
-        	}
-            
+                }
+            }
+            // Even if the file does not exist, you could still use the existing parent folder
+            else if (null != file.getParentFile() && file.getParentFile().exists())
+            {
+                dialog.setInitialDirectory(file.getParentFile());
+            }
+
         }
-        
+
         if (filters != null)
             dialog.getExtensionFilters().addAll(filters);
-        
+
         return doExecuteDialog(window, dialog);
     }