sdt.home: clear domain on exception.
Bug fix when an exception is thrown from a module constructor: remove
the module from the domain.
Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com>
Signed-off-by: Cyrille Bareau <cyrille.bareau@orange.com>
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java
index 09ad5af..8ce043e 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java
@@ -33,7 +33,7 @@
super(name, domain, type);
if ((alarm == null) ||
! alarm.getShortDefinitionType().equals(DatapointType.alarm.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong alarm datapoint: " + alarm);
}
this.alarm = alarm;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java
index 885be4c..0089eb9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java
@@ -31,7 +31,7 @@
if ((alarmStatus == null) ||
! alarmStatus.getShortDefinitionType().equals(DatapointType.alarmStatus.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong alarmStatus datapoint: " + alarmStatus);
}
this.alarmStatus = alarmStatus;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AtmosphericPressureSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AtmosphericPressureSensor.java
index 8755892..b80ea26 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AtmosphericPressureSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AtmosphericPressureSensor.java
@@ -28,7 +28,7 @@
if ((atmosphericPressure == null) ||
! atmosphericPressure.getShortDefinitionType().equals(DatapointType.atmosphericPressure.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong atmosphericPressure datapoint: " + atmosphericPressure);
}
this.atmosphericPressure = atmosphericPressure;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java
index c9dae5e..4facd7d 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java
@@ -41,7 +41,7 @@
if ((muteEnabled == null) ||
! muteEnabled.getShortDefinitionType().equals(DatapointType.muteEnabled.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong muteEnabled datapoint: " + muteEnabled);
}
this.muteEnabled = muteEnabled;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java
index 8ef547e..51e920f 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java
@@ -40,7 +40,7 @@
if ((powerState == null) ||
! powerState.getShortDefinitionType().equals(DatapointType.powerState.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong powerState datapoint: " + powerState);
}
this.powerState = powerState;
@@ -69,9 +69,6 @@
}
public void setToggle(Toggle toggle) {
-// this.toggle = toggle;
-// this.toggle.setDoc("Toggle the switch");
-// super.addAction(toggle);
addAction(toggle);
}
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java
index 25a6335..4d3bea9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java
@@ -27,7 +27,7 @@
if ((status == null) ||
! status.getShortDefinitionType().equals(DatapointType.status.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong status datapoint: " + status);
}
this.status = status;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiling.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiling.java
index 0e2c9c0..bc65e69 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiling.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiling.java
@@ -27,7 +27,7 @@
if ((status == null) ||
! status.getShortDefinitionType().equals(DatapointType.status.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong status datapoint: " + status);
}
this.status = status;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brewing.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brewing.java
index 6b3eafb..da36647 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brewing.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brewing.java
@@ -22,7 +22,7 @@
if ((cupsNumber == null) ||
! cupsNumber.getShortDefinitionType().equals(DatapointType.cupsNumber.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong cupsNumber datapoint: " + cupsNumber);
}
this.cupsNumber = cupsNumber;
@@ -31,7 +31,7 @@
if ((strength == null) ||
! strength.getShortDefinitionType().equals(DatapointType.strength.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong strength datapoint: " + strength);
}
this.strength = strength;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java
index 1d0e30e..23b86fc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java
@@ -27,7 +27,7 @@
if ((brightness == null) ||
! brightness.getShortDefinitionType().equals(DatapointType.brightness.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong brightness datapoint: " + brightness);
}
this.brightness = brightness;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java
index f638d6e..2596520 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java
@@ -31,7 +31,7 @@
if ((currentDate == null) ||
! currentDate.getShortDefinitionType().equals(DatapointType.currentDate.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong currentDate datapoint: " + currentDate);
}
this.currentDate = currentDate;
@@ -40,7 +40,7 @@
if ((currentTime == null) ||
! currentTime.getShortDefinitionType().equals(DatapointType.currentTime.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong currentTime datapoint: " + currentTime);
}
this.currentTime = currentTime;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java
index 10f9215..bc8cae3 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java
@@ -31,7 +31,7 @@
if ((red == null) ||
! red.getShortDefinitionType().equals(DatapointType.red.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong red datapoint: " + red);
}
this.red = red;
@@ -40,7 +40,7 @@
if ((green == null) ||
! green.getShortDefinitionType().equals(DatapointType.green.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong green datapoint: " + green);
}
this.green = green;
@@ -49,7 +49,7 @@
if ((blue == null) ||
! blue.getShortDefinitionType().equals(DatapointType.blue.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong blue datapoint: " + blue);
}
this.blue = blue;
@@ -88,13 +88,4 @@
blue.setValue(value);
}
- public void setValues(Integer red, Integer green, Integer blue) throws DataPointException, AccessException {
- if (red != null)
- setRed(red);
- if (green != null)
- setGreen(green);
- if (blue != null)
- setBlue(blue);
- }
-
}
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java
index 4a0ebec..a415254 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java
@@ -28,7 +28,7 @@
if ((colourSat == null) ||
! colourSat.getShortDefinitionType().equals(DatapointType.colourSat.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong colourSat datapoint: " + colourSat);
}
this.colourSat = colourSat;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java
index a381ebf..b36cf4c 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java
@@ -34,7 +34,7 @@
if ((state == null) ||
! state.getShortDefinitionType().equals(DatapointType.doorState.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong doorState datapoint: " + state);
}
this.doorState = state;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java
index 85e9edf..a2019fd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java
@@ -39,7 +39,7 @@
if ((power == null) ||
! power.getShortDefinitionType().equals(DatapointType.power.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong power datapoint: " + power);
}
this.power = power;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ExtendedCarbonDioxideSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ExtendedCarbonDioxideSensor.java
index f6332ab..5113490 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ExtendedCarbonDioxideSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ExtendedCarbonDioxideSensor.java
@@ -28,7 +28,7 @@
if ((carbonDioxideValue == null) ||
! carbonDioxideValue.getShortDefinitionType().equals(DatapointType.carbonDioxideValue.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong carbonDioxideValue datapoint: " + carbonDioxideValue);
}
this.carbonDioxideValue = carbonDioxideValue;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java
index 2008e24..bb329f9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java
@@ -31,7 +31,7 @@
if ((status == null) ||
! status.getShortDefinitionType().equals(DatapointType.status.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong status datapoint: " + status);
}
this.status = status;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java
index 5d27b20..af99c52 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java
@@ -27,7 +27,7 @@
if ((foamingStrength == null) ||
! foamingStrength.getShortDefinitionType().equals(DatapointType.foamingStrength.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong foamingStrength datapoint: " + foamingStrength);
}
this.foamingStrength = foamingStrength;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java
index e94b451..283c423 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java
@@ -29,7 +29,7 @@
super(name, domain, identifiers);
if (value == null) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong value datapoint: " + value);
}
this.value = value;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java
index cfa119e..001d8cd 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java
@@ -32,7 +32,7 @@
if ((useGrinder == null) ||
! useGrinder.getShortDefinitionType().equals(DatapointType.useGrinder.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong useGrinder datapoint: " + useGrinder);
}
this.useGrinder = useGrinder;
@@ -41,7 +41,7 @@
if ((coarseness == null) ||
! coarseness.getShortDefinitionType().equals(DatapointType.coarseness.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong coarseness datapoint: " + coarseness);
}
this.coarseness = coarseness;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java
index 572b47d..4c5ebd4 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java
@@ -28,7 +28,7 @@
if ((status == null) ||
! status.getShortDefinitionType().equals(DatapointType.status.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong status datapoint: " + status);
}
this.status = status;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java
index a545266..69a9fdf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java
@@ -27,7 +27,7 @@
if ((liquidLevel == null) ||
! liquidLevel.getShortDefinitionType().equals(DatapointType.liquidLevel.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong liquidLevel datapoint: " + liquidLevel);
}
this.liquidLevel = liquidLevel;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java
index 2487c4a..eb132f5 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java
@@ -34,7 +34,7 @@
if ((doorLock == null) ||
! doorLock.getShortDefinitionType().equals(DatapointType.doorLock.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong doorLock datapoint: " + doorLock);
}
this.doorLock = doorLock;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Noise.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Noise.java
index 1ae7a62..469f9c7 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Noise.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Noise.java
@@ -26,7 +26,7 @@
super(name, domain, ModuleType.noise);
if ((noise == null) ||
! noise.getShortDefinitionType().equals(DatapointType.noise.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong noise datapoint: " + noise);
}
this.noise = noise;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java
index 8fb50be..0ad2e3b 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java
@@ -28,7 +28,7 @@
super(name, domain, ModuleType.personSensor);
if ((detectedPersons == null) ||
! detectedPersons.getShortDefinitionType().equals(DatapointType.detectedPersons.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong detectedPersons datapoint: " + detectedPersons);
}
this.detectedPersons = detectedPersons;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java
index 6305d85..31ecfaf 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java
@@ -28,7 +28,7 @@
if ((pushed == null) ||
! pushed.getShortDefinitionType().equals(DatapointType.pushed.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong pushed datapoint: " + pushed);
}
this.pushed = pushed;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java
index 12c4f7d..8948642 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java
@@ -30,7 +30,7 @@
if ((relativeHumidity == null) ||
! relativeHumidity.getShortDefinitionType().equals(DatapointType.relativeHumidity.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong relativeHumidity datapoint: " + relativeHumidity);
}
this.relativeHumidity = relativeHumidity;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunMode.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunMode.java
index 59d7dc8..cde09bb 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunMode.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunMode.java
@@ -33,7 +33,7 @@
if ((operationMode == null) ||
! operationMode.getShortDefinitionType().equals(DatapointType.operationMode.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong operationMode datapoint: " + operationMode);
}
this.operationMode = operationMode;
@@ -42,7 +42,7 @@
if ((supportedModes == null) ||
! supportedModes.getShortDefinitionType().equals(DatapointType.supportedModes.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong supportedModes datapoint: " + supportedModes);
}
this.supportedModes = supportedModes;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java
index f51f93e..c20af95 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java
@@ -38,7 +38,7 @@
if ((jobState == null) ||
! jobState.getShortDefinitionType().equals(DatapointType.currentJobState.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong currentJobState datapoint: " + jobState);
}
this.currentJobState = jobState;
@@ -47,7 +47,7 @@
if ((jobStates == null) ||
! jobStates.getShortDefinitionType().equals(DatapointType.jobStates.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong jobStates datapoint: " + jobStates);
}
this.jobStates = jobStates;
@@ -57,7 +57,7 @@
if ((machineState == null) ||
! machineState.getShortDefinitionType().equals(DatapointType.currentMachineState.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong currentMachineState datapoint: " + machineState);
}
this.currentMachineState = machineState;
@@ -66,7 +66,7 @@
if ((machineStates == null) ||
! machineStates.getShortDefinitionType().equals(DatapointType.machineStates.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong machineStates datapoint: " + machineStates);
}
this.machineStates = machineStates;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Streaming.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Streaming.java
index 08ef662..207d906 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Streaming.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Streaming.java
@@ -31,7 +31,7 @@
super(name, domain, ModuleType.streaming);
if ((url == null) ||
! url.getShortDefinitionType().equals(DatapointType.url.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong url datapoint: " + url);
}
this.url = url;
@@ -40,7 +40,7 @@
if ((login == null) ||
! login.getShortDefinitionType().equals(DatapointType.login.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong login datapoint: " + login);
}
this.login = login;
@@ -49,7 +49,7 @@
if ((password == null) ||
! password.getShortDefinitionType().equals(DatapointType.password.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong password datapoint: " + password);
}
this.password = password;
@@ -58,7 +58,7 @@
if ((format == null) ||
! format.getShortDefinitionType().equals(DatapointType.format.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong format datapoint: " + format);
}
this.format = format;
diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java
index 5d68ce5..9f7cdcc 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java
@@ -33,7 +33,7 @@
if ((currentTemperature == null) ||
! currentTemperature.getShortDefinitionType().equals(DatapointType.currentTemperature.getShortName())) {
- domain.removeDevice(name);
+ domain.removeModule(getName());
throw new IllegalArgumentException("Wrong currentTemperature datapoint: " + currentTemperature);
}
this.currentTemperature = currentTemperature;
