Skip to content

Commit 0a8ca96

Browse files
kaikreuzerkaikreuzer
authored
refactored namespace to org.openhab (openhab#157)
Signed-off-by: Kai Kreuzer <[email protected]>
1 parent 368c4fc commit 0a8ca96

File tree

83 files changed

+372
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+372
-376
lines changed

‎bundles/org.openhab.ui.basic/NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This content is produced and maintained by the Eclipse SmartHome project.
22

3-
* Project home: https://eclipse.org/smarthome/
3+
* Project home: https://openhab.org/
44

55
== Declared Project Licenses
66

‎bundles/org.openhab.ui.basic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "org.openhab.ui.basic",
3-
"version": "2.5.0",
3+
"version": "3.0.0",
44
"description": "Basic UI",
55
"scripts": {
66
"build": "gulp default"

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/AbstractWidgetRenderer.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import org.apache.commons.io.IOUtils;
2525
import org.apache.commons.lang.StringEscapeUtils;
2626
import org.apache.commons.lang.StringUtils;
27-
import org.eclipse.smarthome.core.i18n.I18nUtil;
28-
import org.eclipse.smarthome.core.i18n.LocaleProvider;
29-
import org.eclipse.smarthome.core.i18n.TranslationProvider;
30-
import org.eclipse.smarthome.core.library.types.QuantityType;
31-
import org.eclipse.smarthome.core.types.State;
32-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
33-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
27+
import org.openhab.core.i18n.I18nUtil;
28+
import org.openhab.core.i18n.LocaleProvider;
29+
import org.openhab.core.i18n.TranslationProvider;
30+
import org.openhab.core.library.types.QuantityType;
31+
import org.openhab.core.types.State;
32+
import org.openhab.core.model.sitemap.sitemap.Widget;
33+
import org.openhab.core.ui.items.ItemUIRegistry;
3434
import org.openhab.ui.basic.internal.WebAppActivator;
3535
import org.openhab.ui.basic.internal.WebAppConfig;
3636
import org.openhab.ui.basic.render.RenderException;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ChartRenderer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
import org.apache.commons.lang.StringUtils;
1818
import org.eclipse.emf.common.util.EList;
19-
import org.eclipse.smarthome.core.items.GroupItem;
20-
import org.eclipse.smarthome.core.items.Item;
21-
import org.eclipse.smarthome.core.items.ItemNotFoundException;
22-
import org.eclipse.smarthome.model.sitemap.sitemap.Chart;
23-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
24-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
19+
import org.openhab.core.items.GroupItem;
20+
import org.openhab.core.items.Item;
21+
import org.openhab.core.items.ItemNotFoundException;
22+
import org.openhab.core.model.sitemap.sitemap.Chart;
23+
import org.openhab.core.model.sitemap.sitemap.Widget;
24+
import org.openhab.core.ui.items.ItemUIRegistry;
2525
import org.openhab.ui.basic.internal.WebAppConfig;
2626
import org.openhab.ui.basic.render.RenderException;
2727
import org.openhab.ui.basic.render.WidgetRenderer;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ColorpickerRenderer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.core.library.types.HSBType;
18-
import org.eclipse.smarthome.core.types.State;
19-
import org.eclipse.smarthome.model.sitemap.sitemap.Colorpicker;
20-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
21-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.library.types.HSBType;
18+
import org.openhab.core.types.State;
19+
import org.openhab.core.model.sitemap.sitemap.Colorpicker;
20+
import org.openhab.core.model.sitemap.sitemap.Widget;
21+
import org.openhab.core.ui.items.ItemUIRegistry;
2222
import org.openhab.ui.basic.internal.servlet.WebAppServlet;
2323
import org.openhab.ui.basic.render.RenderException;
2424
import org.openhab.ui.basic.render.WidgetRenderer;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/FrameRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import org.apache.commons.lang.StringEscapeUtils;
1919
import org.apache.commons.lang.StringUtils;
2020
import org.eclipse.emf.common.util.EList;
21-
import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
22-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
23-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
21+
import org.openhab.core.model.sitemap.sitemap.Frame;
22+
import org.openhab.core.model.sitemap.sitemap.Widget;
23+
import org.openhab.core.ui.items.ItemUIRegistry;
2424
import org.openhab.ui.basic.render.RenderException;
2525
import org.openhab.ui.basic.render.WidgetRenderer;
2626
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/GroupRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.model.sitemap.sitemap.Group;
18-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
19-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.model.sitemap.sitemap.Group;
18+
import org.openhab.core.model.sitemap.sitemap.Widget;
19+
import org.openhab.core.ui.items.ItemUIRegistry;
2020
import org.openhab.ui.basic.render.RenderException;
2121
import org.openhab.ui.basic.render.WidgetRenderer;
2222
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ImageRenderer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
import org.apache.commons.lang.StringUtils;
1818
import org.eclipse.emf.common.util.EList;
19-
import org.eclipse.smarthome.core.library.types.RawType;
20-
import org.eclipse.smarthome.core.library.types.StringType;
21-
import org.eclipse.smarthome.core.types.State;
22-
import org.eclipse.smarthome.model.sitemap.sitemap.Image;
23-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
24-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
19+
import org.openhab.core.library.types.RawType;
20+
import org.openhab.core.library.types.StringType;
21+
import org.openhab.core.types.State;
22+
import org.openhab.core.model.sitemap.sitemap.Image;
23+
import org.openhab.core.model.sitemap.sitemap.Widget;
24+
import org.openhab.core.ui.items.ItemUIRegistry;
2525
import org.openhab.ui.basic.render.RenderException;
2626
import org.openhab.ui.basic.render.WidgetRenderer;
2727
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/ListRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.model.sitemap.sitemap.List;
18-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
19-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.model.sitemap.sitemap.List;
18+
import org.openhab.core.model.sitemap.sitemap.Widget;
19+
import org.openhab.core.ui.items.ItemUIRegistry;
2020
import org.openhab.ui.basic.render.RenderException;
2121
import org.openhab.ui.basic.render.WidgetRenderer;
2222
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/MapviewRenderer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.core.library.types.PointType;
18-
import org.eclipse.smarthome.core.types.State;
19-
import org.eclipse.smarthome.model.sitemap.sitemap.Mapview;
20-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
21-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.library.types.PointType;
18+
import org.openhab.core.types.State;
19+
import org.openhab.core.model.sitemap.sitemap.Mapview;
20+
import org.openhab.core.model.sitemap.sitemap.Widget;
21+
import org.openhab.core.ui.items.ItemUIRegistry;
2222
import org.openhab.ui.basic.render.RenderException;
2323
import org.openhab.ui.basic.render.WidgetRenderer;
2424
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/PageRenderer.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
import org.apache.commons.lang.StringUtils;
2121
import org.eclipse.emf.common.util.EList;
2222
import org.eclipse.emf.ecore.EObject;
23-
import org.eclipse.smarthome.core.i18n.LocaleProvider;
24-
import org.eclipse.smarthome.core.i18n.TranslationProvider;
25-
import org.eclipse.smarthome.model.sitemap.SitemapProvider;
26-
import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
27-
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
28-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
29-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
23+
import org.openhab.core.i18n.LocaleProvider;
24+
import org.openhab.core.i18n.TranslationProvider;
25+
import org.openhab.core.model.sitemap.SitemapProvider;
26+
import org.openhab.core.model.sitemap.sitemap.Frame;
27+
import org.openhab.core.model.sitemap.sitemap.Sitemap;
28+
import org.openhab.core.model.sitemap.sitemap.Widget;
29+
import org.openhab.core.ui.items.ItemUIRegistry;
3030
import org.openhab.ui.basic.internal.WebAppConfig;
3131
import org.openhab.ui.basic.internal.servlet.WebAppServlet;
3232
import org.openhab.ui.basic.render.RenderException;
@@ -136,7 +136,7 @@ private void processChildren(StringBuilder sb_pre, StringBuilder sb_post, EList<
136136
EObject firstChild = children.get(0);
137137
EObject parent = itemUIRegistry.getParent((Widget) firstChild);
138138
if (!(firstChild instanceof Frame || parent instanceof Frame || parent instanceof Sitemap
139-
|| parent instanceof org.eclipse.smarthome.model.sitemap.sitemap.List)) {
139+
|| parent instanceof org.openhab.core.model.sitemap.sitemap.List)) {
140140
String frameSnippet = getSnippet("frame");
141141
frameSnippet = StringUtils.replace(frameSnippet, "%widget_id%", "");
142142
frameSnippet = StringUtils.replace(frameSnippet, "%label%", "");

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SelectionRenderer.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
import org.apache.commons.lang.StringEscapeUtils;
1616
import org.apache.commons.lang.StringUtils;
1717
import org.eclipse.emf.common.util.EList;
18-
import org.eclipse.smarthome.core.items.Item;
19-
import org.eclipse.smarthome.core.items.ItemNotFoundException;
20-
import org.eclipse.smarthome.core.library.items.NumberItem;
21-
import org.eclipse.smarthome.core.library.types.QuantityType;
22-
import org.eclipse.smarthome.core.types.State;
23-
import org.eclipse.smarthome.core.types.StateDescription;
24-
import org.eclipse.smarthome.core.types.StateOption;
25-
import org.eclipse.smarthome.core.types.util.UnitUtils;
26-
import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
27-
import org.eclipse.smarthome.model.sitemap.sitemap.Selection;
28-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
29-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
18+
import org.openhab.core.items.Item;
19+
import org.openhab.core.items.ItemNotFoundException;
20+
import org.openhab.core.library.items.NumberItem;
21+
import org.openhab.core.library.types.QuantityType;
22+
import org.openhab.core.types.State;
23+
import org.openhab.core.types.StateDescription;
24+
import org.openhab.core.types.StateOption;
25+
import org.openhab.core.types.util.UnitUtils;
26+
import org.openhab.core.model.sitemap.sitemap.Mapping;
27+
import org.openhab.core.model.sitemap.sitemap.Selection;
28+
import org.openhab.core.model.sitemap.sitemap.Widget;
29+
import org.openhab.core.ui.items.ItemUIRegistry;
3030
import org.openhab.ui.basic.render.RenderException;
3131
import org.openhab.ui.basic.render.WidgetRenderer;
3232
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SetpointRenderer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import org.apache.commons.lang.StringUtils;
1818
import org.eclipse.emf.common.util.EList;
19-
import org.eclipse.smarthome.core.library.types.DecimalType;
20-
import org.eclipse.smarthome.core.types.State;
21-
import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint;
22-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
23-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
19+
import org.openhab.core.library.types.DecimalType;
20+
import org.openhab.core.types.State;
21+
import org.openhab.core.model.sitemap.sitemap.Setpoint;
22+
import org.openhab.core.model.sitemap.sitemap.Widget;
23+
import org.openhab.core.ui.items.ItemUIRegistry;
2424
import org.openhab.ui.basic.render.RenderException;
2525
import org.openhab.ui.basic.render.WidgetRenderer;
2626
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SliderRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
18-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
19-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.model.sitemap.sitemap.Slider;
18+
import org.openhab.core.model.sitemap.sitemap.Widget;
19+
import org.openhab.core.ui.items.ItemUIRegistry;
2020
import org.openhab.ui.basic.render.RenderException;
2121
import org.openhab.ui.basic.render.WidgetRenderer;
2222
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SwitchRenderer.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.core.items.GroupItem;
18-
import org.eclipse.smarthome.core.items.Item;
19-
import org.eclipse.smarthome.core.items.ItemNotFoundException;
20-
import org.eclipse.smarthome.core.library.items.NumberItem;
21-
import org.eclipse.smarthome.core.library.items.RollershutterItem;
22-
import org.eclipse.smarthome.core.library.items.SwitchItem;
23-
import org.eclipse.smarthome.core.library.types.OnOffType;
24-
import org.eclipse.smarthome.core.library.types.QuantityType;
25-
import org.eclipse.smarthome.core.types.State;
26-
import org.eclipse.smarthome.core.types.StateDescription;
27-
import org.eclipse.smarthome.core.types.StateOption;
28-
import org.eclipse.smarthome.core.types.util.UnitUtils;
29-
import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
30-
import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
31-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
32-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.items.GroupItem;
18+
import org.openhab.core.items.Item;
19+
import org.openhab.core.items.ItemNotFoundException;
20+
import org.openhab.core.library.items.NumberItem;
21+
import org.openhab.core.library.items.RollershutterItem;
22+
import org.openhab.core.library.items.SwitchItem;
23+
import org.openhab.core.library.types.OnOffType;
24+
import org.openhab.core.library.types.QuantityType;
25+
import org.openhab.core.types.State;
26+
import org.openhab.core.types.StateDescription;
27+
import org.openhab.core.types.StateOption;
28+
import org.openhab.core.types.util.UnitUtils;
29+
import org.openhab.core.model.sitemap.sitemap.Mapping;
30+
import org.openhab.core.model.sitemap.sitemap.Switch;
31+
import org.openhab.core.model.sitemap.sitemap.Widget;
32+
import org.openhab.core.ui.items.ItemUIRegistry;
3333
import org.openhab.ui.basic.render.RenderException;
3434
import org.openhab.ui.basic.render.WidgetRenderer;
3535
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/TextRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.model.sitemap.sitemap.Text;
18-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
19-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.model.sitemap.sitemap.Text;
18+
import org.openhab.core.model.sitemap.sitemap.Widget;
19+
import org.openhab.core.ui.items.ItemUIRegistry;
2020
import org.openhab.ui.basic.render.RenderException;
2121
import org.openhab.ui.basic.render.WidgetRenderer;
2222
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/VideoRenderer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import org.apache.commons.lang.StringUtils;
1818
import org.eclipse.emf.common.util.EList;
19-
import org.eclipse.smarthome.core.library.types.StringType;
20-
import org.eclipse.smarthome.core.types.State;
21-
import org.eclipse.smarthome.model.sitemap.sitemap.Video;
22-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
23-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
19+
import org.openhab.core.library.types.StringType;
20+
import org.openhab.core.types.State;
21+
import org.openhab.core.model.sitemap.sitemap.Video;
22+
import org.openhab.core.model.sitemap.sitemap.Widget;
23+
import org.openhab.core.ui.items.ItemUIRegistry;
2424
import org.openhab.ui.basic.render.RenderException;
2525
import org.openhab.ui.basic.render.WidgetRenderer;
2626
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/WebviewRenderer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.apache.commons.lang.StringUtils;
1616
import org.eclipse.emf.common.util.EList;
17-
import org.eclipse.smarthome.model.sitemap.sitemap.Webview;
18-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
19-
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
17+
import org.openhab.core.model.sitemap.sitemap.Webview;
18+
import org.openhab.core.model.sitemap.sitemap.Widget;
19+
import org.openhab.core.ui.items.ItemUIRegistry;
2020
import org.openhab.ui.basic.render.RenderException;
2121
import org.openhab.ui.basic.render.WidgetRenderer;
2222
import org.osgi.framework.BundleContext;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/BaseServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
package org.openhab.ui.basic.internal.servlet;
1414

15-
import org.eclipse.smarthome.core.items.ItemRegistry;
16-
import org.eclipse.smarthome.io.http.servlet.SmartHomeBundleServlet;
15+
import org.openhab.core.items.ItemRegistry;
16+
import org.openhab.core.io.http.servlet.SmartHomeBundleServlet;
1717

1818
/**
1919
* This is the base servlet class for other servlet in the Basic UI.

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/CmdServlet.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
import javax.servlet.http.HttpServletRequest;
1919
import javax.servlet.http.HttpServletResponse;
2020

21-
import org.eclipse.smarthome.core.events.EventPublisher;
22-
import org.eclipse.smarthome.core.items.GroupItem;
23-
import org.eclipse.smarthome.core.items.Item;
24-
import org.eclipse.smarthome.core.items.ItemNotFoundException;
25-
import org.eclipse.smarthome.core.items.ItemRegistry;
26-
import org.eclipse.smarthome.core.items.events.ItemEventFactory;
27-
import org.eclipse.smarthome.core.library.items.SwitchItem;
28-
import org.eclipse.smarthome.core.library.types.OnOffType;
29-
import org.eclipse.smarthome.core.types.Command;
30-
import org.eclipse.smarthome.core.types.TypeParser;
31-
import org.eclipse.smarthome.io.http.HttpContextFactoryService;
21+
import org.openhab.core.events.EventPublisher;
22+
import org.openhab.core.items.GroupItem;
23+
import org.openhab.core.items.Item;
24+
import org.openhab.core.items.ItemNotFoundException;
25+
import org.openhab.core.items.ItemRegistry;
26+
import org.openhab.core.items.events.ItemEventFactory;
27+
import org.openhab.core.library.items.SwitchItem;
28+
import org.openhab.core.library.types.OnOffType;
29+
import org.openhab.core.types.Command;
30+
import org.openhab.core.types.TypeParser;
31+
import org.openhab.core.io.http.HttpContextFactoryService;
3232
import org.osgi.framework.BundleContext;
3333
import org.osgi.service.component.annotations.Activate;
3434
import org.osgi.service.component.annotations.Component;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/servlet/WebAppServlet.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import javax.servlet.http.HttpServletResponse;
2626

2727
import org.eclipse.emf.common.util.EList;
28-
import org.eclipse.smarthome.config.core.ConfigurableService;
29-
import org.eclipse.smarthome.core.items.ItemRegistry;
30-
import org.eclipse.smarthome.io.http.HttpContextFactoryService;
31-
import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService;
32-
import org.eclipse.smarthome.model.sitemap.SitemapProvider;
33-
import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
34-
import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
35-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
28+
import org.openhab.core.config.core.ConfigurableService;
29+
import org.openhab.core.items.ItemRegistry;
30+
import org.openhab.core.io.http.HttpContextFactoryService;
31+
import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService;
32+
import org.openhab.core.model.sitemap.SitemapProvider;
33+
import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
34+
import org.openhab.core.model.sitemap.sitemap.Sitemap;
35+
import org.openhab.core.model.sitemap.sitemap.Widget;
3636
import org.openhab.ui.basic.internal.WebAppConfig;
3737
import org.openhab.ui.basic.internal.render.PageRenderer;
3838
import org.openhab.ui.basic.render.RenderException;

‎bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/render/WidgetRenderer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package org.openhab.ui.basic.render;
1414

1515
import org.eclipse.emf.common.util.EList;
16-
import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
16+
import org.openhab.core.model.sitemap.sitemap.Widget;
1717
import org.openhab.ui.basic.internal.WebAppConfig;
1818

1919
/**

0 commit comments

Comments
 (0)