X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=6e4cd9ae1637c8b7dc689f3de3fb7a76d42cbc86;hb=7b414ed4f2cd0a458ec2cc60a181b1aadd24c73e;hp=adcb924567166648c9b39ce97522e26ac03811d8;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index adcb924..6e4cd9a 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
@@ -107,7 +107,9 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
init();
}
}
+
FeatureSettings fs = null;
+
public DasSourceBrowser()
{
this(null);
@@ -189,11 +191,10 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
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() + "
");
@@ -291,7 +292,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
private void setParentGuiEnabled(boolean b)
{
- if (fs!=null)
+ if (fs != null)
{
fs.fetchDAS.setEnabled(b);
fs.saveDAS.setEnabled(b);
@@ -587,8 +588,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
{
tmp[index] = dasSources[i];
data[index][0] = dasSources[i].getNickname();
- data[index][1] = new Boolean(selectedSources
- .contains(dasSources[i].getNickname()));
+ data[index][1] = new Boolean(
+ selectedSources.contains(dasSources[i].getNickname()));
index++;
}
}
@@ -688,14 +689,13 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
// HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT
// IS ADDED FROM THE REGISTRY
names.add(ds.getNickname());
- selected
- .add(new Boolean(selectedSources.contains(ds.getNickname())));
+ selected.add(new Boolean(selectedSources.contains(ds.getNickname())));
continue;
}
if (!selectedInList(dummyFeatureList, ds.getCapabilities())
- || !selectedInList(filter3.getSelectedValues(), ds
- .getLabels()))
+ || !selectedInList(filter3.getSelectedValues(),
+ ds.getLabels()))
{
continue;
}
@@ -805,8 +805,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
}
}
- properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE, sb
- .toString());
+ properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,
+ sb.toString());
if (localSources != null)
{
@@ -822,8 +822,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
+ ((DasSource) localSources.get(token)).getUrl() + "\t");
}
- properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sb
- .toString());
+ properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE,
+ sb.toString());
}
}
@@ -951,6 +951,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
/**
* disable or enable the buttons on the source browser
+ *
* @param b
*/
public void setGuiEnabled(boolean b)