Merge pull request #642 from kaikreuzer/thinghandler

Required adaptions to make code compatible with API changes in BaseTh…
openhab · Jan 31, 2016 · 7de312f · 7de312f
2 parents 0dc5ec5 + 9a736c7
commit 7de312f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/addons/binding/org.openhab.binding.astro/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.astro/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Import-Package: com.google.common.collect,
  org.eclipse.smarthome.core.thing,
  org.eclipse.smarthome.core.thing.binding,
  org.eclipse.smarthome.core.thing.link,
+ org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
  org.osgi.framework,
  org.osgi.service.component,

diff --git a/...nhab.binding.astro/src/main/java/org/openhab/binding/astro/handler/AstroThingHandler.java b/...nhab.binding.astro/src/main/java/org/openhab/binding/astro/handler/AstroThingHandler.java
@@ -141,7 +141,7 @@ protected void publishPlanet() {
      * Publishes the channel with data if it's linked.
      */
     private void publishChannelIfLinked(Channel channel) {
-        if (channel.isLinked()) {
+        if (isLinked(channel.getUID().getId())) {
             try {
                 updateState(channel.getUID(), PropertyUtils.getState(channel.getUID(), getPlanet()));
             } catch (Exception ex) {

diff --git a/...binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxDevicesHandler.java b/...binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxDevicesHandler.java
@@ -120,18 +120,6 @@ public void initialize() {
      */
     @Override
     public void dispose() {
-        logger.debug("Disposed MAX! device {} {}.", getThing().getUID(), maxDeviceSerial);
-        super.dispose();
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.smarthome.core.thing.binding.BaseThingHandler#preDispose()
-     */
-    @Override
-    public void preDispose() {
         logger.debug("Disposing MAX! device {} {}.", getThing().getUID(), maxDeviceSerial);
         if (refreshingActuals)
             refreshActualsRestore();
@@ -145,7 +133,8 @@ public void preDispose() {
             bridgeHandler.unregisterDeviceStatusListener(this);
             bridgeHandler = null;
         }
-        super.preDispose();
+        logger.debug("Disposed MAX! device {} {}.", getThing().getUID(), maxDeviceSerial);
+        super.dispose();
     }
 
     /*
@@ -424,7 +413,7 @@ private void setDeviceConfiguration(Device device) {
      * org.eclipse.smarthome.core.thing.Bridge)
      */
     @Override
-    protected void bridgeHandlerInitialized(ThingHandler thingHandler, Bridge bridge) {
+    public void bridgeHandlerInitialized(ThingHandler thingHandler, Bridge bridge) {
         logger.debug("Bridge {} initialized for device: {}", bridge.getUID().toString(),
                 getThing().getUID().toString());
         if (bridgeHandler != null) {
@@ -446,7 +435,7 @@ protected void bridgeHandlerInitialized(ThingHandler thingHandler, Bridge bridge
      * org.eclipse.smarthome.core.thing.Bridge)
      */
     @Override
-    protected void bridgeHandlerDisposed(ThingHandler thingHandler, Bridge bridge) {
+    public void bridgeHandlerDisposed(ThingHandler thingHandler, Bridge bridge) {
         logger.debug("Bridge {} disposed for device: {}", bridge.getUID().toString(), getThing().getUID().toString());
         bridgeHandler = null;
         forceRefresh = true;

diff --git a/...penhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/handler/RFXComHandler.java b/...penhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/handler/RFXComHandler.java
@@ -112,7 +112,7 @@ public void initialize() {
 	}
 
 	@Override
-	protected void bridgeHandlerInitialized(ThingHandler thingHandler,
+	public void bridgeHandlerInitialized(ThingHandler thingHandler,
 			Bridge bridge) {
 
 		logger.debug("Bridge initialized");
@@ -133,7 +133,7 @@ protected void bridgeHandlerInitialized(ThingHandler thingHandler,
 	}
 
 	@Override
-	protected void bridgeHandlerDisposed(ThingHandler thingHandler,
+	public void bridgeHandlerDisposed(ThingHandler thingHandler,
 			Bridge bridge) {
 		logger.debug("Bridge disposed");
 		if (bridgeHandler != null) {

diff --git a/...eezebox/src/main/java/org/openhab/binding/squeezebox/handler/SqueezeBoxPlayerHandler.java b/...eezebox/src/main/java/org/openhab/binding/squeezebox/handler/SqueezeBoxPlayerHandler.java
@@ -114,15 +114,15 @@ public void initialize() {
 	};
 
 	@Override
-	protected void bridgeHandlerInitialized(ThingHandler thingHandler, Bridge bridge){
+	public void bridgeHandlerInitialized(ThingHandler thingHandler, Bridge bridge){
 		if (thingHandler instanceof SqueezeBoxServerHandler) {
 			this.squeezeBoxServerHandler = (SqueezeBoxServerHandler)thingHandler;
 			updateStatus(squeezeBoxServerHandler.getThing().getStatus());
 		}
 	}
 
 	@Override
-	protected void bridgeHandlerDisposed(ThingHandler thingHandler, Bridge bridge) {
+	public void bridgeHandlerDisposed(ThingHandler thingHandler, Bridge bridge) {
 		this.squeezeBoxServerHandler = null;
 		updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.BRIDGE_OFFLINE);
 	}