[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r477 - /projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:48:45 2012
New Revision: 477

Log:
new devices factories

Added:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/IAS_ZoneFactory.java   (with props)
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OccupancySensorFactory.java   (with props)
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightSwitchFactory.java   (with props)
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffSwitchFactory.java   (with props)
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/TemperatureSensorFactory.java   (with props)
Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/MainsPowerOutletFactory.java
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightFactory.java

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/IAS_ZoneFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/IAS_ZoneFactory.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/IAS_ZoneFactory.java Mon Sep 24 17:48:45 2012
@@ -1,0 +1,38 @@
+package it.cnr.isti.zigbee.ha.device.factory;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.security_safety.IAS_Zone;
+import it.cnr.isti.zigbee.ha.device.impl.IAS_ZoneDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactoryBase;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import org.osgi.framework.BundleContext;
+
+public class IAS_ZoneFactory extends HADeviceFactoryBase {
+
+	public IAS_ZoneFactory(BundleContext ctx) {
+		super(ctx, IAS_Zone.class);
+	}
+
+	private String[] clusters;
+	private String[] implementedInterfaces = { 
+			HADevice.class.getName(), 
+			HADeviceBase.class.getName(),
+			IAS_Zone.class.getName()
+	};
+	
+	@Override
+	public String getDeviceId() {
+		return String.valueOf(IAS_Zone.DEVICE_ID);
+	}
+	@Override
+	public String[] getRefinedInterfaces() {
+		return implementedInterfaces;
+	}
+	@Override
+	public HADeviceBase getInstance(ZigBeeDevice zbDevice) throws ZigBeeHAException {
+		return new IAS_ZoneDevice(ctx, zbDevice);
+	}
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/IAS_ZoneFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/MainsPowerOutletFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/MainsPowerOutletFactory.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/MainsPowerOutletFactory.java Mon Sep 24 17:48:45 2012
@@ -25,7 +25,7 @@
 
 	@Override
 	public String getDeviceId() {
-		return String.valueOf(MainsPowerOutletDevice.DEVICE_ID);
+		return String.valueOf(MainsPowerOutlet.DEVICE_ID);
 	}
 
 	@Override

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OccupancySensorFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OccupancySensorFactory.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OccupancySensorFactory.java Mon Sep 24 17:48:45 2012
@@ -1,0 +1,40 @@
+package it.cnr.isti.zigbee.ha.device.factory;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
+import it.cnr.isti.zigbee.ha.device.impl.OccupancySensorDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactoryBase;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import org.osgi.framework.BundleContext;
+
+public class OccupancySensorFactory extends HADeviceFactoryBase {
+
+	public OccupancySensorFactory(BundleContext ctx) {
+		super(ctx, OccupancySensor.class);
+	}
+
+	private String[] clusters;
+	private String[] implementedInterfaces = { 
+			HADevice.class.getName(), 
+			HADeviceBase.class.getName(),
+			OccupancySensor.class.getName()
+	};
+
+	@Override
+	public String getDeviceId() {
+		return String.valueOf(OccupancySensor.DEVICE_ID);
+	}
+
+	@Override
+	public String[] getRefinedInterfaces() {
+		return implementedInterfaces;
+	}
+
+	@Override
+	public HADeviceBase getInstance(ZigBeeDevice zbDevice) throws ZigBeeHAException {
+		return new OccupancySensorDevice(ctx, zbDevice);
+	}
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OccupancySensorFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightFactory.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightFactory.java Mon Sep 24 17:48:45 2012
@@ -55,7 +55,7 @@
 
 	@Override
 	public String getDeviceId() {		
-		return String.valueOf(OnOffLightDevice.DEVICE_ID);
+		return String.valueOf(OnOffLight.DEVICE_ID);
 	}
 
 	@Override

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightSwitchFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightSwitchFactory.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightSwitchFactory.java Mon Sep 24 17:48:45 2012
@@ -1,0 +1,40 @@
+package it.cnr.isti.zigbee.ha.device.factory;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLightSwitch;
+import it.cnr.isti.zigbee.ha.device.impl.OnOffLightDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactoryBase;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import org.osgi.framework.BundleContext;
+
+public class OnOffLightSwitchFactory extends HADeviceFactoryBase {
+
+	private String[] clusters;
+	private String[] implementedInterfaces = { 
+			HADevice.class.getName(), 
+			HADeviceBase.class.getName(),
+			OnOffLightSwitch.class.getName()
+	};
+
+	public OnOffLightSwitchFactory(BundleContext ctx) {
+		super(ctx, OnOffLightSwitch.class);
+	}
+
+	@Override
+	public String getDeviceId() {
+		return String.valueOf(OnOffLightSwitch.DEVICE_ID);
+	}
+
+	@Override
+	public String[] getRefinedInterfaces() {
+		return implementedInterfaces;
+	}
+
+	@Override
+	public HADeviceBase getInstance(ZigBeeDevice zbDevice) throws ZigBeeHAException {
+		return new OnOffLightDevice(ctx, zbDevice);
+	}
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffLightSwitchFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffSwitchFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffSwitchFactory.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffSwitchFactory.java Mon Sep 24 17:48:45 2012
@@ -1,0 +1,37 @@
+package it.cnr.isti.zigbee.ha.device.factory;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.generic.OnOffSwitch;
+import it.cnr.isti.zigbee.ha.device.impl.OnOffSwitchDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactoryBase;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import org.osgi.framework.BundleContext;
+
+public class OnOffSwitchFactory extends HADeviceFactoryBase {
+
+	public OnOffSwitchFactory(BundleContext ctx) {
+		super(ctx, OnOffSwitch.class);
+	}
+
+	private String[] clusters;
+	private String[] implementedInterfaces = { 
+			HADevice.class.getName(), 
+			HADeviceBase.class.getName(),
+			OnOffSwitch.class.getName()
+	};
+	@Override
+	public String getDeviceId() {
+		return String.valueOf(OnOffSwitch.DEVICE_ID);
+	}
+	@Override
+	public String[] getRefinedInterfaces() {
+		return implementedInterfaces;
+	}
+	@Override
+	public HADeviceBase getInstance(ZigBeeDevice zbDevice) throws ZigBeeHAException {
+		return new OnOffSwitchDevice(ctx, zbDevice);
+	}
+}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/OnOffSwitchFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/TemperatureSensorFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/TemperatureSensorFactory.java (added)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/TemperatureSensorFactory.java Mon Sep 24 17:48:45 2012
@@ -1,0 +1,39 @@
+package it.cnr.isti.zigbee.ha.device.factory;
+
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.hvac.TemperatureSensor;
+import it.cnr.isti.zigbee.ha.device.impl.TemperatureSensorDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactoryBase;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import org.osgi.framework.BundleContext;
+
+public class TemperatureSensorFactory extends HADeviceFactoryBase {
+
+	private String[] clusters;
+	private String[] implementedInterfaces = { 
+			HADevice.class.getName(), 
+			HADeviceBase.class.getName(),
+			TemperatureSensor.class.getName()
+	};
+
+	public TemperatureSensorFactory(BundleContext ctx) {
+		super(ctx, TemperatureSensor.class);
+	}
+
+	@Override
+	public String getDeviceId() {
+		return String.valueOf(TemperatureSensor.DEVICE_ID);
+	}
+
+	@Override
+	public String[] getRefinedInterfaces() {
+		return implementedInterfaces;
+	}
+
+	@Override
+	public HADeviceBase getInstance(ZigBeeDevice zbDevice) throws ZigBeeHAException {
+		return new TemperatureSensorDevice(ctx, zbDevice);
+	}}

Propchange: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/factory/TemperatureSensorFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain