Tue Sep 17 16:31:35 CEST 2013

Author: giancarlo.riolo
Date: Tue Sep 17 16:31:35 2013
New Revision: 805

Log:
Renaming  typo : Occupacy -> Occupancy

Added:
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupancySensing.java   (contents, props changed)
      - copied, changed from r804, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupacySensing.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupancySensingImpl.java   (contents, props changed)
      - copied, changed from r804, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupancySensing.java   (contents, props changed)
      - copied, changed from r804, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupacySensing.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupancySensingCluster.java   (contents, props changed)
      - copied, changed from r804, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java
Removed:
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupacySensing.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupacySensingImpl.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupacySensing.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupacySensingCluster.java
Modified:
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/DimmableLight.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/ColorDimmableLightDevice.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/DimmableLightDevice.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADevice.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADeviceFactory.java
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java
==============================================================================

--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/factory/HAClustersFactory.java Tue Sep 17 16:31:35 2013
@@ -33,7 +33,7 @@
 import it.cnr.isti.zigbee.ha.cluster.impl.IdentifyImpl;
 import it.cnr.isti.zigbee.ha.cluster.impl.IlluminanceMeasurementImpl;
 import it.cnr.isti.zigbee.ha.cluster.impl.LevelControlImpl;
-import it.cnr.isti.zigbee.ha.cluster.impl.OccupacySensingImpl;
+import it.cnr.isti.zigbee.ha.cluster.impl.OccupancySensingImpl;
 import it.cnr.isti.zigbee.ha.cluster.impl.OnOffImpl;
 import it.cnr.isti.zigbee.ha.cluster.impl.OnOffSwitchConfigurationImpl;
 import it.cnr.isti.zigbee.ha.cluster.impl.PowerConfigurationImpl;
@@ -107,7 +107,7 @@
         addCluster(ILLUMINANCE_MEASUREMENT_KEY, IlluminanceMeasurementImpl.class); // new
         addCluster(TEMPERATURE_MEASUREMENT_KEY, TemperatureMeasurementImpl.class);
         addCluster(RELATIVE_HUMIDITY_MEASUREMENT_KEY, RelativeHumidityMeasurementImpl.class);
-        addCluster(OCCUPANCY_SENSING_KEY, OccupacySensingImpl.class);
+        addCluster(OCCUPANCY_SENSING_KEY, OccupancySensingImpl.class);
 
         //Security and Safety
         addCluster(IAS_ZONE_KEY, IASZoneImpl.class);

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupancySensingImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupancySensingImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/OccupancySensingImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/ColorDimmableLight.java Tue Sep 17 16:31:35 2013
@@ -26,7 +26,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.LevelControl;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.driver.ArraysUtil;
 import it.cnr.isti.zigbee.ha.driver.core.HADevice;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -83,11 +83,11 @@
 	public LevelControl getLevelControl();
 
 	/**
-	 * Access method for the <b>Optional</b> cluster: {@link OccupacySensing} 
+	 * Access method for the <b>Optional</b> cluster: {@link OccupancySensing} 
 	 *  
-	 * @return the {@link OccupacySensing} cluster object if implemented by the device, otherwise <code>null</code>
+	 * @return the {@link OccupancySensing} cluster object if implemented by the device, otherwise <code>null</code>
 	 */
-	public OccupacySensing getOccupacySensing();	
+	public OccupancySensing getOccupacySensing();	
 
 	/**
 	 * Access method for the <b>Mandatory</b> cluster: {@link ColorControl} 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/DimmableLight.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/DimmableLight.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/DimmableLight.java Tue Sep 17 16:31:35 2013
@@ -26,7 +26,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.LevelControl;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.driver.ArraysUtil;
 import it.cnr.isti.zigbee.ha.driver.core.HADevice;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -81,10 +81,10 @@
 	public LevelControl getLevelControl();
 
 	/**
-	 * Access method for the <b>Optional</b> cluster: {@link OccupacySensing} 
+	 * Access method for the <b>Optional</b> cluster: {@link OccupancySensing} 
 	 *  
-	 * @return the {@link OccupacySensing} cluster object if implemented by the device, otherwise <code>null</code>
+	 * @return the {@link OccupancySensing} cluster object if implemented by the device, otherwise <code>null</code>
 	 */
