X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDasSequenceFeatureFetcher.java;h=bef6425385733fe2928729cde495ffce4797a37c;hb=0d6fdcd9c4597475c09fd96da43ddcadccf78fa1;hp=1038ed9b86a61b3347a39f5438e609721811ed12;hpb=b2911cd3ac8c35ae63fda491da2d73df845ef019;p=jalview.git
diff --git a/src/jalview/ws/DasSequenceFeatureFetcher.java b/src/jalview/ws/DasSequenceFeatureFetcher.java
index 1038ed9..bef6425 100644
--- a/src/jalview/ws/DasSequenceFeatureFetcher.java
+++ b/src/jalview/ws/DasSequenceFeatureFetcher.java
@@ -1,36 +1,59 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, 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 program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
*/
package jalview.ws;
-import java.net.*;
-import java.util.*;
-
-import javax.swing.*;
-
-import org.biojava.dasobert.das.*;
-import org.biojava.dasobert.das2.*;
-import org.biojava.dasobert.das2.io.*;
-import org.biojava.dasobert.dasregistry.*;
-import org.biojava.dasobert.eventmodel.*;
import jalview.bin.Cache;
-import jalview.datamodel.*;
-import jalview.gui.*;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.FeatureSettings;
+import jalview.util.UrlLink;
+import jalview.ws.dbsources.das.api.DasSourceRegistryI;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.JOptionPane;
+
+import org.biodas.jdas.client.FeaturesClient;
+import org.biodas.jdas.client.adapters.features.DasGFFAdapter;
+import org.biodas.jdas.client.adapters.features.DasGFFAdapter.GFFAdapter;
+import org.biodas.jdas.client.threads.FeaturesClientMultipleSources;
+import org.biodas.jdas.schema.features.ERRORSEGMENT;
+import org.biodas.jdas.schema.features.FEATURE;
+import org.biodas.jdas.schema.features.LINK;
+import org.biodas.jdas.schema.features.SEGMENT;
+import org.biodas.jdas.schema.features.TYPE;
+import org.biodas.jdas.schema.features.UNKNOWNFEATURE;
+import org.biodas.jdas.schema.features.UNKNOWNSEGMENT;
+import org.biodas.jdas.schema.sources.COORDINATES;
/**
* DOCUMENT ME!
@@ -48,7 +71,7 @@ public class DasSequenceFeatureFetcher
StringBuffer sbuffer = new StringBuffer();
- Vector selectedSources;
+ List selectedSources;
boolean cancelled = false;
@@ -75,42 +98,70 @@ public class DasSequenceFeatureFetcher
long startTime;
+ private DasSourceRegistryI sourceRegistry;
+ private boolean useJDASMultiThread=true;
/**
* Creates a new SequenceFeatureFetcher object. Uses default
*
* @param align
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param ap
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public DasSequenceFeatureFetcher(SequenceI[] sequences,
FeatureSettings fsettings, Vector selectedSources)
{
- this(sequences, fsettings, selectedSources, true, true);
+ this(sequences, fsettings, selectedSources, true, true, true);
}
- public DasSequenceFeatureFetcher(SequenceI[] sequences,
- FeatureSettings fsettings, Vector selectedSources,
+ public DasSequenceFeatureFetcher(SequenceI[] oursequences,
+ FeatureSettings fsettings, List selectedSources2,
boolean checkDbrefs, boolean promptFetchDbrefs)
{
- this.selectedSources = selectedSources;
- this.sequences = sequences;
+ this(oursequences,fsettings,selectedSources2,checkDbrefs,promptFetchDbrefs,true);
+ }
+ public DasSequenceFeatureFetcher(SequenceI[] oursequences,
+ FeatureSettings fsettings, List selectedSources2,
+ boolean checkDbrefs, boolean promptFetchDbrefs, boolean useJDasMultiThread)
+ {
+ this.useJDASMultiThread=useJDasMultiThread;
+ this.selectedSources = new ArrayList();
+ // filter both sequences and sources to eliminate duplicates
+ for (jalviewSourceI src : selectedSources2)
+ {
+ if (!selectedSources.contains(src))
+ {
+ selectedSources.add(src);
+ }
+ ;
+ }
+ Vector sqs = new Vector();
+ for (int i = 0; i < oursequences.length; i++)
+ {
+ if (!sqs.contains(oursequences[i]))
+ {
+ sqs.addElement(oursequences[i]);
+ }
+ }
+ sequences = new SequenceI[sqs.size()];
+ for (int i = 0; i < sequences.length; i++)
+ {
+ sequences[i] = (SequenceI) sqs.elementAt(i);
+ }
if (fsettings != null)
{
this.fsettings = fsettings;
this.af = fsettings.af;
- af.getViewport().setShowSequenceFeatures(true);
+ af.setShowSeqFeatures(true);
}
int uniprotCount = 0;
- for (int i = 0; i < selectedSources.size(); i++)
+ for (jalviewSourceI source : selectedSources)
{
- DasSource source = (DasSource) selectedSources.elementAt(i);
- DasCoordinateSystem[] coords = source.getCoordinateSystem();
- for (int c = 0; c < coords.length; c++)
+ for (COORDINATES coords : source.getVersion().getCOORDINATES())
{
// TODO: match UniProt coord system canonically (?) - does
// UniProt==uniprot==UNIPROT ?
- if (coords[c].getName().indexOf("UniProt") > -1)
+ if (coords.getAuthority().toLowerCase().equals("uniprot"))
{
uniprotCount++;
break;
@@ -159,58 +210,82 @@ public class DasSequenceFeatureFetcher
}
else
{
- startFetching();
+ _startFetching();
}
}
else
{
- startFetching();
+ _startFetching();
}
}
-
+ private void _startFetching()
+ {
+ running=true;
+ new Thread(new FetchSeqFeatures()).start();
+ }
+ class FetchSeqFeatures implements Runnable
+ {
+ public void run()
+ {
+ startFetching();
+ setGuiFetchComplete();
+ }
+ }
class FetchDBRefs implements Runnable
{
public void run()
{
+ running=true;
new DBRefFetcher(sequences, af).fetchDBRefs(true);
startFetching();
+ setGuiFetchComplete();
}
}
/**
- * Spawns a number of dasobert Fetcher threads to add features to sequences in
- * the dataset
+ * Spawns Fetcher threads to add features to sequences in the dataset
*/
void startFetching()
{
+ running=true;
cancelled = false;
startTime = System.currentTimeMillis();
if (af != null)
{
af.setProgressBar("Fetching DAS Sequence Features", startTime);
}
-
- DasSource[] sources = new jalview.gui.DasSourceBrowser().getDASSource();
-
+ if (sourceRegistry == null)
+ {
+ sourceRegistry = Cache.getDasSourceRegistry();
+ }
if (selectedSources == null || selectedSources.size() == 0)
{
- String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",
- "uniprot");
- StringTokenizer st = new StringTokenizer(active, "\t");
- Vector selectedSources = new Vector();
- String token;
- while (st.hasMoreTokens())
+ try
{
- token = st.nextToken();
- for (int i = 0; i < sources.length; i++)
+ jalviewSourceI[] sources = sourceRegistry.getSources().toArray(
+ new jalviewSourceI[0]);
+ String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",
+ "uniprot");
+ StringTokenizer st = new StringTokenizer(active, "\t");
+ selectedSources = new Vector();
+ String token;
+ while (st.hasMoreTokens())
{
- if (sources[i].getNickname().equals(token))
+ token = st.nextToken();
+ for (int i = 0; i < sources.length; i++)
{
- selectedSources.addElement(sources[i]);
- break;
+ if (sources[i].getTitle().equals(token))
+ {
+ selectedSources.add(sources[i]);
+ break;
+ }
}
}
+ } catch (Exception ex)
+ {
+ debug("Exception whilst setting default feature sources from registry and local preferences.",
+ ex);
}
}
@@ -223,14 +298,213 @@ public class DasSequenceFeatureFetcher
}
sourcesRemaining = selectedSources.size();
+ FeaturesClientMultipleSources fc = new FeaturesClientMultipleSources();
+ fc.setConnProps(sourceRegistry.getSessionHandler());
// Now sending requests one at a time to each server
- for (int sourceIndex = 0; sourceIndex < selectedSources.size()
- && !cancelled; sourceIndex++)
+ ArrayList srcobj = new ArrayList();
+ ArrayList src = new ArrayList();
+ List> ids = new ArrayList>();
+ List> idobj = new ArrayList>();
+ List