change getDisplayName to only displayed filename, to be both used in Runtime and editor

Author: agaget

app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/DisplayEditorInstance.java

@@ -7,8 +7,6 @@
  ******************************************************************************/
 package org.csstudio.display.builder.editor.app;
 
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propFile;
-
 import java.io.File;
 import java.net.URI;
 import java.text.MessageFormat;
@@ -32,6 +30,7 @@
 import org.csstudio.display.builder.model.WidgetProperty;
 import org.csstudio.display.builder.model.WidgetPropertyListener;
 import org.csstudio.display.builder.model.persist.WidgetClassesService;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propFile;
 import org.csstudio.display.builder.model.util.ModelThreadPool;
 import org.csstudio.display.builder.model.widgets.GroupWidget;
 import org.csstudio.display.builder.representation.javafx.FilenameSupport;
@@ -80,10 +79,10 @@ public class DisplayEditorInstance implements AppInstance
 
     private final WidgetPropertyListener<String> model_name_listener = (property, old_value, new_value) ->
     {
-    	String userDataInputFile = property.getWidget().getUserData(DisplayModel.USER_DATA_INPUT_FILE);
+    	String fileName = property.getWidget().checkDisplayModel().getDisplayName();
 
     	String value = (property.getValue() == null || property.getValue().isEmpty())
-    	        ? userDataInputFile
+    	        ? fileName
     	        : property.getValue();
 
     	final String label = EditorUtil.isDisplayReadOnly(property.getWidget().checkDisplayModel())

app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java

@@ -7,17 +7,16 @@
  *******************************************************************************/
 package org.csstudio.display.builder.model;
 
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newBooleanPropertyDescriptor;
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newColorPropertyDescriptor;
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newIntegerPropertyDescriptor;
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propBackgroundColor;
-import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros;
-
 import java.util.List;
 
 import org.csstudio.display.builder.model.persist.ModelReader;
 import org.csstudio.display.builder.model.persist.NamedWidgetColors;
 import org.csstudio.display.builder.model.persist.WidgetColorService;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newBooleanPropertyDescriptor;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newColorPropertyDescriptor;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.newIntegerPropertyDescriptor;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propBackgroundColor;
+import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros;
 import org.csstudio.display.builder.model.properties.WidgetColor;
 import org.csstudio.display.builder.model.widgets.EmbeddedDisplayWidget;
 import org.csstudio.display.builder.model.widgets.NavigationTabsWidget;
@@ -173,6 +172,8 @@ public String getDisplayName()
             name = getUserData(USER_DATA_INPUT_FILE);
             if (name == null)
                 name = "<No name>";
+            else
+                name= new java.io.File(name).getName();;
         }
         return name;
     }

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayInfo.java

@@ -7,8 +7,6 @@
  *******************************************************************************/
 package org.csstudio.display.builder.runtime.app;
 
-import static org.csstudio.display.builder.runtime.WidgetRuntime.logger;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -18,6 +16,7 @@
 
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.macros.MacroHandler;
+import static org.csstudio.display.builder.runtime.WidgetRuntime.logger;
 import org.phoebus.framework.macros.Macros;
 import org.phoebus.framework.util.ResourceParser;
 

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayRuntimeInstance.java

@@ -7,18 +7,15 @@
  ******************************************************************************/
 package org.csstudio.display.builder.runtime.app;
 
-import static org.csstudio.display.builder.runtime.WidgetRuntime.logger;
-
-
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.FutureTask;
 import java.util.logging.Level;
 
 import org.csstudio.display.builder.model.DisplayModel;
@@ -30,6 +27,7 @@
 import org.csstudio.display.builder.representation.javafx.JFXRepresentation;
 import org.csstudio.display.builder.runtime.ActionUtil;
 import org.csstudio.display.builder.runtime.RuntimeUtil;
+import static org.csstudio.display.builder.runtime.WidgetRuntime.logger;
 import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.jobs.JobMonitor;
 import org.phoebus.framework.macros.Macros;