<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/components</tt></b></td></tr>
<tr><td><tt><a href="#file1">AttributeDeclarationComponent.java</a></tt> </td><td></td><td align="right" id="added">+3</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">166 -> 167</td></tr>
<tr class="alt"><td><tt><a href="#file2">ComplexTypeComponent.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">166 -> 167</td></tr>
<tr><td></td><td></td><td align="right" id="added">+5</td><td align="right" id="removed">-2</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
don't hard-code the source expression, take it from the current context
</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>AttributeDeclarationComponent.java</b></big> <small id="info">166 -> 167</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AttributeDeclarationComponent.java 2007-10-14 00:14:37 UTC (rev 166)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AttributeDeclarationComponent.java 2007-10-14 21:36:44 UTC (rev 167)
@@ -7,6 +7,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.MappingFunction;
import uk.co.badgersinfoil.asxsd.MarshalBuilder;
import uk.co.badgersinfoil.asxsd.StringUtils;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.asxsd.UnmarshalBuilder;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.StatementContainer;
</pre><pre class="diff"><small id="info">@@ -23,7 +24,8 @@
</small></pre><pre class="diff" id="context"> CodegenRole role = context.getCurrentRole();
if (role == CodegenRole.UNMARSHAL) {
StatementContainer code = context.getCurrentMethodCode();
</pre><pre class="diff" id="removed">- String attrAccessExpr = "thisElement."+StringUtils.attrAccess(attrDecl);
</pre><pre class="diff" id="added">+ String sourceExpr = UnmarshalBuilder.getCurrentSourceExpr(context);
+ String attrAccessExpr = sourceExpr+"."+StringUtils.attrAccess(attrDecl);
</pre><pre class="diff" id="context"> MappingFunction function = context.functionFor(attrDecl.getType());
String converted = function.appliedTo(attrAccessExpr);
code.addStmt("_result."+context.variableNameFor(attrDecl)+" = "+converted);
</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>ComplexTypeComponent.java</b></big> <small id="info">166 -> 167</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ComplexTypeComponent.java 2007-10-14 00:14:37 UTC (rev 166)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ComplexTypeComponent.java 2007-10-14 21:36:44 UTC (rev 167)
@@ -121,7 +121,7 @@
</small></pre><pre class="diff" id="context"> context.generateCode(particle);
context.popAttrScope();
} else {
</pre><pre class="diff" id="removed">- UnmarshalBuilder.warn("this kind of complex content not handled, sorry: "+complexContent+", contained by: "+typeDef);
</pre><pre class="diff" id="added">+ context.generateCode(complexContent);
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -253,6 +253,7 @@
</small></pre><pre class="diff" id="context"> arg.setDescription(doc);
meth.setStatic(true);
context.pushAttrScope();
</pre><pre class="diff" id="added">+ UnmarshalBuilder.setCurrentSourceExpr(context, "thisElement");
</pre><pre class="diff" id="context"> context.setCurrentMethodCode(meth);
context.generateCode(complexType);
context.popAttrScope();
</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>