-	public abstract OccupacySensing getOccupacySensing();
+	public abstract OccupancySensing getOccupacySensing();
 	
 }

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OccupancySensor.java Tue Sep 17 16:31:35 2013
@@ -22,7 +22,7 @@
 
 package it.cnr.isti.zigbee.ha.device.api.lighting;
 
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.driver.ArraysUtil;
 import it.cnr.isti.zigbee.ha.driver.core.HADevice;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -52,10 +52,10 @@
 	public static final int[] CUSTOM = {};
 	
 	/**
-	 * Access method for the <b>Mandatory</b> cluster: {@link OccupacySensing} 
+	 * Access method for the <b>Mandatory</b> cluster: {@link OccupancySensing} 
 	 *  
-	 * @return the {@link OccupacySensing} cluster implemented by the device
+	 * @return the {@link OccupancySensing} cluster implemented by the device
 	 */
-	public  OccupacySensing getOccupacySensing();	
+	public  OccupancySensing getOccupacySensing();	
 	
 }

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/api/lighting/OnOffLight.java Tue Sep 17 16:31:35 2013
@@ -25,7 +25,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.driver.ArraysUtil;
 import it.cnr.isti.zigbee.ha.driver.core.HADevice;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -79,10 +79,10 @@
 	public Groups getGroups();
 
 	/**
-	 * Access method for the <b>Optional</b> cluster: {@link OccupacySensing} 
+	 * Access method for the <b>Optional</b> cluster: {@link OccupancySensing} 
 	 *  
-	 * @return the {@link OccupacySensing} cluster object if implemented by the device, otherwise <code>null</code>
+	 * @return the {@link OccupancySensing} cluster object if implemented by the device, otherwise <code>null</code>
 	 */
-	public OccupacySensing getOccupacySensing();	
+	public OccupancySensing getOccupacySensing();	
 	
 }

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/ColorDimmableLightDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/ColorDimmableLightDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/ColorDimmableLightDevice.java Tue Sep 17 16:31:35 2013
@@ -27,7 +27,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.LevelControl;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.ColorDimmableLight;
 import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -51,7 +51,7 @@
     private Scenes scenes;
     private Groups groups;
     private LevelControl levelControl;
-    private OccupacySensing occupancySensing;
+    private OccupancySensing occupancySensing;
     private ColorControl colorControl;
 
     public ColorDimmableLightDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException {
@@ -62,7 +62,7 @@
         scenes = (Scenes) addCluster(HAProfile.SCENES);
         groups = (Groups) addCluster(HAProfile.GROUPS);
         levelControl = (LevelControl) addCluster(HAProfile.LEVELCONTROL);
-        occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
+        occupancySensing = (OccupancySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
         colorControl = (ColorControl) addCluster(HAProfile.COLOR_CONTROL);
     }
 
@@ -101,7 +101,7 @@
         return levelControl;
     }
 
