[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r1097 - in /projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java: com/itaca/ztool/api/zdo/ it/cnr/isti/cc2480/zic/

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Thu Nov 13 09:14:14 2014
New Revision: 1097

Log:
WaitForCommand throws and exception when it fails to store itself as listener ( refs #275 )


Added:
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/ZICRuntimeException.java   (with props)
Modified:
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_IEEE_ADDR_REQ.java
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_MGMT_LQI_REQ.java
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/WaitForCommand.java

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_IEEE_ADDR_REQ.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_IEEE_ADDR_REQ.java	(original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_IEEE_ADDR_REQ.java	Thu Nov 13 09:14:14 2014
@@ -54,7 +54,10 @@
 
     /// <name>TI.ZPI1.ZDO_IEEE_ADDR_REQ</name>
     /// <summary>Constructor</summary>
-    public ZDO_IEEE_ADDR_REQ() {
+	/**
+	 * @deprecated
+	 */
+    ZDO_IEEE_ADDR_REQ() {
     }
     
     public short getShortAddress(){

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_MGMT_LQI_REQ.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_MGMT_LQI_REQ.java	(original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/zdo/ZDO_MGMT_LQI_REQ.java	Thu Nov 13 09:14:14 2014
@@ -41,9 +41,10 @@
     /// <summary>Where to start.  The result can be more networks than can be reported, so this field allows a user to ask for more.</summary>
     public int StartIndex;
 
-    /// <name>TI.ZPI1.ZDO_MGMT_LQI_REQ</name>
-    /// <summary>Constructor</summary>
-    public ZDO_MGMT_LQI_REQ() {
+    /**
+     * @deprecated
+     */
+    ZDO_MGMT_LQI_REQ() {
     }
 
     /// <name>TI.ZPI1.ZDO_MGMT_LQI_REQ</name>

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/WaitForCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/WaitForCommand.java	(original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/WaitForCommand.java	Thu Nov 13 09:14:14 2014
@@ -27,7 +27,9 @@
 import it.cnr.isti.cc2480.high.AsynchrounsCommandListener;
 import it.cnr.isti.cc2480.high.HWHighLevelDriver;
 
+import com.itaca.ztool.api.ZToolException;
 import com.itaca.ztool.api.ZToolPacket;
+import com.itaca.ztool.api.ZToolTimeoutException;
 
 /**
 *
@@ -47,7 +49,9 @@
     public WaitForCommand(int waitFor, HWHighLevelDriver driver) {
         this.waitFor = waitFor;
         this.driver = driver;
-        driver.addAsynchrounsCommandListener(this);
+        if ( driver.addAsynchrounsCommandListener(this) == false ) {
+        	throw new ZICRuntimeException("Failed to register a listener");
+        };
     }
 
     public void receivedAsynchrounsCommand(ZToolPacket packet) {

Added: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/ZICRuntimeException.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/ZICRuntimeException.java	(added)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/ZICRuntimeException.java	Thu Nov 13 09:14:14 2014
@@ -0,0 +1,40 @@
+/*
+   Copyright 2014-2014 CNR-ISTI, http://isti.cnr.it
+   Institute of Information Science and Technologies
+   of the Italian National Research Council
+
+
+   See the NOTICE file distributed with this work for additional
+   information regarding copyright ownership
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
+package it.cnr.isti.cc2480.zic;
+
+/**
+*
+* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
+* @version $LastChangedRevision$ ($LastChangedDate$ )
+*
+*/
+public class ZICRuntimeException extends RuntimeException {
+
+	public ZICRuntimeException(String msg){
+		super(msg);
+	}
+
+	public ZICRuntimeException(String msg, Throwable t){
+		super(msg,t);
+	}
+
+}

Propchange: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/zic/ZICRuntimeException.java
------------------------------------------------------------------------------
    svn:executable = *