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
JAL-1925 update source version in license
[jalview.git]
/
src
/
jalview
/
gui
/
JDatabaseTree.java
diff --git
a/src/jalview/gui/JDatabaseTree.java
b/src/jalview/gui/JDatabaseTree.java
index
94ac141
..
0720d50
100644
(file)
--- a/
src/jalview/gui/JDatabaseTree.java
+++ b/
src/jalview/gui/JDatabaseTree.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-60,6
+60,8
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
boolean allowMultiSelections = false;
{
boolean allowMultiSelections = false;
+ public int action;
+
JButton getDatabaseSelectorButton()
{
final JButton viewdbs = new JButton(
JButton getDatabaseSelectorButton()
{
final JButton viewdbs = new JButton(
@@
-86,7
+88,9
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
{
public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
{
- initDialogFrame(this, true, false, MessageManager.getString("label.select_database_retrieval_source"),
+ initDialogFrame(this, true, false,
+ MessageManager
+ .getString("label.select_database_retrieval_source"),
650, 490);
/*
* Dynamically generated database list will need a translation function from
650, 490);
/*
* Dynamically generated database list will need a translation function from
@@
-219,7
+223,9
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
}
else
{
}
else
{
- throw new Error(MessageManager.getString("error.implementation_error_cant_reorder_tree"));
+ throw new Error(
+ MessageManager
+ .getString("error.implementation_error_cant_reorder_tree"));
}
}
jalview.util.QuickSort.sort(names, nodes);
}
}
jalview.util.QuickSort.sort(names, nodes);
@@
-410,8
+416,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
if (allowMultiSelections)
{
dbstatus.setText(MessageManager.formatMessage(
if (allowMultiSelections)
{
dbstatus.setText(MessageManager.formatMessage(
- "label.selected_database_to_fetch_from", new String[]
- {
+ "label.selected_database_to_fetch_from", new String[] {
Integer.valueOf(srcs.size()).toString(),
(srcs.size() == 1 ? "" : "s"),
(srcs.size() > 0 ? " with " + x + " test quer"
Integer.valueOf(srcs.size()).toString(),
(srcs.size() == 1 ? "" : "s"),
(srcs.size() > 0 ? " with " + x + " test quer"
@@
-423,13
+428,11
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
if (nm.length() > 0)
{
dbstatus.setText(MessageManager.formatMessage(
if (nm.length() > 0)
{
dbstatus.setText(MessageManager.formatMessage(
- "label.database_param", new String[]
- { nm }));
+ "label.database_param", new String[] { nm }));
if (qr.length() > 0)
{
dbstatex.setText(MessageManager.formatMessage(
if (qr.length() > 0)
{
dbstatex.setText(MessageManager.formatMessage(
- "label.example_param", new String[]
- { qr }));
+ "label.example_param", new String[] { qr }));
}
else
{
}
else
{
@@
-544,10
+547,12
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
{
{
if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
{
+ action = arg0.getKeyCode();
okPressed();
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{
okPressed();
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{
+ action = arg0.getKeyCode();
cancelPressed();
}
}
cancelPressed();
}
}