Skip to content
This repository has been archived by the owner on May 23, 2019. It is now read-only.

Commit

Permalink
fix(Designer): Fix item registry SCR connection
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
  • Loading branch information
cdjackson committed May 27, 2016
1 parent b1a8477 commit 7d70290
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
15 changes: 7 additions & 8 deletions openhab2/org.openhab.ui.habmin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Manifest-Version: 1.0
Private-Package: org.openhab.ui.habmin.internal
Ignore-Package: org.openhab.ui.habmin.internal
Bundle-Name: HABmin User Interface
Bundle-Vendor: openHAB.org
Bundle-Version: 2.0.0.qualifier
Bundle-ManifestVersion: 2
Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Bundle-Name: HABmin User Interface
Bundle-SymbolicName: org.openhab.ui.habmin
Bundle-Version: 0.8.0.qualifier
Bundle-Vendor: cd-jackson.com
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.servlet,
javax.servlet.http,
javax.ws.rs,
Expand All @@ -27,8 +26,8 @@ Import-Package: javax.servlet,
org.osgi.service.component,
org.osgi.service.http,
org.slf4j
Bundle-SymbolicName: org.openhab.ui.habmin;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.openhab.ui.habmin.internal.services.designer
Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Service-Component: OSGI-INF/*
Bundle-ClassPath: ., lib/xstream-1.4.6.jar, lib/commons-codec-1.10.jar

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.eclipse.smarthome.config.core.ConfigConstants;
import org.eclipse.smarthome.core.items.ItemRegistry;
import org.eclipse.smarthome.io.rest.RESTResource;
import org.eclipse.smarthome.ui.items.ItemUIRegistry;
import org.openhab.ui.habmin.HABminConstants;
import org.openhab.ui.habmin.internal.services.designer.blocks.DesignerRuleCreator;
import org.slf4j.Logger;
Expand All @@ -56,18 +55,18 @@ public class DesignerResource implements RESTResource {
@Context
UriInfo uriInfo;

static private ItemUIRegistry itemUIRegistry;
static private ItemRegistry itemRegistry;

public void setItemRegistry(ItemUIRegistry itemUIRegistry) {
DesignerResource.itemUIRegistry = itemUIRegistry;
public void setItemRegistry(ItemRegistry itemRegistry) {
DesignerResource.itemRegistry = itemRegistry;
}

public void unsetItemRegistry(ItemRegistry itemUIRegistry) {
DesignerResource.itemUIRegistry = null;
public void unsetItemRegistry(ItemRegistry itemRegistry) {
DesignerResource.itemRegistry = null;
}

static public ItemUIRegistry getItemRegistry() {
return itemUIRegistry;
static public ItemRegistry getItemRegistry() {
return itemRegistry;
}

@GET
Expand Down
Binary file modified output/org.openhab.ui.habmin_2.0.0.SNAPSHOT-0.1.6.jar
Binary file not shown.

0 comments on commit 7d70290

Please sign in to comment.