<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>asxsd/trunk/src</tt></b></td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/asxsd/<a href="#file1">MappingRegistryFactory.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">153 -> 154</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/asxsd/components/<a href="#file2"><span id="added">UnionSimpleTypeComponent.java</span></a></tt> </td><td></td><td align="right" id="added">+28</td><td></td><td nowrap="nowrap" align="right">added 154</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/asxsd/schemas/<a href="#file3"><span id="added">UnionSimpleTypeTest.java</span></a></tt> </td><td></td><td align="right" id="added">+16</td><td></td><td nowrap="nowrap" align="right">added 154</td></tr>
<tr class="alt"><td><tt>test/resources/xsd/<a href="#file4"><span id="added">UnionSimpleTypeTest.xsd</span></a></tt> </td><td></td><td align="right" id="added">+20</td><td></td><td nowrap="nowrap" align="right">added 154</td></tr>
<tr><td></td><td></td><td align="right" id="added">+69</td><td></td><td></td></tr>
</table>
<small id="info">3 added + 1 modified, total 4 files</small><br />
<pre class="comment">
simplistic support for 'union' simple types
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>MappingRegistryFactory.java</b></big> <small id="info">153 -> 154</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingRegistryFactory.java 2007-09-10 23:18:36 UTC (rev 153)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingRegistryFactory.java 2007-09-10 23:39:39 UTC (rev 154)
@@ -20,8 +20,10 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.components.MultiplyOccuringParticleComponent;
import uk.co.badgersinfoil.asxsd.components.OptionallyOccuringParticleComponent;
import uk.co.badgersinfoil.asxsd.components.SequenceMappingComponent;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.asxsd.components.SimpleContentComponent;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.components.SinglyOccuringParticleComponent;
import uk.co.badgersinfoil.asxsd.components.StringSimpleTypeComponent;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.asxsd.components.UnionSimpleTypeComponent;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.components.UnknownSimpleTypeComponent;
// TODO: Spring?
</pre><pre class="diff"><small id="info">@@ -41,6 +43,8 @@
</small></pre><pre class="diff" id="context"> reg.register(new FloatSimpleTypeComponent());
reg.register(new IntSimpleTypeComponent());
reg.register(new SequenceMappingComponent());
</pre><pre class="diff" id="added">+ // must come before any other simpleTypes
+ reg.register(new SimpleContentComponent());
</pre><pre class="diff" id="context"> reg.register(new StringSimpleTypeComponent("string", "http://www.w3.org/2001/XMLSchema"));
// too big for Flash's Number type, so treat as a String
reg.register(new StringSimpleTypeComponent("long", "http://www.w3.org/2001/XMLSchema"));
</pre><pre class="diff"><small id="info">@@ -62,6 +66,7 @@
</small></pre><pre class="diff" id="context"> reg.register(new AttributeUseComponent());
reg.register(new AttributeDeclarationComponent());
reg.register(new ModelGroupParticleComponent());
</pre><pre class="diff" id="added">+ reg.register(new UnionSimpleTypeComponent());
</pre><pre class="diff" id="context"> return reg;
}
}
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="added">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader" id="added"><big><b>UnionSimpleTypeComponent.java</b></big> <small id="info">added at 154</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/UnionSimpleTypeComponent.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/UnionSimpleTypeComponent.java 2007-09-10 23:39:39 UTC (rev 154)
@@ -0,0 +1,28 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.asxsd.components;
+
+import org.eclipse.xsd.XSDConcreteComponent;
+import org.eclipse.xsd.XSDSimpleTypeDefinition;
+import org.eclipse.xsd.XSDVariety;
+import uk.co.badgersinfoil.asxsd.CodegenContext;
+import uk.co.badgersinfoil.asxsd.MappingFunction;
+import uk.co.badgersinfoil.asxsd.TypeDescriptor;
+
+/**
+ * Just treats unions as Strings
+ */
+public class UnionSimpleTypeComponent extends AbstractSimpleTypeComponent {
+
+ protected TypeDescriptor getTypeDescriptorFor(CodegenContext context,
+ XSDSimpleTypeDefinition simpleType)
+ {
+ return new TypeDescriptor("String", false, null);
+ }
+
+ public MappingFunction functionFor(CodegenContext context, XSDConcreteComponent component) {
+ return IdentityMappingFunction.INSTANCE;
+ }
+
+ protected boolean willAcceptType(XSDSimpleTypeDefinition simpleType) {
+ return simpleType.getVariety() == XSDVariety.UNION_LITERAL;
+ }
+}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname" id="added">asxsd/trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas</span><br />
<div class="fileheader" id="added"><big><b>UnionSimpleTypeTest.java</b></big> <small id="info">added at 154</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/UnionSimpleTypeTest.java (rev 0)
+++ trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/UnionSimpleTypeTest.java 2007-09-10 23:39:39 UTC (rev 154)
@@ -0,0 +1,16 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.asxsd.schemas;
+
+import uk.co.badgersinfoil.metaas.dom.ASClassType;
+import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
+import uk.co.badgersinfoil.metaas.dom.ASField;
+
+public class UnionSimpleTypeTest extends SchemaTestCase {
+ public void testClassName() {
+ ASCompilationUnit unit = (ASCompilationUnit)project.getCompilationUnits().get(0);
+ ASClassType clazz = (ASClassType)unit.getType();
+ assertEquals("Test", clazz.getName());
+
+ ASField a = clazz.getField("a");
+ assertEquals("String", a.getType());
+ }
+}
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname" id="added">asxsd/trunk/src/test/resources/xsd</span><br />
<div class="fileheader" id="added"><big><b>UnionSimpleTypeTest.xsd</b></big> <small id="info">added at 154</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/resources/xsd/UnionSimpleTypeTest.xsd (rev 0)
+++ trunk/src/test/resources/xsd/UnionSimpleTypeTest.xsd 2007-09-10 23:39:39 UTC (rev 154)
@@ -0,0 +1,20 @@
</small></pre><pre class="diff" id="added">+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:t="http://example.org/test"
+ targetNamespace="http://example.org/test">
+ <complexType name="Test">
+ <attribute name="a" type="t:Simp">
+ </attribute>
+ </complexType>
+
+ <simpleType name="Simp">
+ <union>
+ <simpleType>
+ <restriction base="NMTOKEN"/>
+ </simpleType>
+ <simpleType>
+ <restriction base="int"/>
+ </simpleType>
+ </union>
+ </simpleType>
+</schema>
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>