git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-853 use service action attribute to index services in webservices menu and hardwi...
[jalview.git]
/
src
/
jalview
/
gui
/
DasSourceBrowser.java
diff --git
a/src/jalview/gui/DasSourceBrowser.java
b/src/jalview/gui/DasSourceBrowser.java
index
4bd31bd
..
8ce0995
100755
(executable)
--- a/
src/jalview/gui/DasSourceBrowser.java
+++ b/
src/jalview/gui/DasSourceBrowser.java
@@
-1,5
+1,5
@@
/*
\r
/*
\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
@@
-59,8
+59,9
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
return registry;
\r
}
\r
\r
return registry;
\r
}
\r
\r
- public DasSourceBrowser()
\r
+ public DasSourceBrowser(FeatureSettings featureSettings)
\r
{
\r
{
\r
+ fs = featureSettings;
\r
String registry = getDasRegistryURL();
\r
\r
registryURL.setText(registry);
\r
String registry = getDasRegistryURL();
\r
\r
registryURL.setText(registry);
\r
@@
-107,6
+108,13
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
}
\r
}
\r
\r
}
\r
}
\r
\r
+ FeatureSettings fs = null;
\r
+
\r
+ public DasSourceBrowser()
\r
+ {
\r
+ this(null);
\r
+ }
\r
+
\r
public void paintComponent(java.awt.Graphics g)
\r
{
\r
if (dasSources == null && !loadingDasSources)
\r
public void paintComponent(java.awt.Graphics g)
\r
{
\r
if (dasSources == null && !loadingDasSources)
\r
@@
-183,11
+191,10
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
text.append("<font color=\"#0000FF\">URL:</font> "
\r
+ dasSources[i].getUrl() + "<br>");
\r
\r
text.append("<font color=\"#0000FF\">URL:</font> "
\r
+ dasSources[i].getUrl() + "<br>");
\r
\r
- text
\r
- .append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"
\r
- + dasSources[i].getAdminemail()
\r
- + "\">"
\r
- + dasSources[i].getAdminemail() + "</a>" + "<br>");
\r
+ text.append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"
\r
+ + dasSources[i].getAdminemail()
\r
+ + "\">"
\r
+ + dasSources[i].getAdminemail() + "</a>" + "<br>");
\r
\r
text.append("<font color=\"#0000FF\">Registered at:</font> "
\r
+ dasSources[i].getRegisterDate() + "<br>");
\r
\r
text.append("<font color=\"#0000FF\">Registered at:</font> "
\r
+ dasSources[i].getRegisterDate() + "<br>");
\r
@@
-271,16
+278,27
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
refresh.setVisible(false);
\r
progressBar.setVisible(true);
\r
progressBar.setIndeterminate(true);
\r
refresh.setVisible(false);
\r
progressBar.setVisible(true);
\r
progressBar.setIndeterminate(true);
\r
+ setParentGuiEnabled(false);
\r
// Refresh the source list.
\r
dasSources = null;
\r
getDASSource();
\r
\r
init();
\r
\r
// Refresh the source list.
\r
dasSources = null;
\r
getDASSource();
\r
\r
init();
\r
\r
+ setParentGuiEnabled(true);
\r
loadingDasSources = false;
\r
\r
}
\r
\r
loadingDasSources = false;
\r
\r
}
\r
\r
+ private void setParentGuiEnabled(boolean b)
\r
+ {
\r
+ if (fs != null)
\r
+ {
\r
+ fs.fetchDAS.setEnabled(b);
\r
+ fs.saveDAS.setEnabled(b);
\r
+ }
\r
+ }
\r
+
\r
public Vector getSelectedSources()
\r
{
\r
// wait around if we're still loading.
\r
public Vector getSelectedSources()
\r
{
\r
// wait around if we're still loading.
\r
@@
-570,8
+588,8
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
{
\r
tmp[index] = dasSources[i];
\r
data[index][0] = dasSources[i].getNickname();
\r
{
\r
tmp[index] = dasSources[i];
\r
data[index][0] = dasSources[i].getNickname();
\r
- data[index][1] = new Boolean(selectedSources
\r
- .contains(dasSources[i].getNickname()));
\r
+ data[index][1] = new Boolean(
\r
+ selectedSources.contains(dasSources[i].getNickname()));
\r
index++;
\r
}
\r
}
\r
index++;
\r
}
\r
}
\r
@@
-671,14
+689,13
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
// HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT
\r
// IS ADDED FROM THE REGISTRY
\r
names.add(ds.getNickname());
\r
// HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT
\r
// IS ADDED FROM THE REGISTRY
\r
names.add(ds.getNickname());
\r
- selected
\r
- .add(new Boolean(selectedSources.contains(ds.getNickname())));
\r
+ selected.add(new Boolean(selectedSources.contains(ds.getNickname())));
\r
continue;
\r
}
\r
\r
if (!selectedInList(dummyFeatureList, ds.getCapabilities())
\r
continue;
\r
}
\r
\r
if (!selectedInList(dummyFeatureList, ds.getCapabilities())
\r
- || !selectedInList(filter3.getSelectedValues(), ds
\r
- .getLabels()))
\r
+ || !selectedInList(filter3.getSelectedValues(),
\r
+ ds.getLabels()))
\r
{
\r
continue;
\r
}
\r
{
\r
continue;
\r
}
\r
@@
-788,8
+805,8
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
}
\r
}
\r
\r
}
\r
}
\r
\r
- properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE, sb
\r
- .toString());
\r
+ properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,
\r
+ sb.toString());
\r
\r
if (localSources != null)
\r
{
\r
\r
if (localSources != null)
\r
{
\r
@@
-805,8
+822,8
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
+ ((DasSource) localSources.get(token)).getUrl() + "\t");
\r
}
\r
\r
+ ((DasSource) localSources.get(token)).getUrl() + "\t");
\r
}
\r
\r
- properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sb
\r
- .toString());
\r
+ properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE,
\r
+ sb.toString());
\r
}
\r
\r
}
\r
}
\r
\r
}
\r
@@
-931,4
+948,15
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
}
\r
return resolved;
\r
}
\r
}
\r
return resolved;
\r
}
\r
+
\r
+ /**
\r
+ * disable or enable the buttons on the source browser
\r
+ *
\r
+ * @param b
\r
+ */
\r
+ public void setGuiEnabled(boolean b)
\r
+ {
\r
+ refresh.setEnabled(b);
\r
+ addLocal.setEnabled(b);
\r
+ }
\r
}
\r
}
\r