import jalview.bin.Cache;
import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.DBRefSource;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.gui.FeatureSettings;
+import jalview.gui.JvOptionPane;
+import jalview.util.DBRefUtils;
import jalview.util.MessageManager;
import jalview.util.UrlLink;
import jalview.ws.dbsources.das.api.DasSourceRegistryI;
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;
int refCount = 0;
for (int i = 0; i < sequences.length; i++)
{
- DBRefEntry[] dbref = sequences[i].getDBRef();
+ DBRefEntry[] dbref = sequences[i].getDBRefs();
if (dbref != null)
{
for (int j = 0; j < dbref.length; j++)
{
- if (dbref[j].getSource().equals(
- jalview.datamodel.DBRefSource.UNIPROT))
+ if (dbref[j].getSource().equals(DBRefSource.UNIPROT))
{
refCount++;
break;
if (checkDbrefs && refCount < sequences.length && uniprotCount > 0)
{
- int reply = JOptionPane.YES_OPTION;
+ int reply = JvOptionPane.YES_OPTION;
if (promptFetchDbrefs)
{
- reply = JOptionPane
- .showInternalConfirmDialog(
- Desktop.desktop,
- MessageManager
- .getString("info.you_want_jalview_to_find_uniprot_accessions"),
- MessageManager
- .getString("label.find_uniprot_accession_ids"),
- JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
+ reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
+ MessageManager.getString(
+ "info.you_want_jalview_to_find_uniprot_accessions"),
+ MessageManager
+ .getString("label.find_uniprot_accession_ids"),
+ JvOptionPane.YES_NO_OPTION, JvOptionPane.QUESTION_MESSAGE);
}
- if (reply == JOptionPane.YES_OPTION)
+ if (reply == JvOptionPane.YES_OPTION)
{
Thread thread = new Thread(new FetchDBRefs());
thread.start();
class FetchSeqFeatures implements Runnable
{
+ @Override
public void run()
{
startFetching();
class FetchDBRefs implements Runnable
{
+ @Override
public void run()
{
running = true;
- new DBRefFetcher(sequences, af).fetchDBRefs(true);
+ boolean isNucleotide = af.getViewport().getAlignment().isNucleotide();
+ new DBRefFetcher(sequences, af, null, af.featureSettings,
+ isNucleotide).fetchDBRefs(true);
+
startFetching();
setGuiFetchComplete();
}
startTime = System.currentTimeMillis();
if (af != null)
{
- af.setProgressBar(MessageManager
- .getString("status.fetching_das_sequence_features"),
- startTime);
+ af.setProgressBar(MessageManager.getString(
+ "status.fetching_das_sequence_features"), startTime);
}
if (sourceRegistry == null)
{
{
try
{
- jalviewSourceI[] sources = sourceRegistry.getSources().toArray(
- new jalviewSourceI[0]);
- String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",
- "uniprot");
+ jalviewSourceI[] sources = sourceRegistry.getSources()
+ .toArray(new jalviewSourceI[0]);
+ String active = Cache.getDefault("DAS_ACTIVE_SOURCE", "uniprot");
StringTokenizer st = new StringTokenizer(active, "\t");
selectedSources = new Vector();
String token;
for (List<String> idl : ids)
{
String source = sources.next();
- FeaturesClient featuresc = new FeaturesClient(sourceRegistry
- .getSessionHandler().getConnectionPropertyProviderFor(
- source));
+ FeaturesClient featuresc = new FeaturesClient(
+ sourceRegistry.getSessionHandler()
+ .getConnectionPropertyProviderFor(source));
for (String id : idl)
{
List<String> qid = Arrays.asList(new String[] { id });
}
private void processResponse(Map<String, SequenceI> sequencemap,
- jalviewSourceI jvsource, List<String> ids,
- List<DBRefEntry> idobj, Map<List<String>, DasGFFAdapter> results,
+ jalviewSourceI jvsource, List<String> ids, List<DBRefEntry> idobj,
+ Map<List<String>, DasGFFAdapter> results,
Map<List<String>, Exception> errors)
{
Set<SequenceI> sequences = new HashSet<SequenceI>();
vf = dbref.getMap().locateFeature(f);
} catch (Exception ex)
{
- Cache.log
- .warn("Error in 'experimental' mapping of features. Please try to reproduce and then report info to jalview-discuss@jalview.org.");
+ Cache.log.warn(
+ "Error in 'experimental' mapping of features. Please try to reproduce and then report info to jalview-discuss@jalview.org.");
Cache.log.warn("Mapping feature from " + f.getBegin()
+ " to " + f.getEnd() + " in dbref "
+ dbref.getAccessionId() + " in "
{
if (af != null)
{
- af.setProgressBar(MessageManager
- .getString("status.das_feature_fetching_cancelled"),
- startTime);
+ af.setProgressBar(MessageManager.getString(
+ "status.das_feature_fetching_cancelled"), startTime);
}
cancelled = true;
}
if (!cancelled && af != null)
{
// only update the progress bar if we've completed the fetch normally
- af.setProgressBar(MessageManager
- .getString("status.das_feature_fetching_complete"), startTime);
+ af.setProgressBar(MessageManager.getString(
+ "status.das_feature_fetching_complete"), startTime);
}
if (af != null && af.featureSettings != null)
}
af.getFeatureRenderer().featuresAdded();
- int start = af.getViewport().getStartSeq();
- int end = af.getViewport().getEndSeq();
+ int start = af.getViewport().getRanges().getStartSeq();
+ int end = af.getViewport().getRanges().getEndSeq();
int index;
for (index = start; index < end; index++)
{
{
return null;
}
- DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs(
- seq.getDBRef(), new String[] {
- // jalview.datamodel.DBRefSource.PDB,
- jalview.datamodel.DBRefSource.UNIPROT,
+ DBRefEntry[] uprefs = DBRefUtils.selectRefs(seq.getDBRefs(),
+ new String[]
+ {
+ // jalview.datamodel.DBRefSource.PDB,
+ DBRefSource.UNIPROT,
// jalview.datamodel.DBRefSource.EMBL - not tested on any EMBL coord
// sys sources
});
for (COORDINATES csys : dasSource.getVersion().getCOORDINATES())
{
- if (jalview.util.DBRefUtils.isDasCoordinateSystem(
- csys.getAuthority(), uprefs[j]))
+ if (DBRefUtils.isDasCoordinateSystem(csys.getAuthority(),
+ uprefs[j]))
{
debug("Launched fetcher for coordinate system "
+ csys.getAuthority());
// - the start/end for the DBRefEntry may not be the same as the
// sequence's start/end
- System.out.println(seq.getName() + " "
- + (seq.getDatasetSequence() == null) + " "
- + csys.getUri());
+ System.out.println(
+ seq.getName() + " " + (seq.getDatasetSequence() == null)
+ + " " + csys.getUri());
dasCoordSysFound = true; // break's out of the loop
ids.add(uprefs[j]);
{
}
- SequenceFeature f = new SequenceFeature(
- getTypeString(feat.getTYPE()), desc, start, end, score,
- nickname);
+ SequenceFeature f = new SequenceFeature(getTypeString(feat.getTYPE()),
+ desc, start, end, score, nickname);
if (feat.getLINK() != null)
{
git://source.jalview.org / jalview.git / blobdiff