Merge pull request #3475 from rjwills28/ISSUE-3458_fix_opening_duplicate_displays

Issue-3458: fix opening duplicate displays due to arbitrary macros added to URI

Author: shroffk

app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java

@@ -307,17 +307,6 @@ public WidgetProperty<?> getProperty(String name) throws IllegalArgumentExceptio
         return super.getProperty(name);
     }
 
-    @Override
-    public Macros getEffectiveMacros()
-    {
-        final Macros macros = new Macros(super.getEffectiveMacros());
-
-        // Legacy "Linking Container" defined a "Linking Container ID" macro.
-        macros.add("LCID", getID());
-
-        return macros;
-    }
-
     /** @return 'file' property */
     public WidgetProperty<String> propFile()
     {

app/display/model/src/main/resources/display_model_preferences.properties

@@ -31,8 +31,9 @@ font_files=examples:font.def
 # * Must start with character
 # * May then contain characters or numbers
 # * May also contain underscores
-# 
-macros=<EXAMPLE_MACRO>Value from Preferences</EXAMPLE_MACRO><TEST>true</TEST>
+# E.g.
+#  macros=<EXAMPLE_MACRO>Value from Preferences</EXAMPLE_MACRO><TEST>true</TEST>
+macros=
 
 
 # Timeout [ms] for loading files: Displays, but also color, font, widget class files