From 0f6c26fc3088c3d87e5277ed5555708a8b5b72c4 Mon Sep 17 00:00:00 2001 From: Laurent Garnier Date: Wed, 14 Aug 2024 11:18:35 +0200 Subject: [PATCH] [sitemap] Remove snedFrequency parameter for Slider/Colorpicker widgets Related to #4338 Signed-off-by: Laurent Garnier --- .../core/io/rest/sitemap/internal/SitemapResource.java | 1 - .../openhab/core/io/rest/sitemap/internal/WidgetDTO.java | 1 - .../src/org/openhab/core/model/sitemap/Sitemap.xtext | 6 ++---- .../ui/internal/components/UIComponentSitemapProvider.java | 4 ---- 4 files changed, 2 insertions(+), 10 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 52e6796f6ce..b7bf50cc8d2 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 @@ -656,7 +656,6 @@ private PageDTO createPageBean(String sitemapName, @Nullable String title, @Null bean.inputHint = inputWidget.getInputHint(); } if (widget instanceof Slider sliderWidget) { - bean.sendFrequency = sliderWidget.getFrequency(); bean.switchSupport = sliderWidget.isSwitchEnabled(); bean.releaseOnly = sliderWidget.isReleaseOnly(); bean.minValue = sliderWidget.getMinValue(); 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 6a7257aa6d9..32347f85daf 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 @@ -57,7 +57,6 @@ public class WidgetDTO { public final List mappings = new ArrayList<>(); public Boolean switchSupport; public Boolean releaseOnly; - public Integer sendFrequency; 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 78f9c0e894f..eca85cbb3d6 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 @@ -126,9 +126,8 @@ Slider: (('icon=' icon=Icon) | ('icon=[' (IconRules+=IconRule (',' IconRules+=IconRule)*) ']') | ('staticIcon=' staticIcon=Icon))? & - ('sendFrequency=' frequency=INT)? & (switchEnabled?='switchSupport')? & - (releaseOnly?='releaseOnly')? & ('minValue=' minValue=Number)? & - ('maxValue=' maxValue=Number)? & ('step=' step=Number)? & + (switchEnabled?='switchSupport')? & (releaseOnly?='releaseOnly')? & + ('minValue=' minValue=Number)? & ('maxValue=' maxValue=Number)? & ('step=' step=Number)? & ('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)*) ']')? & ('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)*) ']')? & ('iconcolor=[' (IconColor+=ColorArray (',' IconColor+=ColorArray)*) ']')? & @@ -161,7 +160,6 @@ Colorpicker: (('icon=' icon=Icon) | ('icon=[' (IconRules+=IconRule (',' IconRules+=IconRule)*) ']') | ('staticIcon=' staticIcon=Icon))? & - ('sendFrequency=' frequency=INT)? & ('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)*) ']')? & ('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)*) ']')? & ('iconcolor=[' (IconColor+=ColorArray (',' IconColor+=ColorArray)*) ']')? & 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 9e9ea244a08..dd93ce9ae8c 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 @@ -243,8 +243,6 @@ protected Sitemap buildSitemap(RootUIComponent rootComponent) { SitemapPackage.SLIDER__SWITCH_ENABLED); setWidgetPropertyFromComponentConfig(widget, component, "releaseOnly", SitemapPackage.SLIDER__RELEASE_ONLY); - setWidgetPropertyFromComponentConfig(widget, component, "sendFrequency", - SitemapPackage.SLIDER__FREQUENCY); break; case "Selection": SelectionImpl selectionWidget = (SelectionImpl) SitemapFactory.eINSTANCE.createSelection(); @@ -266,8 +264,6 @@ protected Sitemap buildSitemap(RootUIComponent rootComponent) { case "Colorpicker": ColorpickerImpl colorpickerWidget = (ColorpickerImpl) SitemapFactory.eINSTANCE.createColorpicker(); widget = colorpickerWidget; - setWidgetPropertyFromComponentConfig(widget, component, "frequency", - SitemapPackage.COLORPICKER__FREQUENCY); break; case "Buttongrid": ButtongridImpl buttongridWidget = (ButtongridImpl) SitemapFactory.eINSTANCE.createButtongrid();