Thu Oct 18 17:36:23 CEST 2012

Author: stefano.lenzi
Date: Thu Oct 18 17:36:23 2012
New Revision: 524

Log:
Fixed typo of "PhysicalEnviroment" typo ( refs #137 )
Fixes issue in coverting Integer to Byte by means of Number interface ( refs #137 )

Modified:
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java
    projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/DefaultSerializer.java
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java

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

--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/Basic.java Thu Oct 18 17:36:23 2012
@@ -44,7 +44,7 @@
 	public Attribute getDateCode();
 	public Attribute getPowerSource();
 	public String getLocationDescription() throws ZigBeeHAException;
-	public Attribute getPhysicalEnviroment();
+	public Attribute getPhysicalEnvironment();
 	public boolean getDeviceEnabled() throws ZigBeeHAException;
 	public Attribute getAlarmMask();
 	

Modified: projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java (original)
+++ projects/zb4osgi/trunk/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/BasicImpl.java Thu Oct 18 17:36:23 2012
@@ -67,7 +67,7 @@
 		dateCode = basicCluster.getAttributeDateCode();
 		powerSource = basicCluster.getPowerSource();	
 		locationDescription = basicCluster.getAttributeLocationDescription();
-		physicalEnviroment = basicCluster.getAttributePhysicalEnviroment();
+		physicalEnviroment = basicCluster.getAttributePhysicalEnvironment();
 		deviceEnabled = basicCluster.getAttributeDeviceEnabled();
 		alarmMask = basicCluster.getAttributeAlarmMask();
 	}
@@ -114,7 +114,7 @@
 		return modelIdentifier;
 	}
 
-	public Attribute getPhysicalEnviroment() {
+	public Attribute getPhysicalEnvironment() {
 		return physicalEnviroment;
 	}
 

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/Basic.java Thu Oct 18 17:36:23 2012
@@ -56,7 +56,7 @@
 	public Attribute getPowerSource();
 	
 	public Attribute getAttributeLocationDescription();
-	public Attribute getAttributePhysicalEnviroment();
+	public Attribute getAttributePhysicalEnvironment();
 	public Attribute getAttributeDeviceEnabled();
 	public Attribute getAttributeAlarmMask();
 	

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/Attributes.java Thu Oct 18 17:36:23 2012
@@ -113,9 +113,9 @@
 	.setZigBeeType(ZigBeeType.CharacterString)
 	.setWritable(true);
 	
-	final static public   AttributeDescriptor PHISICAL_ENVIROMENT = new AbstractAttribute()
+	final static public   AttributeDescriptor PHYSICAL_ENVIRONMENT = new AbstractAttribute()
 	.setId(0x0011)
-	.setName("PhysicalEnviroment")
+	.setName("PhysicalEnvironment")
 	.setReportable(false)
 	.setType(Byte.class)
 	.setZigBeeType(ZigBeeType.Enumeration8bit)

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/DefaultSerializer.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/DefaultSerializer.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/DefaultSerializer.java Thu Oct 18 17:36:23 2012
@@ -76,11 +76,11 @@
 				appendBoolean((Boolean) data);
 			break;
 			case Data8bit: case SignedInteger8bit: case Bitmap8bit: case UnsignedInteger8bit: case Enumeration8bit:
-				final Integer b = (Integer) data;
+				final Number b = (Number) data;
 				append_byte(b.byteValue());
 			break;
 			case Data16bit: case SignedInteger16bit: case Bitmap16bit: case UnsignedInteger16bit: case Enumeration16bit:
-				final Integer s = (Integer) data;
+				final Number s = (Number) data;
 				append_short(s.shortValue());
 			break;
 			case Data24bit: case SignedInteger24bit: case Bitmap24bit: case UnsignedInteger24bit:

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/BasicCluster.java Thu Oct 18 17:36:23 2012
@@ -54,7 +54,7 @@
 	private final AttributeImpl powerSource;
 	
 	private final AttributeImpl locationDescription;
-	private final AttributeImpl physicalEnviroment;
+	private final AttributeImpl physicalEnvironment;
 	private final AttributeImpl deviceEnabled;
 	private final AttributeImpl alarmMask;
 	
@@ -71,12 +71,12 @@
 		dateCode = new AttributeImpl(zbDevice,this,Attributes.DATE_CODE);
 		powerSource = new AttributeImpl(zbDevice,this,Attributes.POWER_SOURCE);
 		locationDescription = new AttributeImpl(zbDevice,this,Attributes.LOCATION_DESCRIPTION);
-		physicalEnviroment = new AttributeImpl(zbDevice,this,Attributes.PHISICAL_ENVIROMENT);
+		physicalEnvironment = new AttributeImpl(zbDevice,this,Attributes.PHYSICAL_ENVIRONMENT);
 		deviceEnabled = new AttributeImpl(zbDevice,this,Attributes.DEVICE_ENABLED);
 		alarmMask = new AttributeImpl(zbDevice,this,Attributes.ALARM_MASK);
 		attributes = new AttributeImpl[]{zclVersion, applicationVersion, stackVersion,
 				hwVersion, manufacturerName, modelIdentifier, dateCode, powerSource,
-				locationDescription, physicalEnviroment, deviceEnabled, alarmMask};
+				locationDescription, physicalEnvironment, deviceEnabled, alarmMask};
 	}
 	
 	private static EmptyPayloadCommand CMD_RESET_TO_FACTORY_DEFAULT = new EmptyPayloadCommand()
@@ -131,9 +131,9 @@
 	public Attribute getAttributeModelIdentifier() {
 		return modelIdentifier;
 	}
-
-	public Attribute getAttributePhysicalEnviroment() {
-		return physicalEnviroment;
+                                 
+	public Attribute getAttributePhysicalEnvironment() {
+		return physicalEnvironment;
 	}
 
 	public Attribute getAttributeStackVersion() {


