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-3035 - jalview-das is no more !
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
f545e70
..
8754fbb
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-34,7
+34,6
@@
import jalview.io.gff.SequenceOntologyI;
import jalview.util.DBRefUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.DBRefUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
-import jalview.ws.dbsources.das.api.DasSourceRegistryI;
import jalview.ws.seqfetcher.DbSourceProxy;
import java.awt.BorderLayout;
import jalview.ws.seqfetcher.DbSourceProxy;
import java.awt.BorderLayout;
@@
-111,10
+110,6
@@
public class SequenceFetcher extends JPanel implements Runnable
private static jalview.ws.SequenceFetcher sfetch = null;
private static jalview.ws.SequenceFetcher sfetch = null;
- private static long lastDasSourceRegistry = -3;
-
- private static DasSourceRegistryI dasRegistry = null;
-
private static boolean _initingFetcher = false;
private static Thread initingThread = null;
private static boolean _initingFetcher = false;
private static Thread initingThread = null;
@@
-165,11
+160,7
@@
public class SequenceFetcher extends JPanel implements Runnable
Thread.currentThread().hashCode());
}
}
Thread.currentThread().hashCode());
}
}
- if (sfetch == null || dasRegistry != Cache.getDasSourceRegistry()
- || lastDasSourceRegistry != (Cache.getDasSourceRegistry()
- .getDasRegistryURL()
- + Cache.getDasSourceRegistry().getLocalSourceString())
- .hashCode())
+ if (sfetch == null)
{
_initingFetcher = true;
initingThread = Thread.currentThread();
{
_initingFetcher = true;
initingThread = Thread.currentThread();
@@
-183,16
+174,12
@@
public class SequenceFetcher extends JPanel implements Runnable
"status.init_sequence_database_fetchers"),
Thread.currentThread().hashCode());
}
"status.init_sequence_database_fetchers"),
Thread.currentThread().hashCode());
}
- dasRegistry = Cache.getDasSourceRegistry();
- dasRegistry.refreshSources();
jalview.ws.SequenceFetcher sf = new jalview.ws.SequenceFetcher();
if (guiWindow != null)
{
guiWindow.setProgressBar(null, Thread.currentThread().hashCode());
}
jalview.ws.SequenceFetcher sf = new jalview.ws.SequenceFetcher();
if (guiWindow != null)
{
guiWindow.setProgressBar(null, Thread.currentThread().hashCode());
}
- lastDasSourceRegistry = (dasRegistry.getDasRegistryURL()
- + dasRegistry.getLocalSourceString()).hashCode();
sfetch = sf;
_initingFetcher = false;
initingThread = null;
sfetch = sf;
_initingFetcher = false;
initingThread = null;
@@
-564,15
+551,10
@@
public class SequenceFetcher extends JPanel implements Runnable
dbeg.setText(MessageManager.formatMessage("label.example_query_param",
new String[]
{ eq }));
dbeg.setText(MessageManager.formatMessage("label.example_query_param",
new String[]
{ eq }));
+ // TODO this should be a property of the SequenceFetcher whether commas are and
+ // colons are allowed in the IDs...
+
boolean enablePunct = !(eq != null && eq.indexOf(",") > -1);
boolean enablePunct = !(eq != null && eq.indexOf(",") > -1);
- for (DbSourceProxy dbs : database.getSelectedSources())
- {
- if (dbs instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource)
- {
- enablePunct = false;
- break;
- }
- }
replacePunctuation.setEnabled(enablePunct);
} catch (Exception ex)
replacePunctuation.setEnabled(enablePunct);
} catch (Exception ex)