X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=6a0d0102b6b92cc1c9bfe8d1863f908659c7f15c;hb=31a33833640b743a506f7801388b17f96e915ef3;hp=dd25532928994d3b2da68c50e33bb366b51b53ae;hpb=bdcf0d8712ed583ecca10af4ee2aca57c485a402;p=jalview.git diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index dd25532..6a0d010 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -20,6 +20,18 @@ */ package jalview.gui; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.DBRefSource; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceI; +import jalview.io.FormatAdapter; +import jalview.io.IdentifyFile; +import jalview.util.DBRefUtils; +import jalview.util.MessageManager; +import jalview.ws.dbsources.das.api.DasSourceRegistryI; +import jalview.ws.seqfetcher.DbSourceProxy; + import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; @@ -44,19 +56,6 @@ import javax.swing.tree.DefaultMutableTreeNode; import com.stevesoft.pat.Regex; -import jalview.datamodel.Alignment; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.DBRefSource; -import jalview.datamodel.SequenceFeature; -import jalview.datamodel.SequenceI; -import jalview.io.FormatAdapter; -import jalview.io.IdentifyFile; -import jalview.util.DBRefUtils; -import jalview.util.MessageManager; -import jalview.ws.dbsources.das.api.DasSourceRegistryI; -import jalview.ws.seqfetcher.DbSourceProxy; - public class SequenceFetcher extends JPanel implements Runnable { JLabel dbeg = new JLabel(); @@ -359,18 +358,19 @@ public class SequenceFetcher extends JPanel implements Runnable { debounceTrap++; String currentSelection = database.getSelectedItem(); - if (!currentSelection.equalsIgnoreCase("pdb")) { otherSourceAction(); } - if (currentSelection.equalsIgnoreCase("pdb") && ((debounceTrap % 2) == 0)) + if (currentSelection.equalsIgnoreCase("pdb") + && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) == 0))) { pdbSourceAction(); } - + database.action = -1; } }); + dbeg.setText(""); jPanel2.add(databaseButt, java.awt.BorderLayout.NORTH); jPanel2.add(dbeg, java.awt.BorderLayout.CENTER); @@ -774,7 +774,7 @@ public class SequenceFetcher extends JPanel implements Runnable AlignmentI parseResult(String result, String title) { String format = new IdentifyFile().Identify(result, "Paste"); - Alignment sequences = null; + AlignmentI sequences = null; if (FormatAdapter.isValidFormat(format)) { sequences = null; @@ -891,6 +891,8 @@ public class SequenceFetcher extends JPanel implements Runnable return progressIndicator; } + + public void setProgressIndicator(IProgressIndicator progressIndicator) { this.progressIndicator = progressIndicator;