more little fixes for production, not getting callbacks when items ar…

…e initially loaded
silky · Sep 12, 2014 · 9084126 · 9084126
1 parent 838fc46
commit 9084126
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/bundles/binding/org.openhab.binding.alarmdecoder/.classpath b/bundles/binding/org.openhab.binding.alarmdecoder/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/org.openhab.io.transport.serial/lib/nrjavaserial-3.8.8.jar"/>

diff --git a/bundles/binding/org.openhab.binding.alarmdecoder/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.alarmdecoder/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: This is the alarmdecoder backend for openHAB
 Import-Package: gnu.io,
+ org.openhab.core.autoupdate,
  org.openhab.core.binding,
  org.openhab.core.events,
  org.openhab.core.items,

diff --git a/bundles/binding/org.openhab.binding.alarmdecoder/build.properties b/bundles/binding/org.openhab.binding.alarmdecoder/build.properties
@@ -2,5 +2,4 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/
-source.. = src/main/java/,\
-           src/main/resources/
+source.. = src/main/java/
diff --git a/...rmdecoder/src/main/java/org/openhab/binding/alarmdecoder/AlarmDecoderBindingProvider.java b/...rmdecoder/src/main/java/org/openhab/binding/alarmdecoder/AlarmDecoderBindingProvider.java
@@ -11,15 +11,14 @@
 import java.util.ArrayList;
 import org.openhab.binding.alarmdecoder.internal.ADMsgType;
 import org.openhab.binding.alarmdecoder.internal.AlarmDecoderBindingConfig;
-import org.openhab.core.binding.BindingProvider;
-
+import org.openhab.core.autoupdate.AutoUpdateBindingProvider;
 /**
  * This interface is implemented by classes that provide per-item binding configuration
  * 
  * @author Bernd Pfrommer
  * @since 1.6.0
  */
-public interface AlarmDecoderBindingProvider extends BindingProvider {
+public interface AlarmDecoderBindingProvider extends AutoUpdateBindingProvider {
 
 	/**
 	 * Get the binding configuration for a given itemName. This method

diff --git a/...in/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderGenericBindingProvider.java b/...in/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderGenericBindingProvider.java
@@ -114,7 +114,7 @@ public void processBindingConfiguration(String context, Item item, String bindin
 		AlarmDecoderBindingConfig bc = new AlarmDecoderBindingConfig(item.getName(), mt, parts[1], parts[2], params);
 		bcl.add(bc);
 		addBindingConfig(item, bc);
-		
+
 		m_itemsToConfig.put(item.getName(), bc);
 		logger.trace("processing item \"{}\" read from .items file with cfg string {}",
 				item.getName(), bindingConfig);
@@ -184,6 +184,10 @@ static private boolean s_isValidAddress(ADMsgType type, String addr) {
 			return (false);
 		}
 	}
+	@Override
+	public Boolean autoUpdate(String itemName) {
+		return true;
+	}
 
 
 }