-    public OccupacySensing getOccupacySensing() {
+    public OccupancySensing getOccupacySensing() {
         return occupancySensing;
     }
 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/DimmableLightDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/DimmableLightDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/DimmableLightDevice.java Tue Sep 17 16:31:35 2013
@@ -27,7 +27,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.LevelControl;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.DimmableLight;
 import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -50,7 +50,7 @@
 	private LevelControl levelControl;
 	private Scenes scenes;
 	private Groups groups;
-	private OccupacySensing occupancySensing;
+	private OccupancySensing occupancySensing;
 	
 	public DimmableLightDevice(BundleContext ctx, ZigBeeDevice zbDevice) throws ZigBeeHAException{
 		super(ctx,zbDevice);
@@ -58,7 +58,7 @@
 		onOff = (OnOff) addCluster(HAProfile.ON_OFF);
 		groups = (Groups) addCluster(HAProfile.GROUPS);
 		scenes = (Scenes) addCluster(HAProfile.SCENES);
-		occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
+		occupancySensing = (OccupancySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
 	}
 	
 	final static DeviceDescription DEVICE_DESCRIPTOR =  new AbstractDeviceDescription(){
@@ -99,7 +99,7 @@
 		return levelControl;
 	}
 
-	public OccupacySensing getOccupacySensing() {
+	public OccupancySensing getOccupacySensing() {
 		return occupancySensing;
 	}
 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OccupancySensorDevice.java Tue Sep 17 16:31:35 2013
@@ -23,7 +23,7 @@
 package it.cnr.isti.zigbee.ha.device.impl;
 
 import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
 import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -44,14 +44,14 @@
  */
 public class OccupancySensorDevice extends HADeviceBase implements OccupancySensor {
 	
-	private OccupacySensing occupancySensing;
+	private OccupancySensing occupancySensing;
 	
 	public  OccupancySensorDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException {
 		super(ctx,zbDevice);
-		occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
+		occupancySensing = (OccupancySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
 	}
 
-	public OccupacySensing getOccupacySensing() {
+	public OccupancySensing getOccupacySensing() {
 		return occupancySensing;
 	}
 	

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/OnOffLightDevice.java Tue Sep 17 16:31:35 2013
@@ -26,7 +26,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLight;
 import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
 import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
@@ -49,14 +49,14 @@
 	private OnOff onOff;
 	private Scenes scenes;
 	private Groups groups;
-	private OccupacySensing occupancySensing;
+	private OccupancySensing occupancySensing;
 	
 	public  OnOffLightDevice(BundleContext ctx,ZigBeeDevice zbDevice) throws ZigBeeHAException {
 		super(ctx,zbDevice);
 		onOff = (OnOff) addCluster(HAProfile.ON_OFF);
 		groups = (Groups) addCluster(HAProfile.GROUPS);
 		scenes = (Scenes) addCluster(HAProfile.SCENES);
-		occupancySensing = (OccupacySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
+		occupancySensing = (OccupancySensing) addCluster(HAProfile.OCCUPANCY_SENSING);
 	}
 
 
@@ -64,7 +64,7 @@
 		return groups;
 	}
 
-	public OccupacySensing getOccupacySensing() {
+	public OccupancySensing getOccupacySensing() {
 		return occupancySensing;
 	}
 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HAProfile.java Tue Sep 17 16:31:35 2013
@@ -52,7 +52,7 @@
 import it.cnr.isti.zigbee.zcl.library.api.general.BinaryInput;
 import it.cnr.isti.zigbee.zcl.library.api.lighting.ColorControl;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.IlluminanceMeasurement;
-import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.RelativeHumidityMeasurement;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.TemperatureMeasurement;
 import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASACE;
@@ -110,7 +110,7 @@
     //public static final int PRESSURE_MEASUREMENT										// 0x0403
     //public static final int FLOW_MEASUREMENT											// 0x0404
     public static final int RELATIVE_HUMIDITY_MEASUREMENT = RelativeHumidityMeasurement.ID;
-    public static final int OCCUPANCY_SENSING = OccupacySensing.ID;
+    public static final int OCCUPANCY_SENSING = OccupancySensing.ID;
 
     // Security & Safety
     public static final int IAS_ZONE = IASZone.ID;										// TODO
@@ -222,7 +222,7 @@
             else if(id.equals(Integer.toHexString(HAProfile.RELATIVE_HUMIDITY_MEASUREMENT)))
                 return RelativeHumidityMeasurement.NAME;
             else if(id.equals(Integer.toHexString(HAProfile.OCCUPANCY_SENSING)))
-                return OccupacySensing.NAME;
+                return OccupancySensing.NAME;
 
             else if(id.equals(Integer.toHexString(HAProfile.IAS_ZONE)))
                 return IASZone.NAME;

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADevice.java Tue Sep 17 16:31:35 2013
@@ -27,7 +27,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLight;
 import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration.ProvidedClusterMode;
 import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADeviceFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADeviceFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknowHADeviceFactory.java Tue Sep 17 16:31:35 2013
@@ -28,7 +28,7 @@
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
 import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLight;
 import it.cnr.isti.zigbee.ha.driver.ArraysUtil;
 import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration.ProvidedClusterMode;

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/clusters/api/Clusters.java Tue Sep 17 16:31:35 2013
@@ -36,7 +36,7 @@
 import it.cnr.isti.zigbee.zcl.library.api.general.Time;
 import it.cnr.isti.zigbee.zcl.library.api.lighting.ColorControl;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.IlluminanceMeasurement;
-import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.OccupacySensing;
+import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.OccupancySensing;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.RelativeHumidityMeasurement;
 import it.cnr.isti.zigbee.zcl.library.api.measureament_sensing.TemperatureMeasurement;
 import it.cnr.isti.zigbee.zcl.library.api.security_safety.IASACE;
@@ -86,7 +86,7 @@
 
         new String[]{COLOR_CONTROL, ColorControl.class.getName()},
 
-        new String[]{ILLUMINANCE_MEASUREMENT, IlluminanceMeasurement.class.getName()}, new String[]{OCCUPANCY_SENSING, OccupacySensing.class.getName()},
+        new String[]{ILLUMINANCE_MEASUREMENT, IlluminanceMeasurement.class.getName()}, new String[]{OCCUPANCY_SENSING, OccupancySensing.class.getName()},
         new String[]{RELATIVE_HUMIDITY_MEASUREMENT, RelativeHumidityMeasurement.class.getName()},
         new String[]{TEMPERATURE_MEASUREMENT, TemperatureMeasurement.class.getName()},
 

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/OccupancySensing.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupancySensingCluster.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupancySensingCluster.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/measureament_sensing/OccupancySensingCluster.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain


