OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactored namespace to org.openhab (#157) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/158/head
Kai Kreuzer 2019-12-29 18:09:25 +01:00 committed by GitHub
parent 368c4fc2e3
commit 0a8ca96d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
83 changed files with 372 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.ui.basic/NOTICE
View File

@ -1,6 +1,6 @@
This content is produced and maintained by the Eclipse SmartHome project. This content is produced and maintained by the Eclipse SmartHome project.
* Project home: https://eclipse.org/smarthome/ * Project home: https://openhab.org/
== Declared Project Licenses == Declared Project Licenses

2
bundles/org.openhab.ui.basic/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "org.openhab.ui.basic", "name": "org.openhab.ui.basic",
"version": "2.5.0", "version": "3.0.0",
"description": "Basic UI", "description": "Basic UI",
"scripts": { "scripts": {
"build": "gulp default" "build": "gulp default"

14
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/AbstractWidgetRenderer.java
View File

@ -24,13 +24,13 @@ import java.util.Map;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.smarthome.core.i18n.I18nUtil; import org.openhab.core.i18n.I18nUtil;
import org.eclipse.smarthome.core.i18n.LocaleProvider; import org.openhab.core.i18n.LocaleProvider;
import org.eclipse.smarthome.core.i18n.TranslationProvider; import org.openhab.core.i18n.TranslationProvider;
import org.eclipse.smarthome.core.library.types.QuantityType; import org.openhab.core.library.types.QuantityType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.internal.WebAppActivator; import org.openhab.ui.basic.internal.WebAppActivator;
import org.openhab.ui.basic.internal.WebAppConfig; import org.openhab.ui.basic.internal.WebAppConfig;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;

12
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ChartRenderer.java
View File

@ -16,12 +16,12 @@ import java.util.Date;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.model.sitemap.sitemap.Chart; import org.openhab.core.model.sitemap.sitemap.Chart;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.internal.WebAppConfig; import org.openhab.ui.basic.internal.WebAppConfig;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;

10
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java
View File

@ -14,11 +14,11 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.library.types.HSBType; import org.openhab.core.library.types.HSBType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Colorpicker; import org.openhab.core.model.sitemap.sitemap.Colorpicker;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.internal.servlet.WebAppServlet; import org.openhab.ui.basic.internal.servlet.WebAppServlet;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/FrameRenderer.java
View File

@ -18,9 +18,9 @@ import java.util.List;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Frame; import org.openhab.core.model.sitemap.sitemap.Frame;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/GroupRenderer.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Group; import org.openhab.core.model.sitemap.sitemap.Group;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

12
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ImageRenderer.java
View File

@ -16,12 +16,12 @@ import java.util.Date;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.library.types.RawType; import org.openhab.core.library.types.RawType;
import org.eclipse.smarthome.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Image; import org.openhab.core.model.sitemap.sitemap.Image;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ListRenderer.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.List; import org.openhab.core.model.sitemap.sitemap.List;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

10
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/MapviewRenderer.java
View File

@ -14,11 +14,11 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.library.types.PointType; import org.openhab.core.library.types.PointType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Mapview; import org.openhab.core.model.sitemap.sitemap.Mapview;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

16
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/PageRenderer.java
View File

@ -20,13 +20,13 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
import org.eclipse.smarthome.core.i18n.LocaleProvider; import org.openhab.core.i18n.LocaleProvider;
import org.eclipse.smarthome.core.i18n.TranslationProvider; import org.openhab.core.i18n.TranslationProvider;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.openhab.core.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.sitemap.Frame; import org.openhab.core.model.sitemap.sitemap.Frame;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; import org.openhab.core.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.internal.WebAppConfig; import org.openhab.ui.basic.internal.WebAppConfig;
import org.openhab.ui.basic.internal.servlet.WebAppServlet; import org.openhab.ui.basic.internal.servlet.WebAppServlet;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
@ -136,7 +136,7 @@ public class PageRenderer extends AbstractWidgetRenderer {
EObject firstChild = children.get(0); EObject firstChild = children.get(0);
EObject parent = itemUIRegistry.getParent((Widget) firstChild); EObject parent = itemUIRegistry.getParent((Widget) firstChild);
if (!(firstChild instanceof Frame || parent instanceof Frame || parent instanceof Sitemap if (!(firstChild instanceof Frame || parent instanceof Frame || parent instanceof Sitemap
|| parent instanceof org.eclipse.smarthome.model.sitemap.sitemap.List)) { || parent instanceof org.openhab.core.model.sitemap.sitemap.List)) {
String frameSnippet = getSnippet("frame"); String frameSnippet = getSnippet("frame");
frameSnippet = StringUtils.replace(frameSnippet, "%widget_id%", ""); frameSnippet = StringUtils.replace(frameSnippet, "%widget_id%", "");
frameSnippet = StringUtils.replace(frameSnippet, "%label%", ""); frameSnippet = StringUtils.replace(frameSnippet, "%label%", "");

24
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SelectionRenderer.java
View File

@ -15,18 +15,18 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.library.items.NumberItem; import org.openhab.core.library.items.NumberItem;
import org.eclipse.smarthome.core.library.types.QuantityType; import org.openhab.core.library.types.QuantityType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.core.types.StateDescription; import org.openhab.core.types.StateDescription;
import org.eclipse.smarthome.core.types.StateOption; import org.openhab.core.types.StateOption;
import org.eclipse.smarthome.core.types.util.UnitUtils; import org.openhab.core.types.util.UnitUtils;
import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; import org.openhab.core.model.sitemap.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.sitemap.Selection; import org.openhab.core.model.sitemap.sitemap.Selection;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

10
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SetpointRenderer.java
View File

@ -16,11 +16,11 @@ import java.math.BigDecimal;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.library.types.DecimalType; import org.openhab.core.library.types.DecimalType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint; import org.openhab.core.model.sitemap.sitemap.Setpoint;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SliderRenderer.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Slider; import org.openhab.core.model.sitemap.sitemap.Slider;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

32
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SwitchRenderer.java
View File

@ -14,22 +14,22 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.library.items.NumberItem; import org.openhab.core.library.items.NumberItem;
import org.eclipse.smarthome.core.library.items.RollershutterItem; import org.openhab.core.library.items.RollershutterItem;
import org.eclipse.smarthome.core.library.items.SwitchItem; import org.openhab.core.library.items.SwitchItem;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.eclipse.smarthome.core.library.types.QuantityType; import org.openhab.core.library.types.QuantityType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.core.types.StateDescription; import org.openhab.core.types.StateDescription;
import org.eclipse.smarthome.core.types.StateOption; import org.openhab.core.types.StateOption;
import org.eclipse.smarthome.core.types.util.UnitUtils; import org.openhab.core.types.util.UnitUtils;
import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; import org.openhab.core.model.sitemap.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.sitemap.Switch; import org.openhab.core.model.sitemap.sitemap.Switch;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/TextRenderer.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Text; import org.openhab.core.model.sitemap.sitemap.Text;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

10
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/VideoRenderer.java
View File

@ -16,11 +16,11 @@ import java.util.Date;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.model.sitemap.sitemap.Video; import org.openhab.core.model.sitemap.sitemap.Video;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

6
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/WebviewRenderer.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.basic.internal.render;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Webview; import org.openhab.core.model.sitemap.sitemap.Webview;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;
import org.openhab.ui.basic.render.WidgetRenderer; import org.openhab.ui.basic.render.WidgetRenderer;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

4
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/BaseServlet.java
View File

@ -12,8 +12,8 @@
*/ */
package org.openhab.ui.basic.internal.servlet; package org.openhab.ui.basic.internal.servlet;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.io.http.servlet.SmartHomeBundleServlet; import org.openhab.core.io.http.servlet.SmartHomeBundleServlet;
/** /**
* This is the base servlet class for other servlet in the Basic UI. * This is the base servlet class for other servlet in the Basic UI.

22
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/CmdServlet.java
View File

@ -18,17 +18,17 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.library.items.SwitchItem; import org.openhab.core.library.items.SwitchItem;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.eclipse.smarthome.core.types.Command; import org.openhab.core.types.Command;
import org.eclipse.smarthome.core.types.TypeParser; import org.openhab.core.types.TypeParser;
import org.eclipse.smarthome.io.http.HttpContextFactoryService; import org.openhab.core.io.http.HttpContextFactoryService;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

16
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/WebAppServlet.java
View File

@ -25,14 +25,14 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.config.core.ConfigurableService; import org.openhab.core.config.core.ConfigurableService;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.io.http.HttpContextFactoryService; import org.openhab.core.io.http.HttpContextFactoryService;
import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService; import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.openhab.core.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; import org.openhab.core.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.openhab.ui.basic.internal.WebAppConfig; import org.openhab.ui.basic.internal.WebAppConfig;
import org.openhab.ui.basic.internal.render.PageRenderer; import org.openhab.ui.basic.internal.render.PageRenderer;
import org.openhab.ui.basic.render.RenderException; import org.openhab.ui.basic.render.RenderException;

2
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/render/WidgetRenderer.java
View File

@ -13,7 +13,7 @@
package org.openhab.ui.basic.render; package org.openhab.ui.basic.render;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.openhab.ui.basic.internal.WebAppConfig; import org.openhab.ui.basic.internal.WebAppConfig;
/** /**

2
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/CometVisuDashboardTile.java
View File

@ -16,7 +16,7 @@ import java.io.File;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.openhab.core.model.sitemap.SitemapProvider;
import org.openhab.ui.dashboard.DashboardTile; import org.openhab.ui.dashboard.DashboardTile;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;

20
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/Config.java
View File

@ -15,16 +15,16 @@ package org.openhab.ui.cometvisu.internal;
import java.io.File; import java.io.File;
import java.util.Hashtable; import java.util.Hashtable;
import org.eclipse.smarthome.config.core.ConfigConstants; import org.openhab.core.config.core.ConfigConstants;
import org.eclipse.smarthome.core.library.types.DateTimeType; import org.openhab.core.library.types.DateTimeType;
import org.eclipse.smarthome.core.library.types.DecimalType; import org.openhab.core.library.types.DecimalType;
import org.eclipse.smarthome.core.library.types.HSBType; import org.openhab.core.library.types.HSBType;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.eclipse.smarthome.core.library.types.OpenClosedType; import org.openhab.core.library.types.OpenClosedType;
import org.eclipse.smarthome.core.library.types.PointType; import org.openhab.core.library.types.PointType;
import org.eclipse.smarthome.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.eclipse.smarthome.core.library.types.UpDownType; import org.openhab.core.library.types.UpDownType;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
/** /**
* Utility class for constants. * Utility class for constants.

26
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/ChartResource.java
View File

@ -37,17 +37,17 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.library.types.DecimalType; import org.openhab.core.library.types.DecimalType;
import org.eclipse.smarthome.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering; import org.openhab.core.persistence.FilterCriteria.Ordering;
import org.eclipse.smarthome.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.eclipse.smarthome.core.persistence.PersistenceService; import org.openhab.core.persistence.PersistenceService;
import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; import org.openhab.core.persistence.QueryablePersistenceService;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;
@ -78,7 +78,7 @@ public class ChartResource implements RESTResource {
private static final DecimalFormat DECIMAL_FORMAT; private static final DecimalFormat DECIMAL_FORMAT;
protected static final String RRD_FOLDER = org.eclipse.smarthome.config.core.ConfigConstants.getUserDataFolder() protected static final String RRD_FOLDER = org.openhab.core.config.core.ConfigConstants.getUserDataFolder()
+ File.separator + "persistence" + File.separator + "rrd4j"; + File.separator + "persistence" + File.separator + "rrd4j";
static { static {
@ -204,7 +204,7 @@ public class ChartResource implements RESTResource {
while (it.hasNext()) { while (it.hasNext()) {
dataCounter++; dataCounter++;
HistoricItem historicItem = it.next(); HistoricItem historicItem = it.next();
org.eclipse.smarthome.core.types.State state = historicItem.getState(); org.openhab.core.types.State state = historicItem.getState();
if (state instanceof DecimalType) { if (state instanceof DecimalType) {
List<String> vals = new ArrayList<>(); List<String> vals = new ArrayList<>();
vals.add(formatDouble(((DecimalType) state).doubleValue(), "null", true)); vals.add(formatDouble(((DecimalType) state).doubleValue(), "null", true));

2
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/ConfigResource.java
View File

@ -19,7 +19,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.util.ClientInstaller; import org.openhab.ui.cometvisu.internal.util.ClientInstaller;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

4
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/EventBroadcaster.java
View File

@ -14,8 +14,8 @@ package org.openhab.ui.cometvisu.internal.backend;
import java.util.Map; import java.util.Map;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
/** /**
* Broadcast state change events of items to listening clients * Broadcast state change events of items to listening clients

2
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/LoginResource.java
View File

@ -22,7 +22,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.backend.beans.ConfigBean; import org.openhab.ui.cometvisu.internal.backend.beans.ConfigBean;
import org.openhab.ui.cometvisu.internal.backend.beans.LoginBean; import org.openhab.ui.cometvisu.internal.backend.beans.LoginBean;

14
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/ReadResource.java
View File

@ -31,13 +31,13 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import org.eclipse.smarthome.core.items.GenericItem; import org.openhab.core.items.GenericItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemFactory; import org.openhab.core.items.ItemFactory;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.EventOutput;
import org.glassfish.jersey.media.sse.SseBroadcaster; import org.glassfish.jersey.media.sse.SseBroadcaster;
import org.glassfish.jersey.media.sse.SseFeature; import org.glassfish.jersey.media.sse.SseFeature;

16
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/WriteResource.java
View File

@ -22,14 +22,14 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.types.Command; import org.openhab.core.types.Command;
import org.eclipse.smarthome.core.types.TypeParser; import org.openhab.core.types.TypeParser;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.backend.beans.SuccessBean; import org.openhab.ui.cometvisu.internal.backend.beans.SuccessBean;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

52
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/config/ConfigHelper.java
View File

@ -26,17 +26,17 @@ import javax.xml.bind.JAXBElement;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.library.types.DecimalType; import org.openhab.core.library.types.DecimalType;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.eclipse.smarthome.core.library.types.OpenClosedType; import org.openhab.core.library.types.OpenClosedType;
import org.eclipse.smarthome.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.eclipse.smarthome.core.library.types.UpDownType; import org.openhab.core.library.types.UpDownType;
import org.eclipse.smarthome.core.types.Command; import org.openhab.core.types.Command;
import org.eclipse.smarthome.core.types.TypeParser; import org.openhab.core.types.TypeParser;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.eclipse.smarthome.ui.icon.IconProvider; import org.openhab.core.ui.icon.IconProvider;
import org.eclipse.smarthome.ui.icon.IconSet.Format; import org.openhab.core.ui.icon.IconSet.Format;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.config.beans.Address; import org.openhab.ui.cometvisu.internal.config.beans.Address;
import org.openhab.ui.cometvisu.internal.config.beans.CDataStatus; import org.openhab.ui.cometvisu.internal.config.beans.CDataStatus;
@ -442,7 +442,7 @@ public class ConfigHelper {
} }
public Mapping createMapping(String name, public Mapping createMapping(String name,
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> sitemapMapping) { EList<org.openhab.core.model.sitemap.sitemap.Mapping> sitemapMapping) {
Mapping mapping = null; Mapping mapping = null;
if (mappings.containsKey(name)) { if (mappings.containsKey(name)) {
mapping = mappings.get(name); mapping = mappings.get(name);
@ -451,7 +451,7 @@ public class ConfigHelper {
mapping = new Mapping(); mapping = new Mapping();
mapping.setName(name); mapping.setName(name);
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : sitemapMapping) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : sitemapMapping) {
Entry entry = new Entry(); Entry entry = new Entry();
entry.setValue(map.getCmd()); entry.setValue(map.getCmd());
entry.getContent().add(map.getLabel()); entry.getContent().add(map.getLabel());
@ -520,7 +520,7 @@ public class ConfigHelper {
} }
public void mapToTriggers(Object element, Item item, Widget widget) { public void mapToTriggers(Object element, Item item, Widget widget) {
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> sitemapMapping = getMapping(widget); EList<org.openhab.core.model.sitemap.sitemap.Mapping> sitemapMapping = getMapping(widget);
int groupColumns = 6; int groupColumns = 6;
@ -547,7 +547,7 @@ public class ConfigHelper {
states.add(UpDownType.class); states.add(UpDownType.class);
states.add(StringType.class); states.add(StringType.class);
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : sitemapMapping) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : sitemapMapping) {
Command command = TypeParser.parseCommand(states, map.getCmd()); Command command = TypeParser.parseCommand(states, map.getCmd());
if (!(command instanceof DecimalType)) { if (!(command instanceof DecimalType)) {
// no number command // no number command
@ -561,7 +561,7 @@ public class ConfigHelper {
Mapping mapping = createMapping(mappingName, sitemapMapping); Mapping mapping = createMapping(mappingName, sitemapMapping);
addToMappings(mapping); addToMappings(mapping);
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : sitemapMapping) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : sitemapMapping) {
Trigger trigger = new Trigger(); Trigger trigger = new Trigger();
trigger.setValue(map.getCmd()); trigger.setValue(map.getCmd());
@ -582,7 +582,7 @@ public class ConfigHelper {
* @param widget * @param widget
*/ */
public void mapToMultiTrigger(Object element, Item item, Widget widget) { public void mapToMultiTrigger(Object element, Item item, Widget widget) {
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> sitemapMapping = getMapping(widget); EList<org.openhab.core.model.sitemap.sitemap.Mapping> sitemapMapping = getMapping(widget);
Transform transform = Transform.NUMBER; Transform transform = Transform.NUMBER;
@ -593,7 +593,7 @@ public class ConfigHelper {
states.add(UpDownType.class); states.add(UpDownType.class);
states.add(StringType.class); states.add(StringType.class);
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : sitemapMapping) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : sitemapMapping) {
Command command = TypeParser.parseCommand(states, map.getCmd()); Command command = TypeParser.parseCommand(states, map.getCmd());
if (!(command instanceof DecimalType)) { if (!(command instanceof DecimalType)) {
// no number command // no number command
@ -611,7 +611,7 @@ public class ConfigHelper {
mtrigger.setLayout(createLayout(6)); mtrigger.setLayout(createLayout(6));
int i = 1; int i = 1;
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : sitemapMapping) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : sitemapMapping) {
switch (i) { switch (i) {
case 1: case 1:
mtrigger.setButton1Label(map.getLabel()); mtrigger.setButton1Label(map.getLabel());
@ -636,11 +636,11 @@ public class ConfigHelper {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> getMapping(Widget widget) { private EList<org.openhab.core.model.sitemap.sitemap.Mapping> getMapping(Widget widget) {
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> mapping = null; EList<org.openhab.core.model.sitemap.sitemap.Mapping> mapping = null;
try { try {
Method getter = widget.getClass().getMethod("getMappings"); Method getter = widget.getClass().getMethod("getMappings");
mapping = (EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping>) getter.invoke(widget); mapping = (EList<org.openhab.core.model.sitemap.sitemap.Mapping>) getter.invoke(widget);
} catch (NoSuchMethodException | SecurityException e) { } catch (NoSuchMethodException | SecurityException e) {
// do nothing, normal behaviour for item that have no mappingdefined // do nothing, normal behaviour for item that have no mappingdefined
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
@ -655,7 +655,7 @@ public class ConfigHelper {
public Mapping addMapping(Object element, Widget widget) { public Mapping addMapping(Object element, Widget widget) {
Mapping mapping = null; Mapping mapping = null;
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> smap = getMapping(widget); EList<org.openhab.core.model.sitemap.sitemap.Mapping> smap = getMapping(widget);
if (smap != null && smap.size() > 0) { if (smap != null && smap.size() > 0) {
mapping = addMapping(element, String.valueOf(smap.hashCode()), smap); mapping = addMapping(element, String.valueOf(smap.hashCode()), smap);
} }
@ -664,7 +664,7 @@ public class ConfigHelper {
} }
public Mapping addMapping(Object element, String name, public Mapping addMapping(Object element, String name,
EList<org.eclipse.smarthome.model.sitemap.sitemap.Mapping> sitemapMapping) { EList<org.openhab.core.model.sitemap.sitemap.Mapping> sitemapMapping) {
Mapping mapping = createMapping(name, sitemapMapping); Mapping mapping = createMapping(name, sitemapMapping);
addMapping(element, mapping); addMapping(element, mapping);
return mapping; return mapping;
@ -691,7 +691,7 @@ public class ConfigHelper {
} }
/** /**
* map a @org.eclipse.smarthome.model.sitemap.ColorArray to an CometVisu * map a @org.openhab.core.model.sitemap.ColorArray to an CometVisu
* styling TODO: CometVisu only knows min/max ranges for stylings, the * styling TODO: CometVisu only knows min/max ranges for stylings, the
* mapping of openHAB´s conditions to these ranges is quite complex and not * mapping of openHAB´s conditions to these ranges is quite complex and not
* yet implemented * yet implemented
@ -832,7 +832,7 @@ public class ConfigHelper {
* the page for wich the pagejump should be created * the page for wich the pagejump should be created
* @param widget * @param widget
*/ */
public void addToNavbar(Page barPage, Page targetPage, org.eclipse.smarthome.model.sitemap.sitemap.Group widget, public void addToNavbar(Page barPage, Page targetPage, org.openhab.core.model.sitemap.sitemap.Group widget,
NavbarPositionType position, Item item) { NavbarPositionType position, Item item) {
Pagejump pagejump = new Pagejump(); Pagejump pagejump = new Pagejump();
pagejump.setBindClickToWidget(true); pagejump.setBindClickToWidget(true);

56
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/config/VisuConfig.java
View File

@ -26,19 +26,19 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.library.items.ContactItem; import org.openhab.core.library.items.ContactItem;
import org.eclipse.smarthome.core.library.items.DateTimeItem; import org.openhab.core.library.items.DateTimeItem;
import org.eclipse.smarthome.core.library.items.NumberItem; import org.openhab.core.library.items.NumberItem;
import org.eclipse.smarthome.core.library.items.RollershutterItem; import org.openhab.core.library.items.RollershutterItem;
import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
import org.eclipse.smarthome.model.sitemap.sitemap.Selection; import org.openhab.core.model.sitemap.sitemap.Selection;
import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint; import org.openhab.core.model.sitemap.sitemap.Setpoint;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; import org.openhab.core.model.sitemap.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.sitemap.Webview; import org.openhab.core.model.sitemap.sitemap.Webview;
import org.eclipse.smarthome.model.sitemap.sitemap.Widget; import org.openhab.core.model.sitemap.sitemap.Widget;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.config.ConfigHelper.Transform; import org.openhab.ui.cometvisu.internal.config.ConfigHelper.Transform;
import org.openhab.ui.cometvisu.internal.config.beans.Address; import org.openhab.ui.cometvisu.internal.config.beans.Address;
@ -208,7 +208,7 @@ public class VisuConfig {
EList<Widget> children = app.getItemUIRegistry().getChildren((LinkableWidget) widget); EList<Widget> children = app.getItemUIRegistry().getChildren((LinkableWidget) widget);
if (children.size() == 0) { if (children.size() == 0) {
processItemWidget(rootPage, widget, item, pages, level); processItemWidget(rootPage, widget, item, pages, level);
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Frame) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Frame) {
Group group = new Group(); Group group = new Group();
group.setLayout(configHelper.createLayout(6)); group.setLayout(configHelper.createLayout(6));
group.setName(configHelper.getLabel(widget)); group.setName(configHelper.getLabel(widget));
@ -220,8 +220,8 @@ public class VisuConfig {
Page page = new Page(); Page page = new Page();
page.setName(configHelper.getLabel(widget)); page.setName(configHelper.getLabel(widget));
configHelper.addToRoot(rootPage, factory.createPagePage(page)); configHelper.addToRoot(rootPage, factory.createPagePage(page));
if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Group) { if (widget instanceof org.openhab.core.model.sitemap.sitemap.Group) {
org.eclipse.smarthome.model.sitemap.sitemap.Group group = (org.eclipse.smarthome.model.sitemap.sitemap.Group) widget; org.openhab.core.model.sitemap.sitemap.Group group = (org.openhab.core.model.sitemap.sitemap.Group) widget;
// add Group item to the Navbar // add Group item to the Navbar
// logger.debug("page '{}' on level {}",page.getName(),level); // logger.debug("page '{}' on level {}",page.getName(),level);
NavbarPositionType position = (level <= 1) ? NavbarPositionType.TOP : NavbarPositionType.LEFT; NavbarPositionType position = (level <= 1) ? NavbarPositionType.TOP : NavbarPositionType.LEFT;
@ -247,8 +247,8 @@ public class VisuConfig {
} }
private void processItemWidget(Object rootPage, Widget widget, Item item, Pages pages, int level) { private void processItemWidget(Object rootPage, Widget widget, Item item, Pages pages, int level) {
if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Switch) { if (widget instanceof org.openhab.core.model.sitemap.sitemap.Switch) {
org.eclipse.smarthome.model.sitemap.sitemap.Switch switchWidget = (org.eclipse.smarthome.model.sitemap.sitemap.Switch) widget; org.openhab.core.model.sitemap.sitemap.Switch switchWidget = (org.openhab.core.model.sitemap.sitemap.Switch) widget;
if (item instanceof RollershutterItem) { if (item instanceof RollershutterItem) {
// in the demo-sitemap a rullershutter item is defined as // in the demo-sitemap a rullershutter item is defined as
@ -272,7 +272,7 @@ public class VisuConfig {
configHelper.addStyling(switchBean, widget); configHelper.addStyling(switchBean, widget);
configHelper.addToRoot(rootPage, factory.createPageSwitch(switchBean)); configHelper.addToRoot(rootPage, factory.createPageSwitch(switchBean));
} }
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Text) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Text) {
Info info = new Info(); Info info = new Info();
Transform transform = Transform.STRING; Transform transform = Transform.STRING;
boolean skipFormat = false; boolean skipFormat = false;
@ -304,7 +304,7 @@ public class VisuConfig {
configHelper.addToRoot(rootPage, factory.createPageText(text)); configHelper.addToRoot(rootPage, factory.createPageText(text));
} }
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Slider) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Slider) {
Slide bean = new Slide(); Slide bean = new Slide();
bean.setFormat("%d%%"); bean.setFormat("%d%%");
configHelper.addAddress(bean, item, Transform.DIMMER); configHelper.addAddress(bean, item, Transform.DIMMER);
@ -334,7 +334,7 @@ public class VisuConfig {
Mapping mapping = configHelper.createMapping(mappingName, selection.getMappings()); Mapping mapping = configHelper.createMapping(mappingName, selection.getMappings());
configHelper.addToMappings(mapping); configHelper.addToMappings(mapping);
for (org.eclipse.smarthome.model.sitemap.sitemap.Mapping map : selection.getMappings()) { for (org.openhab.core.model.sitemap.sitemap.Mapping map : selection.getMappings()) {
Trigger trigger = new Trigger(); Trigger trigger = new Trigger();
trigger.setValue(map.getCmd()); trigger.setValue(map.getCmd());
trigger.setMapping(mappingName); trigger.setMapping(mappingName);
@ -356,8 +356,8 @@ public class VisuConfig {
configHelper.addLabel(bean, widget); configHelper.addLabel(bean, widget);
configHelper.addToRoot(rootPage, factory.createPageWeb(bean)); configHelper.addToRoot(rootPage, factory.createPageWeb(bean));
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Image) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Image) {
org.eclipse.smarthome.model.sitemap.sitemap.Image image = (org.eclipse.smarthome.model.sitemap.sitemap.Image) widget; org.openhab.core.model.sitemap.sitemap.Image image = (org.openhab.core.model.sitemap.sitemap.Image) widget;
Image bean = new Image(); Image bean = new Image();
bean.setSrc(image.getUrl()); bean.setSrc(image.getUrl());
bean.setRefresh(new BigDecimal(image.getRefresh())); bean.setRefresh(new BigDecimal(image.getRefresh()));
@ -365,19 +365,19 @@ public class VisuConfig {
configHelper.addLabel(bean, widget); configHelper.addLabel(bean, widget);
configHelper.addToRoot(rootPage, factory.createPageImage(bean)); configHelper.addToRoot(rootPage, factory.createPageImage(bean));
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Video) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Video) {
org.eclipse.smarthome.model.sitemap.sitemap.Video video = (org.eclipse.smarthome.model.sitemap.sitemap.Video) widget; org.openhab.core.model.sitemap.sitemap.Video video = (org.openhab.core.model.sitemap.sitemap.Video) widget;
Video bean = new Video(); Video bean = new Video();
bean.setSrc(video.getUrl()); bean.setSrc(video.getUrl());
configHelper.addLabel(bean, widget); configHelper.addLabel(bean, widget);
configHelper.addToRoot(rootPage, factory.createPageVideo(bean)); configHelper.addToRoot(rootPage, factory.createPageVideo(bean));
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Chart && item != null) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Chart && item != null) {
Plugin plugin = new Plugin(); Plugin plugin = new Plugin();
plugin.setName("diagram"); plugin.setName("diagram");
configHelper.addPlugin(plugin); configHelper.addPlugin(plugin);
org.eclipse.smarthome.model.sitemap.sitemap.Chart chart = (org.eclipse.smarthome.model.sitemap.sitemap.Chart) widget; org.openhab.core.model.sitemap.sitemap.Chart chart = (org.openhab.core.model.sitemap.sitemap.Chart) widget;
Diagram bean = new Diagram(); Diagram bean = new Diagram();
bean.setSeries(configHelper.getCvChartPeriod(chart.getPeriod())); bean.setSeries(configHelper.getCvChartPeriod(chart.getPeriod()));
bean.setRefresh(new BigInteger(String.valueOf(chart.getRefresh()))); bean.setRefresh(new BigInteger(String.valueOf(chart.getRefresh())));
@ -406,7 +406,7 @@ public class VisuConfig {
} }
configHelper.addToRoot(rootPage, factory.createPageDiagram(bean)); configHelper.addToRoot(rootPage, factory.createPageDiagram(bean));
} else if (widget instanceof org.eclipse.smarthome.model.sitemap.sitemap.Colorpicker) { } else if (widget instanceof org.openhab.core.model.sitemap.sitemap.Colorpicker) {
Plugin plugin = new Plugin(); Plugin plugin = new Plugin();
plugin.setName("colorchooser"); plugin.setName("colorchooser");
configHelper.addPlugin(plugin); configHelper.addPlugin(plugin);

6
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/listeners/ItemRegistryEventListener.java
View File

@ -14,9 +14,9 @@ package org.openhab.ui.cometvisu.internal.listeners;
import java.util.Collection; import java.util.Collection;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.items.ItemRegistryChangeListener; import org.openhab.core.items.ItemRegistryChangeListener;
import org.openhab.ui.cometvisu.internal.backend.EventBroadcaster; import org.openhab.ui.cometvisu.internal.backend.EventBroadcaster;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;

8
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/listeners/StateEventListener.java
View File

@ -14,10 +14,10 @@ package org.openhab.ui.cometvisu.internal.listeners;
import java.util.Map; import java.util.Map;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.StateChangeListener; import org.openhab.core.items.StateChangeListener;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.openhab.ui.cometvisu.internal.backend.EventBroadcaster; import org.openhab.ui.cometvisu.internal.backend.EventBroadcaster;
import org.openhab.ui.cometvisu.internal.backend.beans.StateBean; import org.openhab.ui.cometvisu.internal.backend.beans.StateBean;

16
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/servlet/CometVisuApp.java
View File

@ -23,14 +23,14 @@ import java.util.Set;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import org.eclipse.smarthome.config.core.ConfigurableService; import org.openhab.core.config.core.ConfigurableService;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.persistence.PersistenceService; import org.openhab.core.persistence.PersistenceService;
import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; import org.openhab.core.persistence.QueryablePersistenceService;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.openhab.core.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.ui.icon.IconProvider; import org.openhab.core.ui.icon.IconProvider;
import org.eclipse.smarthome.ui.items.ItemUIRegistry; import org.openhab.core.ui.items.ItemUIRegistry;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.util.ClientInstaller; import org.openhab.ui.cometvisu.internal.util.ClientInstaller;
import org.openhab.ui.cometvisu.php.PHProvider; import org.openhab.ui.cometvisu.php.PHProvider;

26
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/servlet/CometVisuServlet.java
View File

@ -58,18 +58,18 @@ import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException; import org.openhab.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.eclipse.smarthome.core.persistence.FilterCriteria; import org.openhab.core.persistence.FilterCriteria;
import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering; import org.openhab.core.persistence.FilterCriteria.Ordering;
import org.eclipse.smarthome.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; import org.openhab.core.persistence.QueryablePersistenceService;
import org.eclipse.smarthome.core.types.Command; import org.openhab.core.types.Command;
import org.eclipse.smarthome.model.sitemap.SitemapProvider; import org.openhab.core.model.sitemap.SitemapProvider;
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; import org.openhab.core.model.sitemap.sitemap.Sitemap;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.openhab.ui.cometvisu.internal.config.ConfigHelper.Transform; import org.openhab.ui.cometvisu.internal.config.ConfigHelper.Transform;
import org.openhab.ui.cometvisu.internal.config.VisuConfig; import org.openhab.ui.cometvisu.internal.config.VisuConfig;
@ -123,7 +123,7 @@ public class CometVisuServlet extends HttpServlet {
public CometVisuServlet(String filesystemDir, CometVisuApp cometVisuApp) { public CometVisuServlet(String filesystemDir, CometVisuApp cometVisuApp) {
root = filesystemDir; root = filesystemDir;
rootFolder = new File(root); rootFolder = new File(root);
userFileFolder = new File(org.eclipse.smarthome.config.core.ConfigConstants.getConfigFolder() userFileFolder = new File(org.openhab.core.config.core.ConfigConstants.getConfigFolder()
+ Config.COMETVISU_WEBAPP_USERFILE_FOLDER); + Config.COMETVISU_WEBAPP_USERFILE_FOLDER);
defaultUserDir = System.getProperty("user.dir"); defaultUserDir = System.getProperty("user.dir");
this.cometVisuApp = cometVisuApp; this.cometVisuApp = cometVisuApp;

2
bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/ClientInstaller.java
View File

@ -29,7 +29,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.eclipse.smarthome.io.net.http.HttpUtil; import org.openhab.core.io.net.http.HttpUtil;
import org.openhab.ui.cometvisu.internal.Config; import org.openhab.ui.cometvisu.internal.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java
View File

@ -24,10 +24,10 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.eclipse.smarthome.core.i18n.LocaleProvider; import org.openhab.core.i18n.LocaleProvider;
import org.eclipse.smarthome.core.i18n.TranslationProvider; import org.openhab.core.i18n.TranslationProvider;
import org.eclipse.smarthome.core.net.HttpServiceUtil; import org.openhab.core.net.HttpServiceUtil;
import org.eclipse.smarthome.core.net.NetworkAddressService; import org.openhab.core.net.NetworkAddressService;
import org.openhab.ui.dashboard.DashboardReady; import org.openhab.ui.dashboard.DashboardReady;
import org.openhab.ui.dashboard.DashboardTile; import org.openhab.ui.dashboard.DashboardTile;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;

4
bundles/org.openhab.ui.dashboard/web/js/geolocation.js
View File

@ -24,7 +24,7 @@
var output = $('#geolocation') var output = $('#geolocation')
$.getJSON(window.location.origin + '/rest/services/org.eclipse.smarthome.i18n/config', function(response) { $.getJSON(window.location.origin + '/rest/services/org.openhab.core.i18n/config', function(response) {
window.language = response; window.language = response;
if (!response.location) { if (!response.location) {
@ -37,7 +37,7 @@
function send(configuration) { function send(configuration) {
$.ajax({ $.ajax({
url : window.location.origin + '/rest/services/org.eclipse.smarthome.i18n/config', url : window.location.origin + '/rest/services/org.openhab.core.i18n/config',
data : JSON.stringify(configuration), data : JSON.stringify(configuration),
type : 'PUT', type : 'PUT',
dataType : 'json', dataType : 'json',

2
bundles/org.openhab.ui.habot/NOTICE
View File

@ -1,6 +1,6 @@
This content is produced and maintained by the Eclipse SmartHome project. This content is produced and maintained by the Eclipse SmartHome project.
* Project home: https://eclipse.org/smarthome/ * Project home: https://openhab.org/
== Declared Project Licenses == Declared Project Licenses

2
bundles/org.openhab.ui.habot/README.md
View File

@ -1,6 +1,6 @@
# HABot # HABot
HABot is a chatbot for [openHAB](https://openhab.org), running inside the [Eclipse SmartHome](https://eclipse.org/smarthome/) runtime with no dependency; it can run offline and keep your data out of third-party clouds, but works very well remotely if served from an openHAB Cloud instance (like [myopenhab.org](https://www.myopenhab.org)). HABot is a chatbot for [openHAB](https://openhab.org), running inside the [Eclipse SmartHome](https://openhab.org/) runtime with no dependency; it can run offline and keep your data out of third-party clouds, but works very well remotely if served from an openHAB Cloud instance (like [myopenhab.org](https://www.myopenhab.org)).
In that scenario it can even be added to the Android homescreen as a [Progressive Web App](https://developers.google.com/web/progressive-web-apps/), and adds features working only on "secure origins" like push notifications, speech recognition and resource caching. In that scenario it can even be added to the Android homescreen as a [Progressive Web App](https://developers.google.com/web/progressive-web-apps/), and adds features working only on "secure origins" like push notifications, speech recognition and resource caching.
It consists in: It consists in:

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/card/Card.java
View File

@ -21,7 +21,7 @@ import java.util.UUID;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.common.registry.Identifiable; import org.openhab.core.common.registry.Identifiable;
import org.openhab.ui.habot.card.internal.CardRegistry; import org.openhab.ui.habot.card.internal.CardRegistry;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

20
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/card/CardBuilder.java
View File

@ -20,16 +20,16 @@ import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.Metadata; import org.openhab.core.items.Metadata;
import org.eclipse.smarthome.core.items.MetadataKey; import org.openhab.core.items.MetadataKey;
import org.eclipse.smarthome.core.items.MetadataRegistry; import org.openhab.core.items.MetadataRegistry;
import org.eclipse.smarthome.core.library.CoreItemFactory; import org.openhab.core.library.CoreItemFactory;
import org.eclipse.smarthome.core.transform.TransformationException; import org.openhab.core.transform.TransformationException;
import org.eclipse.smarthome.core.transform.TransformationHelper; import org.openhab.core.transform.TransformationHelper;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.core.types.StateDescription; import org.openhab.core.types.StateDescription;
import org.openhab.ui.habot.card.internal.CardRegistry; import org.openhab.ui.habot.card.internal.CardRegistry;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;
import org.osgi.framework.FrameworkUtil; import org.osgi.framework.FrameworkUtil;

6
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/card/internal/CardProvider.java
View File

@ -13,9 +13,9 @@
package org.openhab.ui.habot.card.internal; package org.openhab.ui.habot.card.internal;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.core.common.registry.DefaultAbstractManagedProvider; import org.openhab.core.common.registry.DefaultAbstractManagedProvider;
import org.eclipse.smarthome.core.common.registry.ManagedProvider; import org.openhab.core.common.registry.ManagedProvider;
import org.eclipse.smarthome.core.storage.StorageService; import org.openhab.core.storage.StorageService;
import org.openhab.ui.habot.card.Card; import org.openhab.ui.habot.card.Card;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;

6
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/card/internal/CardRegistry.java
View File

@ -21,9 +21,9 @@ import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.common.registry.AbstractRegistry; import org.openhab.core.common.registry.AbstractRegistry;
import org.eclipse.smarthome.core.common.registry.Registry; import org.openhab.core.common.registry.Registry;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.openhab.ui.habot.card.Card; import org.openhab.ui.habot.card.Card;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;

6
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/AbstractItemIntentInterpreter.java
View File

@ -16,9 +16,9 @@ import java.io.InputStream;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.openhab.ui.habot.nlp.internal.AnswerFormatter; import org.openhab.ui.habot.nlp.internal.AnswerFormatter;
import org.openhab.ui.habot.nlp.internal.NamedAttributesItemResolver; import org.openhab.ui.habot.nlp.internal.NamedAttributesItemResolver;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/IntentInterpretation.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp;
import java.util.Collection; import java.util.Collection;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.Card; import org.openhab.ui.habot.card.Card;
/** /**

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/ItemResolver.java
View File

@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.nlp.internal.IntentTrainer; import org.openhab.ui.habot.nlp.internal.IntentTrainer;
import opennlp.tools.namefind.NameSample; import opennlp.tools.namefind.NameSample;

14
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/NamedAttributesItemResolver.java
View File

@ -24,13 +24,13 @@ import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener; import org.openhab.core.common.registry.RegistryChangeListener;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.items.Metadata; import org.openhab.core.items.Metadata;
import org.eclipse.smarthome.core.items.MetadataKey; import org.openhab.core.items.MetadataKey;
import org.eclipse.smarthome.core.items.MetadataRegistry; import org.openhab.core.items.MetadataRegistry;
import org.openhab.ui.habot.nlp.ItemNamedAttribute; import org.openhab.ui.habot.nlp.ItemNamedAttribute;
import org.openhab.ui.habot.nlp.ItemNamedAttribute.AttributeSource; import org.openhab.ui.habot.nlp.ItemNamedAttribute.AttributeSource;
import org.openhab.ui.habot.nlp.ItemResolver; import org.openhab.ui.habot.nlp.ItemResolver;

12
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java
View File

@ -26,12 +26,12 @@ import java.util.stream.Stream;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener; import org.openhab.core.common.registry.RegistryChangeListener;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter; import org.openhab.core.voice.text.HumanLanguageInterpreter;
import org.eclipse.smarthome.core.voice.text.InterpretationException; import org.openhab.core.voice.text.InterpretationException;
import org.openhab.ui.habot.nlp.ChatReply; import org.openhab.ui.habot.nlp.ChatReply;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;
import org.openhab.ui.habot.nlp.IntentInterpretation; import org.openhab.ui.habot.nlp.IntentInterpretation;

24
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/SemanticsItemResolver.java
View File

@ -21,18 +21,18 @@ import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.ItemPredicates; import org.openhab.core.items.ItemPredicates;
import org.eclipse.smarthome.core.items.ItemRegistry; import org.openhab.core.items.ItemRegistry;
import org.eclipse.smarthome.core.items.Metadata; import org.openhab.core.items.Metadata;
import org.eclipse.smarthome.core.items.MetadataKey; import org.openhab.core.items.MetadataKey;
import org.eclipse.smarthome.core.items.MetadataRegistry; import org.openhab.core.items.MetadataRegistry;
import org.eclipse.smarthome.core.semantics.SemanticTags; import org.openhab.core.semantics.SemanticTags;
import org.eclipse.smarthome.core.semantics.SemanticsPredicates; import org.openhab.core.semantics.SemanticsPredicates;
import org.eclipse.smarthome.core.semantics.SemanticsService; import org.openhab.core.semantics.SemanticsService;
import org.eclipse.smarthome.core.semantics.model.Location; import org.openhab.core.semantics.model.Location;
import org.eclipse.smarthome.core.semantics.model.Property; import org.openhab.core.semantics.model.Property;
import org.eclipse.smarthome.core.semantics.model.Tag; import org.openhab.core.semantics.model.Tag;
import org.openhab.ui.habot.nlp.ItemNamedAttribute; import org.openhab.ui.habot.nlp.ItemNamedAttribute;
import org.openhab.ui.habot.nlp.ItemNamedAttribute.AttributeSource; import org.openhab.ui.habot.nlp.ItemNamedAttribute.AttributeSource;
import org.openhab.ui.habot.nlp.ItemResolver; import org.openhab.ui.habot.nlp.ItemResolver;

10
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/ActivateObjectSkill.java
View File

@ -16,11 +16,11 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

10
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/DeactivateObjectSkill.java
View File

@ -16,11 +16,11 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/GetStatusSkill.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp.internal.skill;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryDailyGraphSkill.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp.internal.skill;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryHourlyGraphSkill.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp.internal.skill;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

14
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryLastChangesSkill.java
View File

@ -18,13 +18,13 @@ import java.util.Date;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
import org.eclipse.smarthome.core.transform.TransformationException; import org.openhab.core.transform.TransformationException;
import org.eclipse.smarthome.core.transform.TransformationHelper; import org.openhab.core.transform.TransformationHelper;
import org.eclipse.smarthome.core.types.State; import org.openhab.core.types.State;
import org.eclipse.smarthome.core.types.StateDescription; import org.openhab.core.types.StateDescription;
import org.eclipse.smarthome.model.persistence.extensions.PersistenceExtensions; import org.openhab.core.model.persistence.extensions.PersistenceExtensions;
import org.openhab.ui.habot.card.Card; import org.openhab.ui.habot.card.Card;
import org.openhab.ui.habot.card.Component; import org.openhab.ui.habot.card.Component;
import org.openhab.ui.habot.card.internal.CardRegistry; import org.openhab.ui.habot.card.internal.CardRegistry;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryMonthlyGraphSkill.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp.internal.skill;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryWeeklyGraphSkill.java
View File

@ -14,7 +14,7 @@ package org.openhab.ui.habot.nlp.internal.skill;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

14
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/nlp/internal/skill/SetValueSkill.java
View File

@ -19,13 +19,13 @@ import java.util.ResourceBundle;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.smarthome.core.events.EventPublisher; import org.openhab.core.events.EventPublisher;
import org.eclipse.smarthome.core.items.GroupItem; import org.openhab.core.items.GroupItem;
import org.eclipse.smarthome.core.items.Item; import org.openhab.core.items.Item;
import org.eclipse.smarthome.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.eclipse.smarthome.core.library.types.DecimalType; import org.openhab.core.library.types.DecimalType;
import org.eclipse.smarthome.core.library.types.HSBType; import org.openhab.core.library.types.HSBType;
import org.eclipse.smarthome.core.library.types.PercentType; import org.openhab.core.library.types.PercentType;
import org.openhab.ui.habot.card.CardBuilder; import org.openhab.ui.habot.card.CardBuilder;
import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter; import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
import org.openhab.ui.habot.nlp.Intent; import org.openhab.ui.habot.nlp.Intent;

4
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/WebPushNotificationAction.java
View File

@ -16,8 +16,8 @@ import java.security.GeneralSecurityException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.eclipse.smarthome.model.script.engine.action.ActionDoc; import org.openhab.core.model.script.engine.action.ActionDoc;
import org.eclipse.smarthome.model.script.engine.action.ActionService; import org.openhab.core.model.script.engine.action.ActionService;
import org.openhab.ui.habot.notification.internal.NotificationService; import org.openhab.ui.habot.notification.internal.NotificationService;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/ModuleHandlerFactoryStarter.java
View File

@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
/** /**
* Enables the {@link WebPushNotificationModuleHandlerFactory} on activation - allows the * Enables the {@link WebPushNotificationModuleHandlerFactory} on activation - allows the
* org.eclipse.smarthome.automation dependency to remain optional. * org.openhab.core.automation dependency to remain optional.
* *
* @author Yannick Schaus - Initial contribution * @author Yannick Schaus - Initial contribution
*/ */

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/NotificationService.java
View File

@ -39,7 +39,7 @@ import org.bouncycastle.jce.interfaces.ECPrivateKey;
import org.bouncycastle.jce.interfaces.ECPublicKey; import org.bouncycastle.jce.interfaces.ECPublicKey;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
import org.eclipse.smarthome.config.core.ConfigConstants; import org.openhab.core.config.core.ConfigConstants;
import org.jose4j.lang.JoseException; import org.jose4j.lang.JoseException;
import org.openhab.ui.habot.notification.internal.webpush.Notification; import org.openhab.ui.habot.notification.internal.webpush.Notification;
import org.openhab.ui.habot.notification.internal.webpush.PushService; import org.openhab.ui.habot.notification.internal.webpush.PushService;

6
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/SubscriptionProvider.java
View File

@ -13,9 +13,9 @@
package org.openhab.ui.habot.notification.internal; package org.openhab.ui.habot.notification.internal;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.common.registry.DefaultAbstractManagedProvider; import org.openhab.core.common.registry.DefaultAbstractManagedProvider;
import org.eclipse.smarthome.core.common.registry.ManagedProvider; import org.openhab.core.common.registry.ManagedProvider;
import org.eclipse.smarthome.core.storage.StorageService; import org.openhab.core.storage.StorageService;
import org.openhab.ui.habot.notification.internal.webpush.Subscription; import org.openhab.ui.habot.notification.internal.webpush.Subscription;
import org.openhab.ui.habot.notification.internal.webpush.Subscription.Keys; import org.openhab.ui.habot.notification.internal.webpush.Subscription.Keys;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;

2
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/webpush/Subscription.java
View File

@ -13,7 +13,7 @@
package org.openhab.ui.habot.notification.internal.webpush; package org.openhab.ui.habot.notification.internal.webpush;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.common.registry.Identifiable; import org.openhab.core.common.registry.Identifiable;
import org.openhab.ui.habot.notification.internal.webpush.Subscription.Keys; import org.openhab.ui.habot.notification.internal.webpush.Subscription.Keys;
/** /**

10
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/rest/internal/HABotResource.java
View File

@ -36,11 +36,11 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.auth.Role; import org.openhab.core.auth.Role;
import org.eclipse.smarthome.core.voice.VoiceManager; import org.openhab.core.voice.VoiceManager;
import org.eclipse.smarthome.core.voice.text.InterpretationException; import org.openhab.core.voice.text.InterpretationException;
import org.eclipse.smarthome.io.rest.LocaleService; import org.openhab.core.io.rest.LocaleService;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.openhab.ui.habot.card.Card; import org.openhab.ui.habot.card.Card;
import org.openhab.ui.habot.card.internal.CardRegistry; import org.openhab.ui.habot.card.internal.CardRegistry;
import org.openhab.ui.habot.nlp.ChatReply; import org.openhab.ui.habot.nlp.ChatReply;

4
bundles/org.openhab.ui.habot/src/main/resources/tagattributes.properties
View File

@ -86,7 +86,7 @@ color=Color
colortemperature=Color temperature colortemperature=Color temperature
volume=Volume volume=Volume
# Additional categories from https://www.eclipse.org/smarthome/documentation/concepts/categories.html # Additional categories from https://openhab.org/documentation/concepts/categories.html
carbondioxyde=CO2,carbon dioxyde carbondioxyde=CO2,carbon dioxyde
soundvolume=Volume,Sound volume soundvolume=Volume,Sound volume
fire=Fire fire=Fire
@ -97,7 +97,7 @@ mediacontrol=Media,Music
colorlight=Bulb,Bulbs,Lightbulb,Lightbulbs,Light,Lights,Lighting colorlight=Bulb,Bulbs,Lightbulb,Lightbulbs,Light,Lights,Lighting
dimmablelight=Bulb,Bulbs,Lightbulb,Lightbulbs,Light,Lights,Lighting dimmablelight=Bulb,Bulbs,Lightbulb,Lightbulbs,Light,Lights,Lighting
# Additional icons acting as categories from https://www.eclipse.org/smarthome/documentation/features/ui/iconset/classic/readme.html # Additional icons acting as categories from https://openhab.org/documentation/features/ui/iconset/classic/readme.html
cinemascreen=Screen,Projector screen cinemascreen=Screen,Projector screen
cistern=Cistern cistern=Cistern
climate=Climate,Air conditioning climate=Climate,Air conditioning

4
bundles/org.openhab.ui.habot/src/main/resources/tagattributes_de.properties
View File

@ -87,7 +87,7 @@ color=Farbe
colortemperature=Farbtemperatur colortemperature=Farbtemperatur
volume=Lautstärke,Tonvolumen volume=Lautstärke,Tonvolumen
# Additional categories from https://www.eclipse.org/smarthome/documentation/concepts/categories.html # Additional categories from https://openhab.org/documentation/concepts/categories.html
carbondioxyde=CO2,Kohlendioxid carbondioxyde=CO2,Kohlendioxid
soundvolume=Lautstärke,Tonvolumen soundvolume=Lautstärke,Tonvolumen
fire=Feuer fire=Feuer
@ -98,7 +98,7 @@ mediacontrol=Heimunterhaltung,Musik
colorlight=Glühbirne,Glühbirnen,Licht,Lichter,Beleuchtung colorlight=Glühbirne,Glühbirnen,Licht,Lichter,Beleuchtung
dimmablelight=Glühbirne,Glühbirnen,Licht,Lichter,Beleuchtung dimmablelight=Glühbirne,Glühbirnen,Licht,Lichter,Beleuchtung
# Additional icons acting as categories from https://www.eclipse.org/smarthome/documentation/features/ui/iconset/classic/readme.html # Additional icons acting as categories from https://openhab.org/documentation/features/ui/iconset/classic/readme.html
cinemascreen=Bildschirm cinemascreen=Bildschirm
cistern=Wassertank cistern=Wassertank
climate=Klima climate=Klima

4
bundles/org.openhab.ui.habot/src/main/resources/tagattributes_fr.properties
View File

@ -86,7 +86,7 @@ color=couleur
colortemperature=température de couleur,température couleur colortemperature=température de couleur,température couleur
volume=volume volume=volume
# Additional categories from https://www.eclipse.org/smarthome/documentation/concepts/categories.html # Additional categories from https://openhab.org/documentation/concepts/categories.html
carbondioxyde=CO2,carbon dioxyde carbondioxyde=CO2,carbon dioxyde
soundvolume=volume,volume sonore soundvolume=volume,volume sonore
fire=incendie fire=incendie
@ -97,7 +97,7 @@ mediacontrol=m
colorlight=ampoule,ampoules,lumière,lumières,lampe,lampes colorlight=ampoule,ampoules,lumière,lumières,lampe,lampes
dimmablelight=ampoule,ampoules,lumière,lumières,lampe,lampes dimmablelight=ampoule,ampoules,lumière,lumières,lampe,lampes
# Additional icons acting as categories from https://www.eclipse.org/smarthome/documentation/features/ui/iconset/classic/readme.html # Additional icons acting as categories from https://openhab.org/documentation/features/ui/iconset/classic/readme.html
cinemascreen=écran cinemascreen=écran
cistern=réservoir cistern=réservoir
climate=air conditionné,thermostat climate=air conditionné,thermostat

4
bundles/org.openhab.ui.habot/src/main/resources/tagattributes_it.properties
View File

@ -86,7 +86,7 @@ color=Colore
colortemperature=Temperature di colore colortemperature=Temperature di colore
volume=Volume volume=Volume
# Additional categories from https://www.eclipse.org/smarthome/documentation/concepts/categories.html # Additional categories from https://openhab.org/documentation/concepts/categories.html
carbondioxyde=CO2,Anidride carbonica carbondioxyde=CO2,Anidride carbonica
soundvolume=Volume,Volume della musica soundvolume=Volume,Volume della musica
fire=Fuoco fire=Fuoco
@ -97,7 +97,7 @@ mediacontrol=Multimedia,Musica
colorlight=Luce,Luci,Lampadina,Lampadine,Illuminazione colorlight=Luce,Luci,Lampadina,Lampadine,Illuminazione
dimmablelight=Luce,Luci,Lampadina,Lampadine,Illuminazione dimmablelight=Luce,Luci,Lampadina,Lampadine,Illuminazione
# Additional icons acting as categories from https://www.eclipse.org/smarthome/documentation/features/ui/iconset/classic/readme.html # Additional icons acting as categories from https://openhab.org/documentation/features/ui/iconset/classic/readme.html
cinemascreen=Schermo cinemascreen=Schermo
cistern=Cisterna cistern=Cisterna
climate=Climatizzazione,Aria condizionata climate=Climatizzazione,Aria condizionata

4
bundles/org.openhab.ui.habot/src/main/resources/tagattributes_nl.properties
View File

@ -86,7 +86,7 @@ color=Kleur
colortemperature=Kleurtemperatuur colortemperature=Kleurtemperatuur
volume=Volume volume=Volume
# Additional categories from https://www.eclipse.org/smarthome/documentation/concepts/categories.html # Additional categories from https://openhab.org/documentation/concepts/categories.html
carbondioxyde=CO2,koolstofdioxyde carbondioxyde=CO2,koolstofdioxyde
soundvolume=Volume,Geluidsvolume soundvolume=Volume,Geluidsvolume
fire=Brand fire=Brand
@ -97,7 +97,7 @@ mediacontrol=Media,Muziek
colorlight=Lamp,Gloeilamp,licht,verlichting colorlight=Lamp,Gloeilamp,licht,verlichting
dimmablelight=Lamp,Gloeilamp,licht,verlichting dimmablelight=Lamp,Gloeilamp,licht,verlichting
# Additional icons acting as categories from https://www.eclipse.org/smarthome/documentation/features/ui/iconset/classic/readme.html # Additional icons acting as categories from https://openhab.org/documentation/features/ui/iconset/classic/readme.html
cinemascreen=Scherm,Projectiescherm cinemascreen=Scherm,Projectiescherm
cistern=Stortbak cistern=Stortbak
climate=klimaat,airconditioning climate=klimaat,airconditioning

2
bundles/org.openhab.ui.habot/web/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "habot", "name": "habot",
"version": "1.0.0", "version": "3.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

4
bundles/org.openhab.ui.habot/web/package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "habot", "name": "habot",
"version": "1.0.0", "version": "3.0.0",
"description": "A chatbot for openHAB", "description": "A chatbot for openHAB",
"productName": "HABot", "productName": "HABot",
"cordovaId": "org.openhab.ui.habot", "cordovaId": "org.openhab.ui.habot",
"author": "Yannick Schaus <habpanel@schaus.net>", "author": "openHAB Community",
"private": true, "private": true,
"scripts": { "scripts": {
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",

2
bundles/org.openhab.ui.habpanel/NOTICE
View File

@ -1,6 +1,6 @@
This content is produced and maintained by the Eclipse SmartHome project. This content is produced and maintained by the Eclipse SmartHome project.
* Project home: https://eclipse.org/smarthome/ * Project home: https://openhab.org/
== Declared Project Licenses == Declared Project Licenses

8
bundles/org.openhab.ui.habpanel/src/main/java/org/openhab/ui/habpanel/internal/rest/HABPanelResource.java
View File

@ -23,10 +23,10 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.eclipse.smarthome.core.auth.Role; import org.openhab.core.auth.Role;
import org.eclipse.smarthome.io.rest.JSONResponse; import org.openhab.core.io.rest.JSONResponse;
import org.eclipse.smarthome.io.rest.RESTResource; import org.openhab.core.io.rest.RESTResource;
import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; import org.openhab.core.io.rest.Stream2JSONInputStream;
import org.openhab.ui.habpanel.internal.gallery.GalleryItem; import org.openhab.ui.habpanel.internal.gallery.GalleryItem;
import org.openhab.ui.habpanel.internal.gallery.GalleryProviderFactory; import org.openhab.ui.habpanel.internal.gallery.GalleryProviderFactory;
import org.openhab.ui.habpanel.internal.gallery.GalleryWidgetProvider; import org.openhab.ui.habpanel.internal.gallery.GalleryWidgetProvider;

2
bundles/org.openhab.ui.habpanel/src/main/resources/OSGI-INF/habpanelresource.xml
View File

@ -16,6 +16,6 @@
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.habpanel.rest"> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.habpanel.rest">
<implementation class="org.openhab.ui.habpanel.internal.rest.HABPanelResource"/> <implementation class="org.openhab.ui.habpanel.internal.rest.HABPanelResource"/>
<service> <service>
<provide interface="org.eclipse.smarthome.io.rest.RESTResource"/> <provide interface="org.openhab.core.io.rest.RESTResource"/>
</service> </service>
</scr:component> </scr:component>

2
bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js
View File

@ -94,7 +94,7 @@
if (locale) { if (locale) {
deferred.resolve(locale); deferred.resolve(locale);
} else { } else {
$http.get('/rest/services/org.eclipse.smarthome.i18n/config') $http.get('/rest/services/org.openhab.core.i18n/config')
.then(function (response) { .then(function (response) {
var language; var language;
if (!response.data.language) { if (!response.data.language) {

8
bundles/org.openhab.ui.habpanel/web/package.json
View File

@ -1,9 +1,9 @@
{ {
"name": "habpanel", "name": "habpanel",
"version": "1.0.0", "version": "3.0.0",
"author": "Yannick Schaus", "author": "openHAB Community",
"description": "Dashboard user interface for openHAB", "description": "Dashboard user interface for openHAB",
"license": "EPL-1.0", "license": "EPL-2.0",
"contributors": [ "contributors": [
{ {
"name": "Yannick Schaus", "name": "Yannick Schaus",
@ -16,7 +16,7 @@
], ],
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/openhab/org.openhab.ui.habpanel" "url": "https://github.com/openhab/openhab-webui"
}, },
"keywords": [ "keywords": [
"dashboard", "dashboard",

5
bundles/org.openhab.ui.homebuilder/web/package.json
View File

@ -1,10 +1,7 @@
{ {
"name": "homebuilder", "name": "homebuilder",
"description": "openHAB HomeBuilder - boilerplate for the Items, sitemap and more", "description": "openHAB HomeBuilder - boilerplate for the Items, sitemap and more",
"version": "1.0.0", "version": "3.0.0",
"authors": [
"Kuba Wolanin <hi@kubawolanin.com> (github: kubawolanin)"
],
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot", "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",

2
bundles/org.openhab.ui.homebuilder/web/src/AppForm.vue
View File

@ -121,7 +121,7 @@
getLocale: function () { getLocale: function () {
const DEFAULT_LOCALE = 'en-UK'; const DEFAULT_LOCALE = 'en-UK';
this.$http this.$http
.get('services/org.eclipse.smarthome.i18n/config') .get('services/org.openhab.core.i18n/config')
.then(response => { .then(response => {
const body = response.body; const body = response.body;
let selectedLang = DEFAULT_LOCALE; let selectedLang = DEFAULT_LOCALE;

10
bundles/org.openhab.ui.iconset.classic/src/main/java/org/openhab/ui/iconset/classic/internal/ClassicIconProvider.java
View File

@ -20,11 +20,11 @@ import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import org.eclipse.smarthome.core.i18n.TranslationProvider; import org.openhab.core.i18n.TranslationProvider;
import org.eclipse.smarthome.ui.icon.AbstractResourceIconProvider; import org.openhab.core.ui.icon.AbstractResourceIconProvider;
import org.eclipse.smarthome.ui.icon.IconProvider; import org.openhab.core.ui.icon.IconProvider;
import org.eclipse.smarthome.ui.icon.IconSet; import org.openhab.core.ui.icon.IconSet;
import org.eclipse.smarthome.ui.icon.IconSet.Format; import org.openhab.core.ui.icon.IconSet.Format;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger; import org.slf4j.Logger;

2
features/src/main/feature/feature.xml
View File

@ -25,7 +25,7 @@
<feature>openhab-core-io-rest-sitemap</feature> <feature>openhab-core-io-rest-sitemap</feature>
<feature>openhab-ui-dashboard</feature> <feature>openhab-ui-dashboard</feature>
<bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.basic/${project.version}</bundle> <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.basic/${project.version}</bundle>
<config name="org.eclipse.smarthome.basicui"> <config name="org.openhab.basicui">
iconType = svg iconType = svg
</config> </config>
</feature> </feature>

1
pom.xml
View File

@ -84,7 +84,6 @@ Import-Package: \\
javax.annotation.security.*;resolution:=optional,\\ javax.annotation.security.*;resolution:=optional,\\
org.eclipse.jdt.annotation.*;resolution:=optional,\\ org.eclipse.jdt.annotation.*;resolution:=optional,\\
org.openhab.core.automation.annotation.*;resolution:=optional;version=!,\\ org.openhab.core.automation.annotation.*;resolution:=optional;version=!,\\
org.eclipse.smarthome.*;version=!,\\
org.openhab.*;version=!,\\ org.openhab.*;version=!,\\
com.google.common.*;version="14.0",\\ com.google.common.*;version="14.0",\\
* *