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

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Mon Sep 24 17:44:15 2012
New Revision: 470

Log:
new devices

Modified:
    projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/Activator.java

Modified: projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/Activator.java
==============================================================================
--- projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/Activator.java (original)
+++ projects/zb4osgi/sandbox/manlio.bacco/org.aaloa.zb4osgi.zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/Activator.java Mon Sep 24 17:44:15 2012
@@ -24,27 +24,22 @@
 
 import it.cnr.isti.zigbee.ha.cluster.factory.HAClustersFactory;
 import it.cnr.isti.zigbee.ha.device.api.generic.OnOffOutput;
-import it.cnr.isti.zigbee.ha.device.api.generic.OnOffSwitch;
-import it.cnr.isti.zigbee.ha.device.api.hvac.TemperatureSensor;
 import it.cnr.isti.zigbee.ha.device.api.lighting.LightSensor;
-import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
-import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLightSwitch;
 import it.cnr.isti.zigbee.ha.device.api.security_safety.IASControlAndIndicatingEquipment;
-import it.cnr.isti.zigbee.ha.device.api.security_safety.IAS_Zone;
 import it.cnr.isti.zigbee.ha.device.factory.ColorDimmableLightFactory;
 import it.cnr.isti.zigbee.ha.device.factory.DimmableLightFactory;
 import it.cnr.isti.zigbee.ha.device.factory.IASAncillaryControlEquipmentFactory;
+import it.cnr.isti.zigbee.ha.device.factory.IAS_ZoneFactory;
 import it.cnr.isti.zigbee.ha.device.factory.LevelControlSwitchFactory;
 import it.cnr.isti.zigbee.ha.device.factory.MainsPowerOutletFactory;
+import it.cnr.isti.zigbee.ha.device.factory.OccupancySensorFactory;
 import it.cnr.isti.zigbee.ha.device.factory.OnOffLightFactory;
+import it.cnr.isti.zigbee.ha.device.factory.OnOffLightSwitchFactory;
+import it.cnr.isti.zigbee.ha.device.factory.OnOffSwitchFactory;
+import it.cnr.isti.zigbee.ha.device.factory.TemperatureSensorFactory;
 import it.cnr.isti.zigbee.ha.device.impl.IASControlAndIndicatingEquipmentDevice;
-import it.cnr.isti.zigbee.ha.device.impl.IAS_ZoneDevice;
 import it.cnr.isti.zigbee.ha.device.impl.LightSensorDevice;
-import it.cnr.isti.zigbee.ha.device.impl.OccupancySensorDevice;
-import it.cnr.isti.zigbee.ha.device.impl.OnOffLightSwitchDevice;
 import it.cnr.isti.zigbee.ha.device.impl.OnOffOutputDevice;
-import it.cnr.isti.zigbee.ha.device.impl.OnOffSwitchDevice;
-import it.cnr.isti.zigbee.ha.device.impl.TemperatureSensorDevice;
 import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration;
 import it.cnr.isti.zigbee.ha.driver.HAImporter;
 import it.cnr.isti.zigbee.ha.driver.core.GenericHADeviceFactory;
@@ -113,22 +108,27 @@
 		factories.add(new LevelControlSwitchFactory(ctx).register());
 		//factories.add(new GenericHADeviceFactory(ctx, LevelControlSwitch.class, LevelControlSwitchDevice.class).register());
 
-		factories.add(new GenericHADeviceFactory(ctx, OccupancySensor.class, OccupancySensorDevice.class).register());
+		factories.add(new OccupancySensorFactory(ctx).register());
+		//factories.add(new GenericHADeviceFactory(ctx, OccupancySensor.class, OccupancySensorDevice.class).register());
 
-		factories.add(new GenericHADeviceFactory(ctx, OnOffLightSwitch.class, OnOffLightSwitchDevice.class).register());
+		factories.add(new OnOffLightSwitchFactory(ctx).register());
+		//factories.add(new GenericHADeviceFactory(ctx, OnOffLightSwitch.class, OnOffLightSwitchDevice.class).register());
 
 		factories.add(new GenericHADeviceFactory(ctx, OnOffOutput.class, OnOffOutputDevice.class).register());
 
-		factories.add(new GenericHADeviceFactory(ctx, OnOffSwitch.class, OnOffSwitchDevice.class).register());
+		factories.add(new OnOffSwitchFactory(ctx).register());
+		//factories.add(new GenericHADeviceFactory(ctx, OnOffSwitch.class, OnOffSwitchDevice.class).register());
 
-		factories.add(new GenericHADeviceFactory(ctx, TemperatureSensor.class, TemperatureSensorDevice.class).register());
+		factories.add(new TemperatureSensorFactory(ctx).register());
+		//factories.add(new GenericHADeviceFactory(ctx, TemperatureSensor.class, TemperatureSensorDevice.class).register());
 
 		/* */
 
 		factories.add(new MainsPowerOutletFactory(ctx).register());
 		//factories.add(new GenericHADeviceFactory(ctx, MainsPowerOutlet.class, MainsPowerOutletDevice.class).register()); // new
 
-		factories.add(new GenericHADeviceFactory(ctx, IAS_Zone.class, IAS_ZoneDevice.class).register()); // new
+		factories.add(new IAS_ZoneFactory(ctx).register());
+		//factories.add(new GenericHADeviceFactory(ctx, IAS_Zone.class, IAS_ZoneDevice.class).register()); // new
 
 		factories.add(new GenericHADeviceFactory(ctx, LightSensor.class, LightSensorDevice.class).register()); // new