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
merge from develop
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
c330a92
..
6a0d010
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-358,18
+358,19
@@
public class SequenceFetcher extends JPanel implements Runnable
{
debounceTrap++;
String currentSelection = database.getSelectedItem();
{
debounceTrap++;
String currentSelection = database.getSelectedItem();
-
if (!currentSelection.equalsIgnoreCase("pdb"))
{
otherSourceAction();
}
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();
}
{
pdbSourceAction();
}
-
+ database.action = -1;
}
});
}
});
+
dbeg.setText("");
jPanel2.add(databaseButt, java.awt.BorderLayout.NORTH);
jPanel2.add(dbeg, java.awt.BorderLayout.CENTER);
dbeg.setText("");
jPanel2.add(databaseButt, java.awt.BorderLayout.NORTH);
jPanel2.add(dbeg, java.awt.BorderLayout.CENTER);
@@
-890,6
+891,8
@@
public class SequenceFetcher extends JPanel implements Runnable
return progressIndicator;
}
return progressIndicator;
}
+
+
public void setProgressIndicator(IProgressIndicator progressIndicator)
{
this.progressIndicator = progressIndicator;
public void setProgressIndicator(IProgressIndicator progressIndicator)
{
this.progressIndicator = progressIndicator;