diff --git a/addons/binding/org.openhab.binding.vera/.classpath b/addons/binding/org.openhab.binding.vera/.classpath index 7f457fa4138d1..a9d178f069e87 100644 --- a/addons/binding/org.openhab.binding.vera/.classpath +++ b/addons/binding/org.openhab.binding.vera/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/addons/binding/org.openhab.binding.vera/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.vera/META-INF/MANIFEST.MF index 226e66504e340..c6eeb62f6329f 100644 --- a/addons/binding/org.openhab.binding.vera/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.vera/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Import-Package: com.google.common.collect, com.google.gson, - com.google.gson.annotations;version="2.5.0", + com.google.gson.annotations, org.apache.commons.lang, org.apache.commons.lang.builder, org.apache.commons.net.util, diff --git a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/controller/CategoryType.java b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/controller/CategoryType.java index 87264bb0a0ad1..fd3bdbd7d99f7 100644 --- a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/controller/CategoryType.java +++ b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/controller/CategoryType.java @@ -1,55 +1,63 @@ -package org.openhab.binding.vera.controller; - -public enum CategoryType { - Controller(0, "Controller"), - Interface(1, "Interface"), - DimmableLight(2, "Dimmable Light"), - Switch(3, "Switch"), - SecuritySensor(4, "Security Sensor"), - HVAC(5, "HVAC"), - Camera(6, "Camera"), - DoorLock(7, "Door Lock"), - WindowCovering(8, "Window Covering"), - RemoteControl(9, "Remote Control"), - IRTransmitter(10, "IR Transmitter"), - GenericIO(11, "Generic I/O"), - GenericSensor(12, "Generic Sensor"), - SerialPort(13, "Serial Port"), - SceneController(14, "Scene Controller"), - AV(15, "A/V"), - HumiditySensor(16, "Humidity Sensor"), - TemperatureSensor(17, "Temperature Sensor"), - LightSensor(18, "Light Sensor"), - ZWaveInterface(19, "Z-Wave Interface"), - InsteonInterface(20, "Insteon Interface"), - PowerMeter(21, "Power Meter"), - AlarmPanel(22, "Alarm Panel"), - AlarmPartition(23, "Alarm Partition"), - Siren(24, "Siren"), - Weather(25, "Weather"), - PhilipsController(26, "Philips Controller"), - Appliance(27, "Appliance"), - UVSensor(28, "UV Sensor"), - Unknown(-1, "Unknown"); - - private int id; - private String name; - - private CategoryType(int id, String name) { - this.id = id; - this.name = name; - } - - public int getId() { - return id; - } - - public String getName() { - return name; - } - - @Override - public String toString() { - return "{" + id + ", " + name + "}"; - } -} +/** + * Copyright (c) 2010-2017 by the respective copyright holders. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + */ +package org.openhab.binding.vera.controller; + +public enum CategoryType { + Controller(0, "Controller"), + Interface(1, "Interface"), + DimmableLight(2, "Dimmable Light"), + Switch(3, "Switch"), + SecuritySensor(4, "Security Sensor"), + HVAC(5, "HVAC"), + Camera(6, "Camera"), + DoorLock(7, "Door Lock"), + WindowCovering(8, "Window Covering"), + RemoteControl(9, "Remote Control"), + IRTransmitter(10, "IR Transmitter"), + GenericIO(11, "Generic I/O"), + GenericSensor(12, "Generic Sensor"), + SerialPort(13, "Serial Port"), + SceneController(14, "Scene Controller"), + AV(15, "A/V"), + HumiditySensor(16, "Humidity Sensor"), + TemperatureSensor(17, "Temperature Sensor"), + LightSensor(18, "Light Sensor"), + ZWaveInterface(19, "Z-Wave Interface"), + InsteonInterface(20, "Insteon Interface"), + PowerMeter(21, "Power Meter"), + AlarmPanel(22, "Alarm Panel"), + AlarmPartition(23, "Alarm Partition"), + Siren(24, "Siren"), + Weather(25, "Weather"), + PhilipsController(26, "Philips Controller"), + Appliance(27, "Appliance"), + UVSensor(28, "UV Sensor"), + Unknown(-1, "Unknown"); + + private int id; + private String name; + + private CategoryType(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + @Override + public String toString() { + return "{" + id + ", " + name + "}"; + } +} diff --git a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/handler/VeraDeviceHandler.java b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/handler/VeraDeviceHandler.java index e73ecea81e41a..6813584d46641 100644 --- a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/handler/VeraDeviceHandler.java +++ b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/handler/VeraDeviceHandler.java @@ -345,9 +345,6 @@ protected synchronized void addDeviceAsChannel(Device device) { case HVAC: // TODO logger.warn("TODO: {}, {}", device, device.getCategoryType()); break; - case Camera: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case DoorLock: id = DOORLOCK_CHANNEL; acceptedItemType = "Switch"; @@ -356,29 +353,14 @@ protected synchronized void addDeviceAsChannel(Device device) { id = SWITCH_ROLLERSHUTTER_CHANNEL; acceptedItemType = "Rollershutter"; break; - case RemoteControl: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case IRTransmitter: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case GenericIO: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case GenericSensor: id = SENSOR_BINARY_CHANNEL; acceptedItemType = "Switch"; break; - case SerialPort: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case SceneController: id = SWITCH_BINARY_CHANNEL; acceptedItemType = "Switch"; break; - case AV: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case HumiditySensor: id = SENSOR_HUMIDITY_CHANNEL; acceptedItemType = "Number"; @@ -391,38 +373,30 @@ protected synchronized void addDeviceAsChannel(Device device) { id = SENSOR_LUMINOSITY_CHANNEL; acceptedItemType = "Number"; break; - case ZWaveInterface: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case InsteonInterface: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case PowerMeter: id = SENSOR_ENERGY_CHANNEL; acceptedItemType = "Number"; break; - case AlarmPanel: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case AlarmPartition: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Siren: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Weather: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case PhilipsController: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Appliance: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case UVSensor: id = SENSOR_ULTRAVIOLET_CHANNEL; acceptedItemType = "Number"; break; + case Camera: + case RemoteControl: + case IRTransmitter: + case GenericIO: + case SerialPort: + case AV: + case ZWaveInterface: + case InsteonInterface: + case AlarmPanel: + case AlarmPartition: + case Siren: + case Weather: + case PhilipsController: + case Appliance: + logger.warn("TODO: {}, {}", device, device.getCategoryType()); + break; case Unknown: logger.warn("Unknown device type: {}, {}", device, device.getCategory()); break; diff --git a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/internal/converter/VeraDeviceStateConverter.java b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/internal/converter/VeraDeviceStateConverter.java index 1a3a5447d7d4b..ac5ead6d65938 100644 --- a/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/internal/converter/VeraDeviceStateConverter.java +++ b/addons/binding/org.openhab.binding.vera/src/main/java/org/openhab/binding/vera/internal/converter/VeraDeviceStateConverter.java @@ -66,66 +66,40 @@ public static State toState(Device device, Channel channel, Logger logger) { case HVAC: // TODO logger.warn("TODO: {}, {}", device, device.getCategoryType()); break; - case Camera: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case DoorLock: return getBinaryState(device.getLocked()); case WindowCovering: return getPercentState(device.getLevel()); - case RemoteControl: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case IRTransmitter: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case GenericIO: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case GenericSensor: return getMultilevelState(device.getLevel()); - case SerialPort: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case SceneController: return getBinaryState(device.getStatus()); - case AV: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case HumiditySensor: return getMultilevelState(device.getHumidity()); case TemperatureSensor: return getMultilevelState(device.getTemperature()); case LightSensor: return getMultilevelState(device.getLight()); - case ZWaveInterface: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case InsteonInterface: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case PowerMeter: return getMultilevelState(device.getLevel()); - case AlarmPanel: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case AlarmPartition: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Siren: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Weather: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case PhilipsController: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; - case Appliance: // TODO - logger.warn("TODO: {}, {}", device, device.getCategoryType()); - break; case UVSensor: return getMultilevelState(device.getLevel()); + case Camera: + case AV: + case ZWaveInterface: + case InsteonInterface: + case RemoteControl: + case IRTransmitter: + case GenericIO: + case SerialPort: + case AlarmPanel: + case AlarmPartition: + case Siren: + case Weather: + case PhilipsController: + case Appliance: + logger.warn("TODO: {}, {}", device, device.getCategoryType()); + break; case Unknown: logger.warn("Unknown device type: {}, {}", device, device.getCategory()); break;