Merge pull request #3663 from ControlSystemStudio/CSSTUDIO-3597

shroffk · web-flow · commit cb3b6f3bbc76 · 2025-12-03T11:24:09.000-05:00
CSSTUDIO-3597 Create a new instance of macros in `EmbeddedDisplayWidget.getEffectiveMacros()`.
diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
@@ -307,6 +307,13 @@ public WidgetProperty<?> getProperty(String name) throws IllegalArgumentExceptio
         return super.getProperty(name);
     }
 
+    @Override
+    public Macros getEffectiveMacros()
+    {
+        final Macros macros = new Macros(super.getEffectiveMacros());
+        return macros;
+    }
+
     /** @return 'file' property */
     public WidgetProperty<String> propFile()
     {

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,13 @@ public WidgetProperty<?> getProperty(String name) throws IllegalArgumentExceptio`
`307`	`307`	`return super.getProperty(name);`
`308`	`308`	`}`
`309`	`309`
	`310`	`+ @Override`
	`311`	`+ public Macros getEffectiveMacros()`
	`312`	`+ {`
	`313`	`+ final Macros macros = new Macros(super.getEffectiveMacros());`
	`314`	`+ return macros;`
	`315`	`+ }`
	`316`	`+`
`310`	`317`	`/** @return 'file' property */`
`311`	`318`	`public WidgetProperty<String> propFile()`
`312`	`319`	`{`