Scarab commit: svn commit: r10690 - branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2009-02-11 06:42:16-0800
New Revision: 10690
Modified:
branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java
Log:
FIX - Issue SCB2816 if no issue is found for extracted issue numbers, list of tokens is wrote back as is, without links.
Modified: branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java?view=diff&pathrev=10690&r1=10689&r2=10690
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java (original)
+++ branches/release/0.22/src/java/org/tigris/scarab/util/ScarabUtil.java 2009-02-11 06:42:16-0800
@@ -59,6 +59,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.fulcrum.parser.StringValueParser;
import org.apache.turbine.RunData;
+import org.tigris.scarab.om.Issue;
import org.tigris.scarab.om.IssueManager;
import org.tigris.scarab.om.Module;
import org.tigris.scarab.tools.ScarabLocalizationTool;
@@ -134,14 +135,27 @@
{
final List tmpList = (List)tmp;
final String id = (String)tmpList.get(1);
- final String defaultText = IssueManager.getIssueById(id).getDefaultText();
- final String attributes = "alt=\"" + defaultText + "\" title=\"" + defaultText + "\"";
-
- link.addPathInfo("id", id);
- link.addPathInfo("tab", "1");
- link.setLabel((String)tmpList.get(0));
- final String bar = link.setAttributeText(attributes).toString();
- sb.append(bar);
+ final Issue issue = IssueManager.getIssueById(id);
+
+ if(issue != null){
+ final String defaultText = issue.getDefaultText();
+ final String attributes = "alt=\"" + defaultText + "\" title=\"" + defaultText + "\"";
+
+ link.addPathInfo("id", id);
+ link.addPathInfo("tab", "1");
+ link.setLabel((String)tmpList.get(0));
+ final String bar = link.setAttributeText(attributes).toString();
+ sb.append(bar);
+ }
+ else{
+ //write everything back, no valid issue found for linking
+ Iterator iterTmp = tmpList.iterator();
+ while(iterTmp.hasNext()){
+ sb.append(iterTmp.next().toString());
+ }
+
+ }
+
}
}
return sb.toString();
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=1139199