<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/main/java/uk/co/badgersinfoil/asxsd</tt></b></td></tr>
<tr><td><tt><a href="#file1">MarshalBuilder.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">161 -> 162</td></tr>
<tr class="alt"><td><tt>components/<a href="#file2">ElementDeclarationComponent.java</a></tt> </td><td></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">161 -> 162</td></tr>
<tr><td></td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-4</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: get expression from context instead</a></li>
</ul></div>
<pre class="comment">
fix buggy handling of simpleType elements in some cases
</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>MarshalBuilder.java</b></big> <small id="info">161 -> 162</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/MarshalBuilder.java 2007-10-07 20:26:44 UTC (rev 161)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/MarshalBuilder.java 2007-10-07 21:30:25 UTC (rev 162)
@@ -87,7 +87,11 @@
</small></pre><pre class="diff" id="context">
private void buildMethodParams(ASMethod meth, XSDElementDeclaration elementDecl) {
TypeDescriptor typeDesc = context.getTypeDescriptor(elementDecl);
</pre><pre class="diff" id="removed">- ASArg arg = meth.addParam("thisObject", typeDesc.getTypeName());
</pre><pre class="diff" id="added">+ if (elementDecl.getType() instanceof XSDComplexTypeDefinition) {
+ meth.addParam("thisObject", typeDesc.getTypeName());
+ } else {
+ meth.addParam("thisValue", typeDesc.getTypeName());
+ }
</pre><pre class="diff" id="context"> }
private void buildMethodParams(ASMethod meth, XSDTypeDefinition typeDef) {
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>ElementDeclarationComponent.java</b></big> <small id="info">161 -> 162</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationComponent.java 2007-10-07 20:26:44 UTC (rev 161)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationComponent.java 2007-10-07 21:30:25 UTC (rev 162)
@@ -91,8 +91,8 @@
</small></pre><pre class="diff" id="context"> if (typeDef instanceof XSDSimpleTypeDefinition) {
StatementContainer block = context.getCurrentMethodCode();
block.addStmt("var _result:XML = <"+elementDecl.getName()+"/>");
</pre><pre class="diff" id="removed">- MappingFunction conv = context.functionFor(elementDecl);
- String accessExpr = MarshalBuilder.getCurrentSourceExpr(context);
</pre><pre class="diff" id="added">+ MappingFunction conv = context.functionFor(typeDef);
<a name="task1" />+ String accessExpr = "thisValue"; // <span class="task">TODO</span>: get expression from context instead
</pre><pre class="diff" id="context"> String converted = conv.appliedTo(accessExpr);
block.addStmt("_result.appendChild("+converted+")");
block.addStmt("return _result");
</pre><pre class="diff"><small id="info">@@ -102,7 +102,7 @@
</small></pre><pre class="diff" id="context"> } else {
StatementContainer block = context.getCurrentMethodCode();
block.addStmt("var _result:XML = <"+elementDecl.getName()+"/>");
</pre><pre class="diff" id="removed">- MappingFunction conv = context.functionFor(<span id="removedchars">elementDecl</span>);
</pre><pre class="diff" id="added">+ MappingFunction conv = context.functionFor(<span id="addedchars">typeDef</span>);
</pre><pre class="diff" id="context"> String accessExpr = MarshalBuilder.getCurrentSourceExpr(context);
block.addStmt(conv.appliedTo("_result, "+accessExpr));
block.addStmt("return _result");
</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>