Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shroffk merged 3 commits into from
Jul 23, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7e5d4c
Remove legacy LCID macro
rjwills28 Jul 23, 2025
c353506
Remove defaut demo macros that are getting added to URIs
rjwills28 Jul 23, 2025
e94a71c
Add example for the format of global macros
rjwills28 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
5 changes: 3 additions & 2 deletions app/display/model/src/main/resources/display_model_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Comment thread
kasemir marked this conversation as resolved.
# 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
Expand Down