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-2110 add 'mapFromId' to Mapping (for e.g. EMBL CDS protein_id)
[jalview.git]
/
src
/
jalview
/
gui
/
JDatabaseTree.java
diff --git
a/src/jalview/gui/JDatabaseTree.java
b/src/jalview/gui/JDatabaseTree.java
index
a886723
..
8294d2b
100644
(file)
--- a/
src/jalview/gui/JDatabaseTree.java
+++ b/
src/jalview/gui/JDatabaseTree.java
@@
-26,7
+26,6
@@
import jalview.ws.seqfetcher.DbSourceProxy;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.Container;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
@@
-46,6
+45,7
@@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTree;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTree;
+import javax.swing.ToolTipManager;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
@@
-72,7
+72,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
@Override
public void actionPerformed(ActionEvent arg0)
{
@Override
public void actionPerformed(ActionEvent arg0)
{
- showDialog(null);
+ showDialog();
}
});
return viewdbs;
}
});
return viewdbs;
@@
-187,6
+187,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
jc.validate();
// j.setPreferredSize(new Dimension(300,50));
add(jc, BorderLayout.CENTER);
jc.validate();
// j.setPreferredSize(new Dimension(300,50));
add(jc, BorderLayout.CENTER);
+ ok.setEnabled(false);
j.add(ok);
j.add(cancel);
add(j, BorderLayout.SOUTH);
j.add(ok);
j.add(cancel);
add(j, BorderLayout.SOUTH);
@@
-244,6
+245,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
public DbTreeRenderer(JDatabaseTree me)
{
us = me;
public DbTreeRenderer(JDatabaseTree me)
{
us = me;
+ ToolTipManager.sharedInstance().registerComponent(dbviews);
}
private Component returnLabel(String txt)
}
private Component returnLabel(String txt)
@@
-265,19
+267,23
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
value = vl.getUserObject();
if (value instanceof DbSourceProxy)
{
value = vl.getUserObject();
if (value instanceof DbSourceProxy)
{
- val = (((DbSourceProxy) value).getDbName());
+ val = ((DbSourceProxy) value).getDbName();
+ if (((DbSourceProxy) value).getDescription() != null)
+ { // getName()
+ this.setToolTipText(((DbSourceProxy) value).getDescription());
+ }
}
else
{
if (value instanceof String)
{
}
else
{
if (value instanceof String)
{
- val = ((String) value);
+ val = (String) value;
}
}
}
if (value == null)
{
}
}
}
if (value == null)
{
- val = ("");
+ val = "";
}
return super.getTreeCellRendererComponent(tree, val, selected,
expanded, leaf, row, hasFocus);
}
return super.getTreeCellRendererComponent(tree, val, selected,
expanded, leaf, row, hasFocus);
@@
-314,7
+320,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
closeDialog();
}
closeDialog();
}
- private void showDialog(Container parent)
+ void showDialog()
{
oldselection = selection;
oldtsel = tsel;
{
oldselection = selection;
oldtsel = tsel;
@@
-343,10
+349,12
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
return;
}
{
return;
}
+ ok.setEnabled(false);
if (dbviews.getSelectionCount() == 0)
{
selection = null;
}
if (dbviews.getSelectionCount() == 0)
{
selection = null;
}
+
tsel = dbviews.getSelectionPaths();
boolean forcedFirstChild = false;
List<DbSourceProxy> srcs = new ArrayList<DbSourceProxy>();
tsel = dbviews.getSelectionPaths();
boolean forcedFirstChild = false;
List<DbSourceProxy> srcs = new ArrayList<DbSourceProxy>();
@@
-358,6
+366,10
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
.getLastPathComponent();
if (dmt.getUserObject() != null)
{
.getLastPathComponent();
if (dmt.getUserObject() != null)
{
+ /*
+ * enable OK button once a selection has been made
+ */
+ ok.setEnabled(true);
if (dmt.getUserObject() instanceof DbSourceProxy)
{
srcs.add((DbSourceProxy) dmt.getUserObject());
if (dmt.getUserObject() instanceof DbSourceProxy)
{
srcs.add((DbSourceProxy) dmt.getUserObject());
@@
-413,6
+425,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
}
}
}
}
+ dbstatex.setText(" ");
if (allowMultiSelections)
{
dbstatus.setText(MessageManager.formatMessage(
if (allowMultiSelections)
{
dbstatus.setText(MessageManager.formatMessage(
@@
-421,7
+434,6
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
(srcs.size() == 1 ? "" : "s"),
(srcs.size() > 0 ? " with " + x + " test quer"
+ (x == 1 ? "y" : "ies") : ".") }));
(srcs.size() == 1 ? "" : "s"),
(srcs.size() > 0 ? " with " + x + " test quer"
+ (x == 1 ? "y" : "ies") : ".") }));
- dbstatex.setText(" ");
}
else
{
}
else
{
@@
-434,10
+446,6
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
dbstatex.setText(MessageManager.formatMessage(
"label.example_param", new String[] { qr }));
}
dbstatex.setText(MessageManager.formatMessage(
"label.example_param", new String[] { qr }));
}
- else
- {
- dbstatex.setText(" ");
- }
}
else
{
}
else
{