<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>metaas/trunk/src</tt></b></td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file1">DocCommentUtils.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="center">425 -> 426</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file2"><span id="added">DocCommentTests.java</span></a></tt> </td><td></td><td align="right" id="added">+33</td><td></td><td nowrap="nowrap" align="right">added 426</td></tr>
<tr><td></td><td></td><td align="right" id="added">+42</td><td></td><td></td></tr>
</table>
<small id="info">1 added + 1 modified, total 2 files</small><br />
<pre class="comment">
don't let the calling code create a comment that has '*/' in its body.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>DocCommentUtils.java</b></big> <small id="info">425 -> 426</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/DocCommentUtils.java 2007-02-18 16:31:45 UTC (rev 425)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/DocCommentUtils.java 2007-02-18 17:29:40 UTC (rev 426)
@@ -8,6 +8,7 @@
</small></pre><pre class="diff" id="context">
import org.asdt.core.internal.antlr.AS3Parser;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.SyntaxException;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff"><small id="info">@@ -74,6 +75,7 @@
</small></pre><pre class="diff" id="context"> }
return;
}
</pre><pre class="diff" id="added">+ assertValidContent(text);
</pre><pre class="diff" id="context"> String indent = ASTUtils.findIndent(node);
text = "/**" + text.replaceAll("(\n|\r\n|\r)", "$1"+indent+" *");
if (!text.endsWith("*")) {
</pre><pre class="diff"><small id="info">@@ -98,6 +100,13 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="added">+ private static void assertValidContent(String text) {
+ int pos = text.indexOf("*/");
+ if (pos != -1) {
+ throw new SyntaxException("End-on-comment marker found at position "+pos);
+ }
+ }
+
</pre><pre class="diff" id="context"> public static void increaseCommentIndent(LinkedListToken tok, String indent) {
tok.setText(tok.getText().replaceAll("(\n|\r\n|\r)", "$1"+indent));
}
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader" id="added"><big><b>DocCommentTests.java</b></big> <small id="info">added at 426</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/DocCommentTests.java 2007-02-18 16:31:45 UTC (rev 425)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/DocCommentTests.java 2007-02-18 17:29:40 UTC (rev 426)
@@ -0,0 +1,33 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas;
+
+import java.io.IOException;
+
+import uk.co.badgersinfoil.metaas.dom.ASClassType;
+import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
+import junit.framework.TestCase;
+
+public class DocCommentTests extends TestCase {
+
+ private ActionScriptFactory fact = new ActionScriptFactory();
+ private ASCompilationUnit unit;
+ private ASClassType clazz;
+
+ protected void setUp() {
+ ActionScriptFactory fact = new ActionScriptFactory();
+ unit = fact.newClass("Test");
+ clazz = (ASClassType)unit.getType();
+ }
+
+ protected void tearDown() throws IOException {
+ CodeMirror.assertReflection(fact, unit);
+ }
+
+ public void testEndOfCommentMarker() {
+ try {
+ clazz.setDocComment("*/");
+ fail("should not allow '*/' within a doc-comment");
+ } catch (SyntaxException e) {
+ // expected
+ }
+ }
+}
</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>