Using @XmlType instead of @XmlRootElement for non root types

gebhardt · gebhardt · commit 8825d2b421c4 · 2012-06-01T08:43:39.000+02:00
Only JAXBPlist is a root element and JAXBArray, JAXBDict etc. are only types XML types
but do not need an XSD element declaration as they can only exist inside a Plist type.

Change-Id: I70860632b29f342d68cf6bc030e9241893eccf67
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBArray.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBArray.java
@@ -21,12 +21,12 @@
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import com.sap.prd.mobile.ios.mios.xcodeprojreader.Array;
 
-@XmlRootElement(name = "array")
+@XmlType(name = "array")
 @XmlJavaTypeAdapter(JAXBArrayAdapter.class)
 public class JAXBArray
 {
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBDict.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBDict.java
@@ -21,11 +21,11 @@
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import com.sap.prd.mobile.ios.mios.xcodeprojreader.Array;
 
-@XmlRootElement(name = "dict")
+@XmlType(name = "dict")
 public class JAXBDict
 {
 
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBFalse.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBFalse.java
@@ -1,8 +1,8 @@
 package com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
-@XmlRootElement(name = "false")
+@XmlType(name = "false")
 public class JAXBFalse
 {
 }
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBKey.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBKey.java
@@ -19,10 +19,10 @@
  */
 package com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-@XmlRootElement(name = "key")
+@XmlType(name = "key")
 public class JAXBKey
 {
   private String value;
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBTrue.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBTrue.java
@@ -1,8 +1,8 @@
 package com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
-@XmlRootElement(name = "true")
+@XmlType(name = "true")
 public class JAXBTrue
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb;`
`2`	`2`
`3`		`-import javax.xml.bind.annotation.XmlRootElement;`
	`3`	`+import javax.xml.bind.annotation.XmlType;`
`4`	`4`
`5`		`-@XmlRootElement(name = "false")`
	`5`	`+@XmlType(name = "false")`
`6`	`6`	`public class JAXBFalse`
`7`	`7`	`{`
`8`	`8`	`}`