X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fio%2FSequenceAnnotationReport.java;h=ee8ac17579f95b23f34e2d3918ec438b4c8683d9;hp=7f46c671ba71443eac0e6ad7f0810edc30a31933;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hpb=1cc81e06ac2faa5ee4b8879e9fa019956e34259f
diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java
index 7f46c67..ee8ac17 100644
--- a/src/jalview/io/SequenceAnnotationReport.java
+++ b/src/jalview/io/SequenceAnnotationReport.java
@@ -164,9 +164,15 @@ public class SequenceAnnotationReport
{
for (String[] urllink : createLinksFrom(null, urlstring))
{
- tooltipText2.append("
"
- + (urllink[0].toLowerCase().equals(urllink[1].toLowerCase()) ? urllink[0] : (urllink[0]+ ":" + urllink[1])) + "");
+ tooltipText2.append("
"
+ + (urllink[0].toLowerCase().equals(
+ urllink[1].toLowerCase()) ? urllink[0]
+ : (urllink[0] + ":" + urllink[1]))
+ + "");
}
} catch (Exception x)
{
@@ -192,7 +198,7 @@ public class SequenceAnnotationReport
public String[][] createLinksFrom(SequenceI seq, String link)
{
ArrayList urlSets = new ArrayList();
- ArrayList uniques=new ArrayList();
+ ArrayList uniques = new ArrayList();
UrlLink urlLink = new UrlLink(link);
if (!urlLink.isValid())
{
@@ -232,11 +238,11 @@ public class SequenceAnnotationReport
{
for (int u = 0; u < urls.length; u += 2)
{
- String unq=urls[u]+"|"+urls[u+1];
+ String unq = urls[u] + "|" + urls[u + 1];
if (!uniques.contains(unq))
{
urlSets.add(new String[]
- { target, label, urls[u], urls[u + 1] });
+ { target, label, urls[u], urls[u + 1] });
uniques.add(unq);
}
}
@@ -251,11 +257,11 @@ public class SequenceAnnotationReport
{
for (int u = 0; u < urls.length; u += 2)
{
- String unq=urls[u]+"|"+urls[u+1];
+ String unq = urls[u] + "|" + urls[u + 1];
if (!uniques.contains(unq))
{
urlSets.add(new String[]
- { target, label, urls[u], urls[u + 1] });
+ { target, label, urls[u], urls[u + 1] });
uniques.add(unq);
}
}
@@ -269,23 +275,27 @@ public class SequenceAnnotationReport
{
for (int u = 0; u < urls.length; u += 2)
{
- String unq=urls[u]+"|"+urls[u+1];
+ String unq = urls[u] + "|" + urls[u + 1];
if (!uniques.contains(unq))
{
urlSets.add(new String[]
- { target, label, urls[u], urls[u + 1] });
+ { target, label, urls[u], urls[u + 1] });
uniques.add(unq);
}
}
}
}
- } else {
- String unq=label + "|" + urlLink.getUrl_prefix();
- if (!uniques.contains(unq)){
+ }
+ else
+ {
+ String unq = label + "|" + urlLink.getUrl_prefix();
+ if (!uniques.contains(unq))
+ {
uniques.add(unq);
// Add a non-dynamic link
- urlSets.add(new String[] {target, label, null, urlLink.getUrl_prefix()});
+ urlSets.add(new String[]
+ { target, label, null, urlLink.getUrl_prefix() });
}
}
@@ -293,17 +303,17 @@ public class SequenceAnnotationReport
{});
}
-
public void createSequenceAnnotationReport(final StringBuffer tip,
SequenceI sequence, boolean showDbRefs, boolean showNpFeats,
Hashtable minmax)
{
- createSequenceAnnotationReport(tip, sequence, showDbRefs, showNpFeats, true, minmax);
+ createSequenceAnnotationReport(tip, sequence, showDbRefs, showNpFeats,
+ true, minmax);
}
public void createSequenceAnnotationReport(final StringBuffer tip,
- SequenceI sequence, boolean showDbRefs, boolean showNpFeats, boolean tableWrap,
- Hashtable minmax)
+ SequenceI sequence, boolean showDbRefs, boolean showNpFeats,
+ boolean tableWrap, Hashtable minmax)
{
String tmp;
tip.append("");
@@ -315,10 +325,10 @@ public class SequenceAnnotationReport
tip.append("
" + tmp);
maxWidth = Math.max(maxWidth, tmp.length());
}
- SequenceI ds=sequence;
- while (ds.getDatasetSequence()!=null)
+ SequenceI ds = sequence;
+ while (ds.getDatasetSequence() != null)
{
- ds=ds.getDatasetSequence();
+ ds = ds.getDatasetSequence();
}
DBRefEntry[] dbrefs = ds.getDBRef();
if (showDbRefs && dbrefs != null)