demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

[sitemap] Remove snedFrequency parameter for Slider/Colorpicker widgets (#4347)

Browse Source 
Related to #4338

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2024-09-07 18:41:52 +02:00 committed by GitHub
parent e3d7885367
commit edf5b62213
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
View File

@ -656,7 +656,6 @@ public class SitemapResource
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();

1
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
View File

@ -57,7 +57,6 @@ public class WidgetDTO {
public final List<MappingDTO> mappings = new ArrayList<>();
public Boolean switchSupport;
public Boolean releaseOnly;
public Integer sendFrequency;
public Integer refresh;
public Integer height;
public BigDecimal minValue;

6
bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
View File

@ -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)*) ']')? &

4
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
View File

@ -243,8 +243,6 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
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 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
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();