Skip to content

Commit f14f147

Browse files
committed
CSSTUDIO-3392 Improve parsing.
1 parent 634edef commit f14f147

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

app/display/model/src/main/java/org/csstudio/display/builder/model/persist/NamedWidgetColors.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,11 @@ private record Alias (NamedWidgetColor color) implements ColorDefinition { };
164164
public Optional<ColorDefinition> parseColorDefinition(final String colorDefinitionString)
165165
{
166166
String colorDefinitionStringTrimmed = colorDefinitionString.trim();
167-
if (colorDefinitionStringTrimmed.startsWith("alias(")) {
168-
if (colorDefinitionStringTrimmed.endsWith(")")) {
169-
String colorName = colorDefinitionStringTrimmed.substring(6,colorDefinitionStringTrimmed.length()-1).trim();
170-
if (colors.containsKey(colorDefinitionStringTrimmed)) {
167+
if (colorDefinitionStringTrimmed.startsWith("alias")) {
168+
String colorDefinitionsStringWithoutAlias = colorDefinitionStringTrimmed.substring(5).trim();
169+
if (colorDefinitionsStringWithoutAlias.startsWith("(") && colorDefinitionsStringWithoutAlias.endsWith(")")) {
170+
String colorName = colorDefinitionsStringWithoutAlias.substring(1,colorDefinitionsStringWithoutAlias.length()-1).trim();
171+
if (colors.containsKey(colorName)) {
171172
NamedWidgetColor color = colors.get(colorName);
172173
return Optional.of(new Alias(color));
173174
} else {

0 commit comments

Comments
 (0)