<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">VariableNameGenerator.java</a></tt> </td><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">157 -> 158</td></tr>
</table>
<pre class="comment">
work with Strings, as well as XSDNamedComponents
</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>VariableNameGenerator.java</b></big> <small id="info">157 -> 158</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/VariableNameGenerator.java 2007-09-18 20:54:42 UTC (rev 157)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/VariableNameGenerator.java 2007-10-07 00:47:34 UTC (rev 158)
@@ -35,11 +35,15 @@
</small></pre><pre class="diff" id="context"> if (named.getName() == null) {
throw new IllegalArgumentException("Component has no name: " + XSDUtils.path(named));
}
</pre><pre class="diff" id="added">+ return fieldName(named.getName());
+ }
+
+ public String fieldName(String name) {
</pre><pre class="diff" id="context"> // TODO: do we need to ensure unique names?
</pre><pre class="diff" id="removed">- if (KEYWORDS.contains(named.getName())) {
- return "_" + named.getName();
</pre><pre class="diff" id="added">+ if (KEYWORDS.contains(name)) {
+ return "_" + name;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- return StringUtils.sanitize(name<span id="removedchars">d.getName()</span>);
</pre><pre class="diff" id="added">+ return StringUtils.sanitize(name);
</pre><pre class="diff" id="context"> }
</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>