demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix parsing integer & booleans parameters in UI component based sitemaps (#2072)

Browse Source 
* Fix parsing integer & booleans parameters in UI component based sitemaps

Also catch remaining exceptions and log a warning/ignore the parameter
instead of making the whole sitemap building process fail.

Fix wrong feature ID for the video widget URL.

Fixes #2047.
Fixes #1987.
Fixes #1898.
Fixes #1875.
Fixes https://github.com/openhab/openhab-webui/issues/745.

Signed-off-by: Yannick Schaus <github@schaus.net>
This commit is contained in:
Yannick Schaus
2021-01-05 22:42:31 +01:00
committed by GitHub
parent 55d2aaf5e8
commit fcaf251bd0
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
+17 -4
View File
@@ -12,6 +12,7 @@
*/
package org.openhab.core.ui.internal.components;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -178,7 +179,7 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
case "Video":
VideoImpl videoWidget = (VideoImpl) SitemapFactory.eINSTANCE.createVideo();
widget = videoWidget;
setWidgetPropertyFromComponentConfig(widget, component, "url", SitemapPackage.IMAGE__URL);
setWidgetPropertyFromComponentConfig(widget, component, "url", SitemapPackage.VIDEO__URL);
setWidgetPropertyFromComponentConfig(widget, component, "encoding", SitemapPackage.VIDEO__ENCODING);
break;
case "Chart":
@@ -220,7 +221,6 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
SelectionImpl selectionWidget = (SelectionImpl) SitemapFactory.eINSTANCE.createSelection();
addWidgetMappings(selectionWidget.getMappings(), component);
widget = selectionWidget;
setWidgetPropertyFromComponentConfig(widget, component, "height", SitemapPackage.WEBVIEW__HEIGHT);
break;
case "List":
ListImpl listWidget = (ListImpl) SitemapFactory.eINSTANCE.createList();
@@ -282,8 +282,21 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
if (value == null) {
return;
}
WidgetImpl widgetImpl = (WidgetImpl) widget;
widgetImpl.eSet(feature, ConfigUtil.normalizeType(value));
try {
WidgetImpl widgetImpl = (WidgetImpl) widget;
Object normalizedValue = ConfigUtil.normalizeType(value);
if (widgetImpl.eGet(feature, false, false) instanceof Integer) {
normalizedValue = (normalizedValue instanceof BigDecimal) ? ((BigDecimal) normalizedValue).intValue()
: Integer.valueOf(normalizedValue.toString());
} else if (widgetImpl.eGet(feature, false, false) instanceof Boolean
&& !(normalizedValue instanceof Boolean)) {
normalizedValue = Boolean.valueOf(normalizedValue.toString());
}
widgetImpl.eSet(feature, normalizedValue);
} catch (Exception e) {
logger.warn("Cannot set {} parameter for {} widget parameter: {}", configParamName, component.getType(),
e.getMessage());
}
}
private void addWidgetMappings(EList<Mapping> mappings, UIComponent component) {