Fri Oct 19 16:23:13 CEST 2012

Author: stefano.lenzi
Date: Fri Oct 19 16:23:13 2012
New Revision: 529

Log:
Fixing typo removeAllScene should be removeAllScenes (refs #135)


Added:
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/scenes/RemoveAllScenesResponse.java
      - copied, changed from r527, projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/scenes/RemoveAllSceneResponse.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllScenesResponseImpl.java
      - copied, changed from r527, projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllSceneResponseImpl.java
Removed:
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/scenes/RemoveAllSceneResponse.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/RemoveAllSceneResponseImpl.java
Modified:
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Scenes.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ScenesCluster.java

Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java
==============================================================================

--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Scenes.java Fri Oct 19 16:23:13 2012
@@ -28,7 +28,7 @@
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.AddScenePayload;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.AddSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.GetSceneMembershipResponse;
-import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveAllSceneResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveAllScenesResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.StoreSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.ViewSceneResponse;
@@ -47,7 +47,7 @@
 	
 	public void recallScene(int groupId, short sceneId) throws ZigBeeHAException;
 	
-	public RemoveAllSceneResponse removeAllScene() throws ZigBeeHAException;
+	public RemoveAllScenesResponse removeAllScene() throws ZigBeeHAException;
 	
 	public RemoveSceneResponse removeScene(int groupId, short sceneId) throws ZigBeeHAException;
 

Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ScenesImpl.java Fri Oct 19 16:23:13 2012
@@ -31,7 +31,7 @@
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.AddScenePayload;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.AddSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.GetSceneMembershipResponse;
-import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveAllSceneResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveAllScenesResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.RemoveSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.StoreSceneResponse;
 import it.cnr.isti.zigbee.zcl.library.api.general.scenes.ViewSceneResponse;
@@ -116,9 +116,9 @@
 
 	}
 
-	public RemoveAllSceneResponse removeAllScene() throws ZigBeeHAException{
+	public RemoveAllScenesResponse removeAllScene() throws ZigBeeHAException{
 		try {
-			RemoveAllSceneResponse response = (RemoveAllSceneResponse)scenesCluster.removeAllScene();
+			RemoveAllScenesResponse response = (RemoveAllScenesResponse)scenesCluster.removeAllScenes();
 			return response;
 		} catch (ZigBeeClusterException e) {
 			throw new ZigBeeHAException(e);

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Scenes.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Scenes.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Scenes.java Fri Oct 19 16:23:13 2012
@@ -63,7 +63,7 @@
 	public Response addScene(AddScenePayload scenepayload) throws ZigBeeClusterException; //TODO Create proper class
 	public Response viewScene(int groupId, short sceneId) throws ZigBeeClusterException;
 	public Response removeScene(int groupId, short sceneId) throws ZigBeeClusterException;
-	public Response removeAllScene() throws ZigBeeClusterException;
+	public Response removeAllScenes() throws ZigBeeClusterException;
 	public Response storeScene(int groupId, short sceneId) throws ZigBeeClusterException;
 	public void recallScene(int groupId, short sceneId) throws ZigBeeClusterException;
 	public Response getSceneMembership(int groupId) throws ZigBeeClusterException;

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ScenesCluster.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ScenesCluster.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/ScenesCluster.java Fri Oct 19 16:23:13 2012
@@ -41,7 +41,7 @@
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.GetSceneMembershipCommand;
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.GetSceneMembershipResponseImpl;
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.RecallSceneCommand;
-import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.RemoveAllSceneResponseImpl;
+import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.RemoveAllScenesResponseImpl;
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.RemoveSceneCommand;
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.RemoveSceneResponseImpl;
 import it.cnr.isti.zigbee.zcl.library.impl.general.scenes.StoreSceneCommand;
@@ -143,9 +143,9 @@
 		invoke(recallSceneCmd);
 	}
 
-	public Response removeAllScene() throws ZigBeeClusterException{
+	public Response removeAllScenes() throws ZigBeeClusterException{
 		Response response = invoke(CMD_REMOVE_ALL_SCENES);
-		return new RemoveAllSceneResponseImpl(response);
+		return new RemoveAllScenesResponseImpl(response);
 		
 	}
 


