diff options
Diffstat (limited to 'org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java')
| -rw-r--r-- | org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java index 84e0f61b..e02b3072 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java @@ -1,6 +1,6 @@ /* ******************************************************************************** - * Copyright (c) 2014, 2017 Orange. + * Copyright (c) 2014, 2018 Orange. * 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 @@ -9,9 +9,9 @@ Device : DeviceFloodDetectorAnnc -A door is a door. -Created: 2018-06-11 12:14:18 + +Created: 2018-06-29 17:19:56 */ package org.eclipse.om2m.commons.resource.flexcontainerspec; @@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import org.eclipse.om2m.commons.resource.AbstractFlexContainer; import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc; - @XmlRootElement(name = DeviceFloodDetectorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = DeviceFloodDetectorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain") @@ -37,12 +37,12 @@ public class DeviceFloodDetectorFlexContainerAnnc extends AbstractFlexContainerA setContainerDefinition("org.onem2m.home.device." + DeviceFloodDetectorFlexContainer.LONG_NAME); setLongName(LONG_NAME); setShortName(SHORT_NAME); - } + } public void finalizeSerialization() { getWaterSensor(); getWaterSensorAnnc(); - } + } public void finalizeDeserialization() { if (this.waterSensor != null) { @@ -50,14 +50,12 @@ public class DeviceFloodDetectorFlexContainerAnnc extends AbstractFlexContainerA } if (this.waterSensorAnnc != null) { setWaterSensorAnnc(this.waterSensorAnnc); - } - + } } - - @XmlElement(name="watSr", required=true, type=WaterSensorFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain") + + @XmlElement(name=WaterSensorFlexContainer.SHORT_NAME, required=true, type=WaterSensorFlexContainer.class, namespace="http://www.onem2m.org/xml/protocols/homedomain") private WaterSensorFlexContainer waterSensor; - - + public void setWaterSensor(WaterSensorFlexContainer waterSensor) { this.waterSensor = waterSensor; getFlexContainerOrContainerOrSubscription().add(waterSensor); @@ -68,10 +66,9 @@ public class DeviceFloodDetectorFlexContainerAnnc extends AbstractFlexContainerA return waterSensor; } - @XmlElement(name="watSrAnnc", required=true, type=WaterSensorFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain") + @XmlElement(name=WaterSensorFlexContainerAnnc.SHORT_NAME, required=true, type=WaterSensorFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain") private WaterSensorFlexContainerAnnc waterSensorAnnc; - - + public void setWaterSensorAnnc(WaterSensorFlexContainerAnnc waterSensorAnnc) { this.waterSensorAnnc = waterSensorAnnc; getFlexContainerOrContainerOrSubscription().add(waterSensorAnnc); @@ -82,4 +79,4 @@ public class DeviceFloodDetectorFlexContainerAnnc extends AbstractFlexContainerA return waterSensorAnnc; } -}
\ No newline at end of file +} |