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 branch 'develop' into merge/develop_bug/JAL-2154projectMappings
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
a9df882
..
5d4ea68
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-116,8
+116,6
@@
public class SequenceFetcher extends JPanel implements Runnable
private static Thread initingThread = null;
private static Thread initingThread = null;
- int debounceTrap = 0;
-
public JTextArea getTextArea()
{
return textArea;
public JTextArea getTextArea()
{
return textArea;
@@
-303,13
+301,21
@@
public class SequenceFetcher extends JPanel implements Runnable
try
{
List<DbSourceProxy> sp = sfetch.getSourceProxy(selectedDb);
try
{
List<DbSourceProxy> sp = sfetch.getSourceProxy(selectedDb);
- if (sp == null || sp.size() != 1)
+ for (DbSourceProxy sourcep : sp)
+ {
+ if (sourcep.getTier() == 0)
+ {
+ database.selection = Arrays
+ .asList(new DbSourceProxy[] { sourcep });
+ break;
+ }
+ }
+ if (database.selection == null || database.selection.size() == 0)
{
System.err.println("Ignoring fetch parameter db='" + selectedDb
+ "'");
return false;
}
{
System.err.println("Ignoring fetch parameter db='" + selectedDb
+ "'");
return false;
}
- database.selection = sp;
textArea.setText(queryString);
} catch (Exception q)
{
textArea.setText(queryString);
} catch (Exception q)
{
@@
-445,7
+451,6
@@
public class SequenceFetcher extends JPanel implements Runnable
jPanel1.add(example);
jPanel1.add(clear);
jPanel1.add(close);
jPanel1.add(example);
jPanel1.add(clear);
jPanel1.add(close);
- jPanel3.add(jPanel2, java.awt.BorderLayout.CENTER);
jPanel2.setLayout(borderLayout3);
databaseButt = /*database.getDatabaseSelectorButton();
final JButton viewdbs =*/new JButton(
jPanel2.setLayout(borderLayout3);
databaseButt = /*database.getDatabaseSelectorButton();
final JButton viewdbs =*/new JButton(
@@
-466,7
+471,6
@@
public class SequenceFetcher extends JPanel implements Runnable
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- debounceTrap++;
String currentSelection = database.getSelectedItem();
if (currentSelection == null)
{
String currentSelection = database.getSelectedItem();
if (currentSelection == null)
{
@@
-475,13
+479,11
@@
public class SequenceFetcher extends JPanel implements Runnable
showPanel();
showPanel();
- if (currentSelection.equalsIgnoreCase("pdb")
- && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) == 0)))
+ if ("pdb".equalsIgnoreCase(currentSelection))
{
pdbSourceAction();
}
{
pdbSourceAction();
}
- else if (currentSelection.equalsIgnoreCase("uniprot")
- && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) == 0)))
+ else if ("uniprot".equalsIgnoreCase(currentSelection))
{
uniprotSourceAction();
}
{
uniprotSourceAction();
}