diff options
2 files changed, 17 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracHyperlinkUtilTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracHyperlinkUtilTest.java index d5b3ff251..9b456a952 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracHyperlinkUtilTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracHyperlinkUtilTest.java @@ -65,6 +65,22 @@ public class TracHyperlinkUtilTest extends TestCase { assertEquals("123", ((TaskHyperlink) links[0]).getTaskId()); } + public void testFindHyperlinksNoTicket() { + IHyperlink[] links = findTracHyperlinks(repository, "#11", 0, 0); + assertNull(links); + + links = findTracHyperlinks(repository, "#11, #234", 6, 0); + assertNull(links); + + links = findTracHyperlinks(repository, " ticket:123 ", 2, 0); + assertNull(links); + + links = findTracHyperlinks(repository, "#123 report:123", -1, 0); + assertNotNull(links); + assertEquals(1, links.length); + assertEquals("http://localhost/report/123", ((WebHyperlink) links[0]).getURLString()); + } + public void testFindHyperlinksReport() { IHyperlink[] links = findTracHyperlinks(repository, "report:123", 0, 0); assertEquals(1, links.length); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java index 649a6a03d..57568e65e 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java @@ -116,15 +116,7 @@ public class TracHyperlinkUtil { int textOffset) { List<IHyperlink> links = new ArrayList<IHyperlink>(); - Matcher m = ticketPattern.matcher(text); - while (m.find()) { - if (isInRegion(offsetInText, m)) { - String id = m.group(2); - links.add(new TaskHyperlink(determineRegion(textOffset, m), repository, id)); - } - } - - m = commentPattern.matcher(text); + Matcher m = commentPattern.matcher(text); while (m.find()) { if (isInRegion(offsetInText, m)) { String id = m.group(1); |