/*\r
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
* \r
* This file is part of Jalview.\r
* \r
for (int i = 0; i < dSize; i++)\r
{\r
data[i][0] = sources.get(i).getTitle(); // what's equivalent of nickname\r
- data[i][1] = new Boolean(selectedSources.contains(sources.get(i).getTitle()));\r
+ data[i][1] = new Boolean(selectedSources.contains(sources.get(i)\r
+ .getTitle()));\r
}\r
\r
refreshTableData(data);\r
+ "<br>");\r
text.append("<font color=\"#0000FF\">Nickname:</font> "\r
+ ds.getTitle() + "<br>");\r
- \r
+\r
+ text.append("<font color=\"#0000FF\">URL:</font> <a href=\""\r
+ + ds.getSourceURL() + "\">" + ds.getSourceURL() + "</a>"\r
+ + "<br>");\r
if (!ds.isLocal())\r
{\r
- // TODO: IMMEDIATE verify that URI + ds.URI point to latest version for non-local sources.\r
- if (ds.getDocHref()!=null) {\r
- text.append("<font color=\"#0000FF\">URL:</font> " + ds.getDocHref()\r
- + "<br>");\r
- }\r
- \r
- text.append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"\r
- + ds.getEmail() + "\">" + ds.getEmail() + "</a>" + "<br>");\r
+ if (ds.getDocHref() != null && ds.getDocHref().length() > 0)\r
+ {\r
+ text.append("<font color=\"#0000FF\">Site:</font> <a href=\""\r
+ + ds.getDocHref() + "\">" + ds.getDocHref() + "</a>"\r
+ + "<br>");\r
+ }\r
\r
- text.append("<font color=\"#0000FF\">Registered at:</font> "\r
- + latest.getCreated() + "<br>");\r
+ text.append("<font color=\"#0000FF\">Description:</font> "\r
+ + ds.getDescription() + "<br>");\r
+\r
+ text.append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"\r
+ + ds.getEmail() + "\">" + ds.getEmail() + "</a>" + "<br>");\r
+\r
+ text.append("<font color=\"#0000FF\">Registered at:</font> "\r
+ + latest.getCreated() + "<br>");\r
\r
- // TODO: Identify last successful test date\r
- // text.append("<font color=\"#0000FF\">Last successful test:</font> "\r
- // + latest.dasSources[i].getLeaseDate() + "<br>");\r
- } else {\r
+ // TODO: Identify last successful test date\r
+ // text.append("<font color=\"#0000FF\">Last successful test:</font> "\r
+ // + latest.dasSources[i].getLeaseDate() + "<br>");\r
+ }\r
+ else\r
+ {\r
text.append("Source was added manually.<br/>");\r
}\r
text.append("<font color=\"#0000FF\">Labels:</font> ");\r
{\r
if (labl.getName().equalsIgnoreCase("LABEL"))\r
{\r
- if (!b)\r
+ if (b)\r
{\r
text.append(",");\r
}\r
}\r
text.append("<br>");\r
\r
- text.append("<font color=\"#0000FF\">Coordinates:</font> ");\r
+ text.append("<font color=\"#0000FF\">Coordinates:</font>");\r
+ int i=1;\r
for (COORDINATES dcs : latest.getCOORDINATES())\r
{\r
- text.append("(" + dcs.getUri() + ") "\r
-\r
- + dcs.getSource() + ", " + dcs.getAuthority());\r
+ text.append("<br/>"+i+++". ");\r
+ text.append(dcs.getAuthority()+" : "+dcs.getSource());\r
if (dcs.getTaxid() != null && dcs.getTaxid().trim().length() > 0)\r
{\r
- text.append(", " + dcs.getTaxid());\r
+ text.append(" [TaxId:" + dcs.getTaxid()+"]");\r
}\r
- if (dcs.getVersion()!=null && dcs.getVersion().trim().length() > 0)\r
+ if (dcs.getVersion() != null\r
+ && dcs.getVersion().trim().length() > 0)\r
{\r
{\r
- text.append(", " + dcs.getVersion());\r
+ text.append(" {v. " + dcs.getVersion()+"}");\r
}\r
-\r
- text.append("<br>");\r
- }\r
-\r
- text.append("<font color=\"#0000FF\">Description:</font> "\r
- + ds.getDescription() + "<br>");\r
-\r
- if (ds.getDocHref() != null && ds.getDocHref().length() > 0)\r
- {\r
- text.append("<font color=\"#0000FF\"><a href=\""\r
- + ds.getDocHref() + "\">Go to site</a></font<br>");\r
}\r
-\r
- text.append("</font></html>");\r
-\r
- break;\r
+ text.append(" (<a href=\""+dcs.getUri() +"\">"+dcs.getUri() + "</a>)");\r
}\r
+ text.append("</font></html>");\r
+\r
+ break;\r
}\r
+\r
fullDetails.setText(text.toString());\r
javax.swing.SwingUtilities.invokeLater(new Runnable()\r
{\r
int size = osize + (newSource ? 1 : 0);\r
\r
Object[][] data = new Object[size][2];\r
- DASTableModel dtm = (table != null) ? (DASTableModel)((TableSorter) table.getModel()).getTableModel()\r
- : null;\r
+ DASTableModel dtm = (table != null) ? (DASTableModel) ((TableSorter) table\r
+ .getModel()).getTableModel() : null;\r
for (int i = 0; i < osize; i++)\r
{\r
String osrc = (dtm == null || i >= osize) ? null : (String) dtm\r
sourceRegistry.removeLocalSource(sourceRegistry.getSource(nickname));\r
selectedSources.remove(nickname);\r
Object[][] data = new Object[sourceRegistry.getSources().size()][2];\r
- DASTableModel dtm = (table != null) ? (DASTableModel) table\r
- .getModel() : null;\r
int index = 0,\r
- l = dtm.getRowCount();\r
+ l = table.getRowCount();\r
\r
for (int i = 0; i < l; i++)\r
{\r
// July 2006 - only 6 sources fo not serve features\r
Object[] dummyFeatureList = new Object[]\r
{ "features" };\r
- List<jalviewSourceI> srcs=sourceRegistry.getSources();\r
+ List<jalviewSourceI> srcs = sourceRegistry.getSources();\r
for (jalviewSourceI ds : srcs)\r
{\r
\r
VERSION v = ds.getVersion();\r
List<COORDINATES> coords = v.getCOORDINATES();\r
- if (ds.isLocal() || ((coords == null || coords.size() == 0)\r
- && filter1.getSelectedIndex() == 0\r
- && filter2.getSelectedIndex() == 0\r
- && filter3.getSelectedIndex() == 0))\r
+ if (ds.isLocal()\r
+ || ((coords == null || coords.size() == 0)\r
+ && filter1.getSelectedIndex() == 0\r
+ && filter2.getSelectedIndex() == 0 && filter3\r
+ .getSelectedIndex() == 0))\r
{\r
// THIS IS A FIX FOR LOCAL SOURCES WHICH DO NOT\r
// HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT\r
{\r
return true;\r
}\r
- if (items==null || items.length==0)\r
+ if (items == null || items.length == 0)\r
{\r
return false;\r
}\r
- String sel=(items[0].startsWith("das1:") ? "das1:":"")+selection[i];\r
+ String sel = (items[0].startsWith("das1:") ? "das1:" : "")\r
+ + selection[i];\r
for (int j = 0; j < items.length; j++)\r
{\r
if (sel.equals(items[j]))\r