Update sitemap syntax for icon

Icon value can now reference an icon source:iconset:icon name. Icon value can no more be any string. Keep the ability to surround the value with simple or double quotes for better backward compatibility Signed-off-by: Laurent Garnier <[email protected]>
openhab · Feb 25, 2023 · 389a76a · 389a76a
1 parent fafadd4
commit 389a76a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
@@ -102,7 +102,7 @@ Selection:
     ('visibility=[' (Visibility+=VisibilityRule (',' Visibility+=VisibilityRule)* ']'))?);
 
 List:
-    'List' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)?
+    'List' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)? &
     ('separator=' separator=STRING) &
     ('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)* ']'))? &
     ('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)* ']'))? &
@@ -142,7 +142,12 @@ GroupItemRef:
     ID;
 
 Icon returns ecore::EString:
-    STRING | ID;
+    ICON_SEGMENT_ID (':' ICON_SEGMENT_ID (':' ICON_SEGMENT_ID)?)? |
+    '"' ICON_SEGMENT_ID (':' ICON_SEGMENT_ID (':' ICON_SEGMENT_ID)?)? '"' |
+    "'" ICON_SEGMENT_ID (':' ICON_SEGMENT_ID (':' ICON_SEGMENT_ID)?)? "'";
+
+terminal ICON_SEGMENT_ID:
+    ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '-' | '0'..'9')*;
 
 ColorArray:
     ((item=ID)? (condition=("==" | ">" | "<" | ">=" | "<=" | "!="))? (sign=('-' | '+'))? (state=XState) '=')?

diff --git a/...re.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java b/...re.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
@@ -32,7 +32,7 @@ public IValueConverter<String> Icon() {
 
             @Override
             public String toValue(String string, INode node) throws ValueConverterException {
-                if (string != null && string.startsWith("\"")) {
+                if (string != null && (string.startsWith("\"") || string.startsWith("'"))) {
                     return string.substring(1, string.length() - 1);
                 }
                 return string;