Skip to content

Commit b47f26d

Browse files
BobHansonBobHanson
committed
@XmlEnum, @XmlEnumValue tests (were already working)
1 parent e529804 commit b47f26d

File tree

5 files changed

+87
-17
lines changed

5 files changed

+87
-17
lines changed

‎sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBClass.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ private void removeField(String javaName) {
214214
for (int i = fields.size(); --i >= 0;) {
215215
if (javaName.equals(fields.get(i).javaName)) {
216216
fields.remove(i);
217-
System.out.println("jsjaxbclass (ignored)");
218217
marshallerFieldMap.remove(javaName);
219218
break;
220219
}

‎sources/net.sf.j2s.java.core/src/test/jaxb/FilterBy.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
//
2+
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
3+
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4+
// Any modifications to this file will be lost upon recompilation of the source schema.
5+
// Generated on: 2018.12.20 at 11:47:26 AM GMT
6+
//
7+
8+
9+
package test.jaxb;
10+
11+
import javax.xml.bind.annotation.XmlEnum;
12+
import javax.xml.bind.annotation.XmlEnumValue;
13+
import javax.xml.bind.annotation.XmlType;
14+
15+
16+
/**
17+
* <p>Java class for FilterBy.
18+
*
19+
* <p>The following schema fragment specifies the expected content contained within this class.
20+
* <p>
21+
* <pre>
22+
* &lt;simpleType name="FilterBy">
23+
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
24+
* &lt;enumeration value="byLabel"/>
25+
* &lt;enumeration value="byScore"/>
26+
* &lt;enumeration value="byAttribute"/>
27+
* &lt;/restriction>
28+
* &lt;/simpleType>
29+
* </pre>
30+
*
31+
*/
32+
@XmlType(name = "FilterBy", namespace = "www.jalview.org/colours")
33+
@XmlEnum
34+
public enum FilterBy {
35+
36+
@XmlEnumValue("byLabel")
37+
BY_LABEL("byLabel"),
38+
@XmlEnumValue("byScore")
39+
BY_SCORE("byScore"),
40+
@XmlEnumValue("byAttribute")
41+
BY_ATTRIBUTE("byAttribute");
42+
private final String value;
43+
44+
FilterBy(String v) {
45+
value = v;
46+
}
47+
48+
public String value() {
49+
return value;
50+
}
51+
52+
public static FilterBy fromValue(String v) {
53+
for (FilterBy c: FilterBy.values()) {
54+
if (c.value.equals(v)) {
55+
return c;
56+
}
57+
}
58+
throw new IllegalArgumentException(v);
59+
}
60+
61+
}

‎sources/net.sf.j2s.java.core/src/test/jaxb/Root_ORDERED.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
@XmlAccessorType(XmlAccessType.FIELD)
3737
@XmlType(propOrder = {
3838
// "qname",
39+
"filter",
3940
"f5", "position",
4041
"iii",
4142
"IFArray", "IFList",
@@ -74,6 +75,8 @@ public Root_ORDERED(String name) {
7475

7576
id = "id#1";
7677

78+
filter = FilterBy.BY_LABEL;
79+
7780
hm.put("testing", "TESTING");
7881
hm.put("null", null);
7982
hm.put("map", new SomewhatComplex("map"));
@@ -162,6 +165,7 @@ public void validate() {
162165
// assert(qname.getLocalPart().equals("name"));
163166
// assert(qname.getNamespaceURI().equals("namespace"));
164167
assert(id.equals("test"));
168+
assert(filter == FilterBy.BY_LABEL);
165169
assert(position.toString().equals("12345678910"));
166170
assert(extraAttr.equals("more&amp;"));
167171
assert(extraElem.equals("more&amp;"));
@@ -200,6 +204,7 @@ public void validate() {
200204
@XmlSchemaType(name = "xs:unsignedLong") // ignored by JAXB?
201205
private BigInteger position;
202206

207+
203208
@XmlElements({
204209
@XmlElement(name="int", type = Integer.class),
205210
@XmlElement(name="float", type = Float.class)
@@ -278,6 +283,9 @@ public String toString() {
278283

279284
private final static String x = "date";
280285

286+
@XmlElement
287+
private FilterBy filter;
288+
281289
@XmlElement(namespace="")
282290
@XmlSchemaType(name=x)
283291
protected XMLGregorianCalendar creationDate;

‎sources/net.sf.j2s.java.core/src/test/jaxb_ordered_from_JS.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<ns2:Root_ORDERED xmlns:ns2="root.ordered" xmlns:ns3="package-namespace" xmlns:ns4="testing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" date="2018-10-20T05:00:00.000Z" byteshex="6465" bytes64="ZGU=" moreAttr="more&amp;amp;" ok="ok" id="test" type="cust">
3+
<ns3:filter xmlns:ns5="www.jalview.org/colours">byLabel</ns3:filter>
34
<ns3:f5 xsi:type="xs:float">1.25</ns3:f5>
4-
<ns3:f5 xmlns:ns5="stolaf.edu" xsi:type="ns5:objclass" xmlns:ns6="www.jalview.org" id="jaxb2.obj">
5-
<ns6:Obj1>jaxb#Obj1</ns6:Obj1></ns3:f5>
5+
<ns3:f5 xmlns:ns6="stolaf.edu" xsi:type="ns6:objclass" xmlns:ns7="www.jalview.org" id="jaxb2.obj">
6+
<ns7:Obj1>jaxb#Obj1</ns7:Obj1></ns3:f5>
67
<ns3:position>12345678910</ns3:position>
78
<ns4:what xsi:type="xs:int">3</ns4:what>
89
<ns3:int>2</ns3:int>
@@ -19,9 +20,9 @@
1920
</entry>
2021
<entry>
2122
<key>map</key>
22-
<value xmlns:ns7="st.Olaf" xsi:type="ns7:MoreComplex" xmlns:ns8="www.jalview.org2" ns8:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
23-
<ns7:id>id#map</ns7:id>
24-
<ns7:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns7:ca></value>
23+
<value xmlns:ns8="st.Olaf" xsi:type="ns8:MoreComplex" xmlns:ns9="www.jalview.org2" ns9:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
24+
<ns8:id>id#map</ns8:id>
25+
<ns8:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns8:ca></value>
2526
</entry>
2627
</ns3:hm1>
2728
<ns3:hm2>
@@ -37,15 +38,15 @@
3738
<value>V3</value>
3839
</entry>
3940
</ns3:hm2>
40-
<ns3:cx xmlns:ns7="st.Olaf" xmlns:ns8="www.jalview.org2" ns8:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="Y2U=">
41-
<ns7:id>id##??</ns7:id>
42-
<ns7:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns7:ca></ns3:cx>
43-
<ns3:list0 xmlns:ns7="st.Olaf" xsi:type="ns7:MoreComplex" xmlns:ns8="www.jalview.org2" ns8:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
44-
<ns7:id>id#List</ns7:id>
45-
<ns7:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns7:ca></ns3:list0>
41+
<ns3:cx xmlns:ns8="st.Olaf" xmlns:ns9="www.jalview.org2" ns9:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="Y2U=">
42+
<ns8:id>id##??</ns8:id>
43+
<ns8:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns8:ca></ns3:cx>
44+
<ns3:list0 xmlns:ns8="st.Olaf" xsi:type="ns8:MoreComplex" xmlns:ns9="www.jalview.org2" ns9:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
45+
<ns8:id>id#List</ns8:id>
46+
<ns8:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns8:ca></ns3:list0>
4647
<ns3:list0 xsi:type="xs:string">list0[1]</ns3:list0>
4748
<ns3:list0 xsi:type="xs:string">list0[2]</ns3:list0>
48-
<creationDate>2020-01-13-06:00</creationDate>
49+
<creationDate>2020-01-14-06:00</creationDate>
4950
<ns3:c>c</ns3:c>
5051
<ns3:b>b</ns3:b>
5152
<ns3:a>a</ns3:a>
@@ -57,9 +58,9 @@
5758
<ns3:list1>
5859
<ns3:list xsi:type="xs:string">TESTING</ns3:list>
5960
<ns3:list xsi:type="xs:string">null</ns3:list>
60-
<ns3:list xmlns:ns7="st.Olaf" xsi:type="ns7:MoreComplex" xmlns:ns8="www.jalview.org2" ns8:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
61-
<ns7:id>id#idList#1</ns7:id>
62-
<ns7:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns7:ca></ns3:list>
61+
<ns3:list xmlns:ns8="st.Olaf" xsi:type="ns8:MoreComplex" xmlns:ns9="www.jalview.org2" ns9:cb="c&quot;&amp;lt;&amp;gt;b&amp;amp; &#8491;" bytes="ZGU=">
62+
<ns8:id>id#idList#1</ns8:id>
63+
<ns8:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns8:ca></ns3:list>
6364
<ns3:list xsi:type="xs:boolean">true</ns3:list>
6465
<ns3:list xsi:type="xs:byte">1</ns3:list>
6566
<ns3:list xsi:type="xs:short">2</ns3:list>

‎sources/net.sf.j2s.java.core/src/test/jaxb_ordered_from_Java.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<ns8:RootO xmlns:ns2="www.jalview.org" xmlns:ns3="root.field" xmlns:ns4="package-namespace" xmlns:ns5="testing" xmlns:ns6="st.Olaf" xmlns:ns7="www.jalview.org2" xmlns:ns8="root.ordered" type="cust" id="test" bytes64="ZGU=" byteshex="6465" date="2018-10-20T00:00:00-05:00" moreAttr="more&amp;amp;" ok="ok">
3+
<ns4:filter>byLabel</ns4:filter>
34
<ns4:f5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:float">1.25</ns4:f5>
45
<ns4:f5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns10="stolaf.edu" xsi:type="ns10:objclass" id="jaxb2.obj">
56
<ns2:Obj1>jaxb#Obj1</ns2:Obj1>
@@ -49,7 +50,7 @@
4950
</ns4:list0>
5051
<ns4:list0 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">list0[1]</ns4:list0>
5152
<ns4:list0 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">list0[2]</ns4:list0>
52-
<creationDate>2020-01-13-06:00</creationDate>
53+
<creationDate>2020-01-14-06:00</creationDate>
5354
<ns4:c>c</ns4:c>
5455
<ns4:b>b</ns4:b>
5556
<ns4:a>a</ns4:a>

0 commit comments

Comments
 (0)