X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=d6c0247e51fb0ed7a13f302642e6a46dd3149a0a;hb=9ca31f2261760b6fad088295feb701e400e7150f;hp=b58ce95ecbb02e88b1d3e4bd859310a0ea437fac;hpb=451d29e258f764998d1f28272470436fbae3bb1f;p=jalview.git
diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index b58ce95..d6c0247 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
/*
* Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,22 +18,20 @@
*/
package jalview.gui;
-import jalview.jbgui.*;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.event.*;
-import jalview.util.TableSorter;
-import java.awt.event.*;
-import javax.swing.*;
import java.util.*;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.table.*;
-import org.biojava.dasobert.dasregistry.DasCoordinateSystem;
-import org.biojava.dasobert.dasregistry.DasSource;
-import org.biojava.dasobert.dasregistry.Das1Source;
-import java.awt.BorderLayout;
+import org.biojava.dasobert.dasregistry.*;
+import jalview.jbgui.*;
+import jalview.util.*;
-public class DasSourceBrowser extends GDasSourceBrowser
- implements Runnable, ListSelectionListener
+public class DasSourceBrowser
+ extends GDasSourceBrowser implements Runnable, ListSelectionListener
{
static DasSource[] dasSources = null;
@@ -41,23 +39,23 @@ public class DasSourceBrowser extends GDasSourceBrowser
Vector selectedSources;
- String DEFAULT_REGISTRY = "http://www.dasregistry.org/registry/das1/sources/";
+ public static String DEFAULT_REGISTRY =
+ "http://www.dasregistry.org/das1/sources/";
boolean loadingDasSources = false;
-
public DasSourceBrowser()
{
String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
DEFAULT_REGISTRY);
- if(registry.equals("http://das.sanger.ac.uk/registry/das1/sources/"))
+ if (registry.indexOf("/registry/das1/sources/") > -1)
{
jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);
registry = DEFAULT_REGISTRY;
}
- registryURL.setText( registry );
+ registryURL.setText(registry);
setSelectedFromProperties();
@@ -84,18 +82,20 @@ public class DasSourceBrowser extends GDasSourceBrowser
});
table.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent evt)
+ {
+ if (evt.getClickCount() == 2
+ || SwingUtilities.isRightMouseButton(evt))
{
- public void mouseClicked(MouseEvent evt)
- {
- if(evt.getClickCount()==2
- || SwingUtilities.isRightMouseButton(evt))
- editRemoveLocalSource(evt);
- }
- });
+ editRemoveLocalSource(evt);
+ }
+ }
+ });
- if(dasSources!=null)
+ if (dasSources != null)
{
- init();
+ init();
}
}
@@ -123,14 +123,14 @@ public class DasSourceBrowser extends GDasSourceBrowser
setCapabilities(dasSources);
javax.swing.SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- TableSorter sorter = (TableSorter)table.getModel();
- sorter.setSortingStatus(1, TableSorter.DESCENDING);
- sorter.setSortingStatus(1, TableSorter.NOT_SORTED);
- }
- });
+ {
+ public void run()
+ {
+ TableSorter sorter = (TableSorter) table.getModel();
+ sorter.setSortingStatus(1, TableSorter.DESCENDING);
+ sorter.setSortingStatus(1, TableSorter.NOT_SORTED);
+ }
+ });
progressBar.setIndeterminate(false);
progressBar.setVisible(false);
@@ -138,7 +138,6 @@ public class DasSourceBrowser extends GDasSourceBrowser
refresh.setVisible(true);
}
-
public void refreshTableData(Object[][] data)
{
TableSorter sorter = new TableSorter(new DASTableModel(data));
@@ -164,7 +163,9 @@ public class DasSourceBrowser extends GDasSourceBrowser
for (int i = 0; i < dSize; i++)
{
if (!dasSources[i].getNickname().equals(nickName))
+ {
continue;
+ }
DasSource ds = dasSources[i];
@@ -175,37 +176,41 @@ public class DasSourceBrowser extends GDasSourceBrowser
text.append("URL: " + dasSources[i].getUrl() +
"
");
- text.append("Admin Email: "+dasSources[i].getAdminemail()+"" +
- "
");
-
+ text.append(
+ "Admin Email: " + dasSources[i].getAdminemail() + "" +
+ "
");
- text.append("Registered at: " + dasSources[i].getRegisterDate() +
- "
");
+ text.append("Registered at: " +
+ dasSources[i].getRegisterDate() +
+ "
");
- text.append("Last successful test: " + dasSources[i].getLeaseDate() +
- "
");
+ text.append("Last successful test: " +
+ dasSources[i].getLeaseDate() +
+ "
");
text.append("Labels: ");
- for(int s=0; s");
-
-
text.append("Capabilities: ");
String[] scap = dasSources[i].getCapabilities();
for (int j = 0; j < scap.length; j++)
{
text.append(scap[j]);
if (j < scap.length - 1)
+ {
text.append(", ");
+ }
}
text.append("
");
@@ -216,9 +221,13 @@ public class DasSourceBrowser extends GDasSourceBrowser
text.append("(" + dcs[j].getUniqueId() + ") "
+ dcs[j].getCategory() + ", " + dcs[j].getName());
if (dcs[j].getNCBITaxId() != 0)
+ {
text.append(", " + dcs[j].getNCBITaxId());
+ }
if (dcs[j].getOrganismName().length() > 0)
+ {
text.append(", " + dcs[j].getOrganismName());
+ }
text.append("
");
}
@@ -226,8 +235,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
text.append("Description: " +
dasSources[i].getDescription() + "
");
-
- if (dasSources[i].getHelperurl()!=null
+ if (dasSources[i].getHelperurl() != null
&& dasSources[i].getHelperurl().length() > 0)
{
text.append("