X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDasSequenceFeatureFetcher.java;h=4d3dd2f5a03f3eead2a26eac912ee42f75796b78;hb=4decc3e365ce990f54773d24bb9583df48d2797a;hp=de9ebcb77c3898824755b8606965e5449c8d5fbc;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/ws/DasSequenceFeatureFetcher.java b/src/jalview/ws/DasSequenceFeatureFetcher.java index de9ebcb..4d3dd2f 100644 --- a/src/jalview/ws/DasSequenceFeatureFetcher.java +++ b/src/jalview/ws/DasSequenceFeatureFetcher.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -28,6 +28,7 @@ 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; @@ -46,8 +47,6 @@ 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; @@ -200,21 +199,21 @@ public class DasSequenceFeatureFetcher if (checkDbrefs && refCount < sequences.length && uniprotCount > 0) { - int reply = JOptionPane.YES_OPTION; + int reply = JvOptionPane.YES_OPTION; if (promptFetchDbrefs) { - reply = JOptionPane + reply = JvOptionPane .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); + 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(); @@ -618,8 +617,8 @@ public class DasSequenceFeatureFetcher } 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++) {