<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/components/<a href="#file1">OptionallyOccuringParticleComponent.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">183 -> 184</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/asxsd/schemas/<a href="#file2"><span id="added">OptionalComplexElementTest.java</span></a></tt> </td><td></td><td align="right" id="added">+13</td><td></td><td nowrap="nowrap" align="right">added 184</td></tr>
<tr><td><tt> /<a href="#file3"><span id="added">OptionalElementTest.java</span></a></tt> </td><td></td><td align="right" id="added">+11</td><td></td><td nowrap="nowrap" align="right">added 184</td></tr>
<tr class="alt"><td><tt>test/resources/xsd/<a href="#file4"><span id="added">OptionalComplexElementTest.xsd</span></a></tt> </td><td></td><td align="right" id="added">+17</td><td></td><td nowrap="nowrap" align="right">added 184</td></tr>
<tr><td><tt> /<a href="#file5"><span id="added">OptionalElementTest.xsd</span></a></tt> </td><td></td><td align="right" id="added">+10</td><td></td><td nowrap="nowrap" align="right">added 184</td></tr>
<tr><td></td><td></td><td align="right" id="added">+55</td><td></td><td></td></tr>
</table>
<small id="info">4 added + 1 modified, total 5 files</small><br />
<pre class="comment">
fixes for handling of optional elements of different kinds
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>OptionallyOccuringParticleComponent.java</b></big> <small id="info">183 -> 184</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/OptionallyOccuringParticleComponent.java 2007-11-11 23:29:59 UTC (rev 183)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/OptionallyOccuringParticleComponent.java 2007-11-12 00:08:08 UTC (rev 184)
@@ -8,6 +8,7 @@
</small></pre><pre class="diff" id="context"> import org.eclipse.xsd.XSDParticleContent;
import uk.co.badgersinfoil.asxsd.CodegenContext;
import uk.co.badgersinfoil.asxsd.CodegenRole;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.asxsd.MarshalBuilder;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.TypeDescriptor;
import uk.co.badgersinfoil.metaas.ActionScriptFactory;
import uk.co.badgersinfoil.metaas.dom.ASExpression;
</pre><pre class="diff"><small id="info">@@ -33,6 +34,9 @@
</small></pre><pre class="diff" id="context"> ASExpression detectExpr= marshalDetectExpr(context, content);
StatementContainer ifBlock = containingBlock.newIf(detectExpr);
context.pushAttrScope();
</pre><pre class="diff" id="added">+ String src = MarshalBuilder.getCurrentSourceExpr(context);
+ String access = src + "." + context.variableNameFor(content);
+ MarshalBuilder.setCurrentSourceExpr(context, access);
</pre><pre class="diff" id="context"> context.setCurrentMethodCode(ifBlock);
context.generateCode(content);
</pre></div>
<hr /><a name="file2" /><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>OptionalComplexElementTest.java</b></big> <small id="info">added at 184</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/OptionalComplexElementTest.java (rev 0)
+++ trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/OptionalComplexElementTest.java 2007-11-12 00:08:08 UTC (rev 184)
@@ -0,0 +1,13 @@
</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.ASField;
+
+public class OptionalComplexElementTest extends SchemaTestCase {
+ public void testIt() {
+ ASClassType clazz = getTestASClass();
+
+ ASField field = clazz.getField("complexprop");
+ assertEquals("org.example.test.Element_complexprop", field.getType());
+ }
+}
</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>OptionalElementTest.java</b></big> <small id="info">added at 184</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/OptionalElementTest.java (rev 0)
+++ trunk/src/test/java/uk/co/badgersinfoil/asxsd/schemas/OptionalElementTest.java 2007-11-12 00:08:08 UTC (rev 184)
@@ -0,0 +1,11 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.asxsd.schemas;
+
+import uk.co.badgersinfoil.metaas.dom.ASClassType;
+
+public class OptionalElementTest extends SchemaTestCase {
+ public void testIt() {
+ ASClassType clazz = getTestASClass();
+ assertNotNull(clazz.getField("a"));
+ assertNotNull(clazz.getField("b"));
+ }
+}
</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>OptionalComplexElementTest.xsd</b></big> <small id="info">added at 184</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/resources/xsd/OptionalComplexElementTest.xsd (rev 0)
+++ trunk/src/test/resources/xsd/OptionalComplexElementTest.xsd 2007-11-12 00:08:08 UTC (rev 184)
@@ -0,0 +1,17 @@
</small></pre><pre class="diff" id="added">+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="http://example.org/test"
+ xmlns:t="http://example.org/test">
+
+ <complexType name="Test">
+ <sequence>
+ <element name="complexprop" minOccurs="0">
+ <complexType>
+ <sequence>
+ <element name="line" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+</schema>
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname" id="added">asxsd/trunk/src/test/resources/xsd</span><br />
<div class="fileheader" id="added"><big><b>OptionalElementTest.xsd</b></big> <small id="info">added at 184</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/resources/xsd/OptionalElementTest.xsd (rev 0)
+++ trunk/src/test/resources/xsd/OptionalElementTest.xsd 2007-11-12 00:08:08 UTC (rev 184)
@@ -0,0 +1,10 @@
</small></pre><pre class="diff" id="added">+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="http://example.org/test">
+ <complexType name="Test">
+ <sequence>
+ <element name="a" type="string"/>
+ <element name="b" type="string" minOccurs="0"/>
+ </sequence>
+ </complexType>
+</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>