diff options
16 files changed, 3 insertions, 60 deletions
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java index a70392e8..8a480203 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Abstime.java @@ -40,8 +40,6 @@ public class Abstime extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java index aa30748d..b3caf5e8 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Bool.java @@ -18,8 +18,6 @@ public class Bool extends Obj{ @XmlAttribute(name = "val") protected Boolean val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java index 66e19f88..cca019e1 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Date.java @@ -40,8 +40,6 @@ public class Date extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java index f1fc4d39..7a6d6e9c 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Enum.java @@ -35,8 +35,6 @@ public class Enum extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java index fa20dcee..d3f9496e 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Err.java @@ -16,8 +16,7 @@ import javax.xml.bind.annotation.XmlType; @XmlRootElement public class Err extends Obj{ - @XmlAttribute(name = "name") - protected String name; + @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java index b7c228ca..cf63d293 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Feed.java @@ -31,8 +31,6 @@ public class Feed extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java index 1595ed99..24061a02 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Int.java @@ -20,8 +20,6 @@ public class Int extends Obj{ @XmlAttribute(name = "val") protected BigInteger val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java index 456bd80c..53d24a09 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/List.java @@ -16,31 +16,10 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "list", propOrder = { - "objGroup" -}) +@XmlType(name = "list") @XmlRootElement public class List extends Obj{ - @XmlElements({ - @XmlElement(name = "obj", type = Obj.class), - @XmlElement(name = "bool", type = Bool.class), - @XmlElement(name = "int", type = Int.class), - @XmlElement(name = "real", type = Real.class), - @XmlElement(name = "str", type = Str.class), - @XmlElement(name = "enum", type = Enum.class), - @XmlElement(name = "abstime", type = Abstime.class), - @XmlElement(name = "reltime", type = Reltime.class), - @XmlElement(name = "date", type = Date.class), - @XmlElement(name = "time", type = Time.class), - @XmlElement(name = "uri", type = Uri.class), - @XmlElement(name = "list", type = List.class), - @XmlElement(name = "ref", type = Ref.class), - @XmlElement(name = "err", type = Err.class), - @XmlElement(name = "op", type = Op.class), - @XmlElement(name = "feed", type = Feed.class) - }) - protected java.util.List<Object> objGroup; @XmlAttribute(name = "of") protected String of; @XmlAttribute(name = "min") @@ -62,8 +41,6 @@ public class List extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") @@ -107,12 +84,6 @@ public class List extends Obj{ * * */ - public java.util.List<Object> getObjGroup() { - if (objGroup == null) { - objGroup = new ArrayList<Object>(); - } - return this.objGroup; - } /** * Obtient la valeur de la propriété of. diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java index ca6349e6..5d1e3dcf 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Op.java @@ -21,8 +21,6 @@ public class Op extends Obj{ protected Contract in; @XmlTransient protected Contract out; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java index fe5e2174..34b78eff 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Real.java @@ -17,8 +17,6 @@ public class Real extends Obj{ @XmlAttribute(name = "val") protected Double val; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java index b1e1b3d3..4e2c0407 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Ref.java @@ -31,10 +31,6 @@ public class Ref extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; - @XmlAttribute(name = "href") - protected String href; @XmlAttribute(name = "null") protected Boolean _null; diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java index c1c3d094..6c757299 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Reltime.java @@ -23,8 +23,6 @@ public class Reltime extends Obj{ @XmlAttribute(name = "max") @XmlSchemaType(name = "time") protected XMLGregorianCalendar max; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java index 1d80cb2c..c33bbf65 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Str.java @@ -37,8 +37,6 @@ public class Str extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java index 4467b350..59ee8489 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Time.java @@ -25,8 +25,6 @@ public class Time extends Obj{ protected XMLGregorianCalendar max; @XmlAttribute(name = "tz") protected String tz; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java index b538b623..33bb51bc 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/obix/Uri.java @@ -34,8 +34,6 @@ public class Uri extends Obj{ protected String unit; @XmlAttribute(name = "writable") protected Boolean writable; - @XmlAttribute(name = "name") - protected String name; @XmlAttribute(name = "href") protected String href; @XmlAttribute(name = "null") diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java index fccb93d7..2ac89bca 100644 --- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java +++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Notify.java @@ -69,6 +69,7 @@ public class Notify { @XmlElement(namespace = "http://uri.etsi.org/m2m", required = true)
protected StatusCode statusCode;
+ @XmlElement(required = true)
protected Base64Binary representation;
@XmlElement(required = true)
@XmlSchemaType(name = "anyURI")
|