<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">StringUtils.java</a></tt> </td><td></td><td align="right" id="added">+14</td><td align="right" id="removed">-9</td><td nowrap="nowrap" align="center">147 -> 148</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/asxsd/<a href="#file2">StringUtilsTest.java</a></tt> </td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">147 -> 148</td></tr>
<tr><td></td><td></td><td align="right" id="added">+22</td><td align="right" id="removed">-12</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Handle "urn:" namespaces
</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>StringUtils.java</b></big> <small id="info">147 -> 148</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/StringUtils.java 2007-09-10 00:21:27 UTC (rev 147)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/StringUtils.java 2007-09-10 22:30:42 UTC (rev 148)
@@ -6,23 +6,28 @@
</small></pre><pre class="diff" id="context">
import org.eclipse.emf.common.util.URI;
import org.eclipse.xsd.XSDAttributeDeclaration;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.ActionScriptFactory;
public class StringUtils {
public static String toPackageName(String targetNamespace) {
URI uri = URI.createURI(targetNamespace);
</pre><pre class="diff" id="removed">- String name = reverseJoin(sanitize(uri.host().split("\\.")), ".");
- if (uri.hasPath()) {
- // de-dupe any doubled path seperators, and
- // remove the leading '/'
- String path = uri.path().replaceAll("/+", "/").replaceFirst("\\A/", "");
- if (path.length() > 0) {
- name = name + "." + join(sanitize(path.split("/")), ".");
</pre><pre class="diff" id="added">+ if (uri.isHierarchical()) {
+ String name = reverseJoin(sanitize(uri.host().split("\\.")), ".");
+ if (uri.hasPath()) {
+ // de-dupe any doubled path seperators, and
+ // remove the leading '/'
+ String path = uri.path().replaceAll("/+", "/").replaceFirst("\\A/", "");
+ if (path.length() > 0) {
+ name = name + "." + join(sanitize(path.split("/")), ".");
+ }
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="added">+ return name;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- return name;
</pre><pre class="diff" id="added">+ if ("urn".equalsIgnoreCase(uri.scheme())) {
+ return join(sanitize(uri.opaquePart().split(":")), ".");
+ }
+ throw new IllegalArgumentException("unhandled scheme in uri: "+targetNamespace);
</pre><pre class="diff" id="context"> }
public static String[] sanitize(String[] strings) {
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">asxsd/trunk/src/test/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>StringUtilsTest.java</b></big> <small id="info">147 -> 148</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/asxsd/StringUtilsTest.java 2007-09-10 00:21:27 UTC (rev 147)
+++ trunk/src/test/java/uk/co/badgersinfoil/asxsd/StringUtilsTest.java 2007-09-10 22:30:42 UTC (rev 148)
@@ -7,8 +7,13 @@
</small></pre><pre class="diff" id="context"> import junit.framework.TestCase;
public class StringUtilsTest extends TestCase {
</pre><pre class="diff" id="removed">- public void testToPackageName() {
- // A path consisting only of '/' should cause a failure,
- StringUtils.toPackageName("http://temputi.org/");
</pre><pre class="diff" id="added">+ public void testToPackageNameTrailingSlash() {
+ // A path consisting only of '/' should not cause a failure,
+ assertEquals("org.temputi", StringUtils.toPackageName("http://temputi.org/"));
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="added">+
+ public void testToPackageNameURN() {
+ // A urn should not cause a failure,
+ assertEquals("tva.metadata._2005_03", StringUtils.toPackageName("urn:tva:metadata:2005-03"));
+ }
</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>