Skip to content

Commit 70ced28

Browse files
committed
Change empyName properties by the name of the file in runtime and in editor
1 parent 3ba99e5 commit 70ced28

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,15 @@ public class DisplayEditorInstance implements AppInstance
8080

8181
private final WidgetPropertyListener<String> model_name_listener = (property, old_value, new_value) ->
8282
{
83-
final String label = EditorUtil.isDisplayReadOnly(property.getWidget().checkDisplayModel())
84-
? "[R/O] " + property.getValue()
85-
: "[Edit] " + property.getValue();
83+
String fileName = property.getWidget().checkDisplayModel().getDisplayName();
84+
85+
String value = (property.getValue() == null || property.getValue().isEmpty())
86+
? fileName
87+
: property.getValue();
88+
89+
final String label = EditorUtil.isDisplayReadOnly(property.getWidget().checkDisplayModel())
90+
? "[R/O] " + value
91+
: "[Edit] " + value;
8692
Platform.runLater(() -> dock_item.setLabel(label));
8793
};
8894

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ public String getDisplayName()
173173
name = getUserData(USER_DATA_INPUT_FILE);
174174
if (name == null)
175175
name = "<No name>";
176+
else
177+
name= new java.io.File(name).getName();;
176178
}
177179
return name;
178180
}

0 commit comments

Comments
 (0)