From 6d989ea6e21a890cf18e3ae55f0d99fe88931d59 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Sun, 5 Mar 2023 20:48:06 +0100 Subject: [PATCH] Remove List element from sitemap syntax (#3423) Related to openhab/openhab-webui#1755 Related to openhab/openhab-android#3285 This sitemap widget is not documented. It is not implemented neither in Android app nor iOS app. It was implemented in BasicUI but was buggy. Support in BasicUI has been removed. Signed-off-by: Laurent Garnier --- .../core/io/rest/sitemap/internal/SitemapResource.java | 5 ----- .../core/io/rest/sitemap/internal/WidgetDTO.java | 1 - .../src/org/openhab/core/model/sitemap/Sitemap.xtext | 10 +--------- .../components/UIComponentSitemapProvider.java | 6 ------ 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java index 4627637048..ec48905636 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java @@ -75,7 +75,6 @@ import org.openhab.core.model.sitemap.sitemap.ColorArray; import org.openhab.core.model.sitemap.sitemap.Frame; import org.openhab.core.model.sitemap.sitemap.Image; import org.openhab.core.model.sitemap.sitemap.LinkableWidget; -import org.openhab.core.model.sitemap.sitemap.List; import org.openhab.core.model.sitemap.sitemap.Mapping; import org.openhab.core.model.sitemap.sitemap.Mapview; import org.openhab.core.model.sitemap.sitemap.Selection; @@ -564,10 +563,6 @@ public class SitemapResource bean.maxValue = sliderWidget.getMaxValue(); bean.step = sliderWidget.getStep(); } - if (widget instanceof List) { - List listWidget = (List) widget; - bean.separator = listWidget.getSeparator(); - } if (widget instanceof Image) { bean.url = buildProxyUrl(sitemapName, widget, uri); Image imageWidget = (Image) widget; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java index 717a689d22..61e79b7c34 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java @@ -42,7 +42,6 @@ public class WidgetDTO { public final List mappings = new ArrayList<>(); public Boolean switchSupport; public Integer sendFrequency; - public String separator; public Integer refresh; public Integer height; public BigDecimal minValue; 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 index 37ea07df02..d36e7f4c2d 100644 --- 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 @@ -15,7 +15,7 @@ Widget: (LinkableWidget | NonLinkableWidget); NonLinkableWidget: - Switch | Selection | Slider | List | Setpoint | Video | Chart | Webview | Colorpicker | Mapview | Input | Default; + Switch | Selection | Slider | Setpoint | Video | Chart | Webview | Colorpicker | Mapview | Input | Default; LinkableWidget: (Text | Group | Image | Frame) @@ -111,14 +111,6 @@ Selection: ('iconcolor=[' (IconColor+=ColorArray (',' IconColor+=ColorArray)* ']'))? & ('visibility=[' (Visibility+=VisibilityRule (',' Visibility+=VisibilityRule)* ']'))?); -List: - 'List' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)? & - ('separator=' separator=STRING) & - ('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)* ']'))? & - ('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)* ']'))? & - ('iconcolor=[' (IconColor+=ColorArray (',' IconColor+=ColorArray)* ']'))? & - ('visibility=[' (Visibility+=VisibilityRule (',' Visibility+=VisibilityRule)* ']'))?); - Setpoint: 'Setpoint' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)? & ('minValue=' minValue=Number)? & ('maxValue=' maxValue=Number)? & ('step=' step=Number)? & diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java index 5f4e7c3676..47d54996b8 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java @@ -45,7 +45,6 @@ import org.openhab.core.model.sitemap.sitemap.impl.DefaultImpl; import org.openhab.core.model.sitemap.sitemap.impl.FrameImpl; import org.openhab.core.model.sitemap.sitemap.impl.GroupImpl; import org.openhab.core.model.sitemap.sitemap.impl.ImageImpl; -import org.openhab.core.model.sitemap.sitemap.impl.ListImpl; import org.openhab.core.model.sitemap.sitemap.impl.MappingImpl; import org.openhab.core.model.sitemap.sitemap.impl.MapviewImpl; import org.openhab.core.model.sitemap.sitemap.impl.SelectionImpl; @@ -236,11 +235,6 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan addWidgetMappings(selectionWidget.getMappings(), component); widget = selectionWidget; break; - case "List": - ListImpl listWidget = (ListImpl) SitemapFactory.eINSTANCE.createList(); - widget = listWidget; - setWidgetPropertyFromComponentConfig(widget, component, "separator", SitemapPackage.LIST__SEPARATOR); - break; case "Setpoint": SetpointImpl setpointWidget = (SetpointImpl) SitemapFactory.eINSTANCE.createSetpoint(); widget = setpointWidget;