git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c41fb5c
)
Only discover DAS sources if panel shown
author
amwaterhouse
<Andrew Waterhouse>
Fri, 18 Aug 2006 08:53:07 +0000
(08:53 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Fri, 18 Aug 2006 08:53:07 +0000
(08:53 +0000)
src/jalview/gui/DasSourceBrowser.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/DasSourceBrowser.java
b/src/jalview/gui/DasSourceBrowser.java
index
36e5164
..
e78d2d4
100755
(executable)
--- a/
src/jalview/gui/DasSourceBrowser.java
+++ b/
src/jalview/gui/DasSourceBrowser.java
@@
-43,6
+43,8
@@
public class DasSourceBrowser extends GDasSourceBrowser
\r
String DEFAULT_REGISTRY = "http://das.sanger.ac.uk/registry/das1/sources/";
\r
\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
\r
public DasSourceBrowser()
\r
{
\r
@@
-83,15
+85,19
@@
public class DasSourceBrowser extends GDasSourceBrowser
}
\r
});
\r
\r
}
\r
});
\r
\r
- if(dasSources==null)
\r
+ if(dasSources!=null)
\r
{
\r
{
\r
- Thread worker = new Thread(this);
\r
- worker.start();
\r
- }
\r
- else
\r
- {
\r
init();
\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
\r
void init()
\r
@@
-239,6
+245,8
@@
public class DasSourceBrowser extends GDasSourceBrowser
\r
public void run()
\r
{
\r
\r
public void run()
\r
{
\r
+ loadingDasSources = true;
\r
+
\r
addLocal.setVisible(false);
\r
refresh.setVisible(false);
\r
progressBar.setVisible(true);
\r
addLocal.setVisible(false);
\r
refresh.setVisible(false);
\r
progressBar.setVisible(true);
\r
@@
-250,6
+258,8
@@
public class DasSourceBrowser extends GDasSourceBrowser
\r
init();
\r
\r
\r
init();
\r
\r
+ loadingDasSources = false;
\r
+
\r
}
\r
\r
public Vector getSelectedSources()
\r
}
\r
\r
public Vector getSelectedSources()
\r