/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
\r
Vector selectedSources;\r
\r
+ String DEFAULT_REGISTRY = "http://das.sanger.ac.uk/registry/das1/sources/";\r
+\r
+ boolean loadingDasSources = false;\r
+\r
\r
public DasSourceBrowser()\r
{\r
registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
- "http://das.sanger.ac.uk/registry/das1/sources/") );\r
+ DEFAULT_REGISTRY) );\r
\r
setSelectedFromProperties();\r
\r
}\r
});\r
\r
- if(dasSources==null)\r
+ if(dasSources!=null)\r
{\r
- Thread worker = new Thread(this);\r
- worker.start();\r
- }\r
- else\r
- {\r
init();\r
- }\r
+ }\r
+ }\r
+\r
+ public void paintComponent(java.awt.Graphics g)\r
+ {\r
+ if (dasSources == null && !loadingDasSources)\r
+ {\r
+ Thread worker = new Thread(this);\r
+ worker.start();\r
+ }\r
}\r
\r
void init()\r
\r
public void run()\r
{\r
+ loadingDasSources = true;\r
+\r
addLocal.setVisible(false);\r
refresh.setVisible(false);\r
progressBar.setVisible(true);\r
\r
init();\r
\r
+ loadingDasSources = false;\r
+\r
}\r
\r
public Vector getSelectedSources()\r
}\r
}\r
\r
+ public void reset_actionPerformed(ActionEvent e)\r
+ {\r
+ registryURL.setText(DEFAULT_REGISTRY);\r
+ }\r
+\r
public void saveProperties(Properties properties)\r
{\r
if (registryURL.getText() == null || registryURL.getText().length() < 1)\r