X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=0a6b9d64e9388f7c06acf22bc251aef06f3cef6a;hb=9e926ac4305fd9dff38b6e079e55b4f50664d544;hp=0ee8008eeddf8bb018aefbdd10f870851aec9515;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java index 0ee8008..0a6b9d6 100644 --- a/src/jalview/gui/JDatabaseTree.java +++ b/src/jalview/gui/JDatabaseTree.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -26,7 +26,6 @@ import jalview.ws.seqfetcher.DbSourceProxy; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.GridLayout; @@ -34,6 +33,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.HashSet; import java.util.Hashtable; @@ -46,6 +47,7 @@ import javax.swing.JLabel; 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; @@ -72,7 +74,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener @Override public void actionPerformed(ActionEvent arg0) { - showDialog(null); + showDialog(); } }); return viewdbs; @@ -86,12 +88,13 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener private JLabel dbstatus, dbstatex; + private JPanel mainPanel = new JPanel(new BorderLayout()); + public JDatabaseTree(jalview.ws.SequenceFetcher sfetch) { - initDialogFrame(this, true, false, - MessageManager - .getString("label.select_database_retrieval_source"), - 650, 490); + mainPanel.add(this); + initDialogFrame(mainPanel, true, false, MessageManager + .getString("label.select_database_retrieval_source"), 650, 490); /* * Dynamically generated database list will need a translation function from * internal source to externally distinct names. UNIPROT and UP_NAME are @@ -146,19 +149,19 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener } // and sort the tree sortTreeNodes(root); - svp = new JScrollPane(); - // svp.setAutoscrolls(true); dbviews = new JTree(new DefaultTreeModel(root, false)); dbviews.setCellRenderer(new DbTreeRenderer(this)); - dbviews.getSelectionModel().setSelectionMode( - TreeSelectionModel.SINGLE_TREE_SELECTION); - svp.getViewport().setView(dbviews); - // svp.getViewport().setMinimumSize(new Dimension(300,200)); - // svp.setSize(300,250); - // JPanel panel=new JPanel(); - // panel.setSize(new Dimension(350,220)); - // panel.add(svp); + dbviews.getSelectionModel() + .setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); + svp = new JScrollPane(dbviews); + svp.setMinimumSize(new Dimension(100, 200)); + svp.setPreferredSize(new Dimension(200, 400)); + svp.setMaximumSize(new Dimension(300, 600)); + + JPanel panel = new JPanel(new BorderLayout()); + panel.setSize(new Dimension(350, 220)); + panel.add(svp); dbviews.addTreeSelectionListener(new TreeSelectionListener() { @@ -168,8 +171,21 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener _setSelectionState(); } }); - JPanel jc = new JPanel(new BorderLayout()), j = new JPanel( - new FlowLayout()); + dbviews.addMouseListener(new MouseAdapter() + { + + @Override + public void mousePressed(MouseEvent e) + { + if (e.getClickCount() == 2) + { + okPressed(); + closeDialog(); + } + } + }); + JPanel jc = new JPanel(new BorderLayout()), + j = new JPanel(new FlowLayout()); jc.add(svp, BorderLayout.CENTER); java.awt.Font f; @@ -185,8 +201,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener dbstat.add(dbstatex); jc.add(dbstat, BorderLayout.SOUTH); 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); @@ -223,9 +239,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener } 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); @@ -236,14 +251,15 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener } } - private class DbTreeRenderer extends DefaultTreeCellRenderer implements - TreeCellRenderer + private class DbTreeRenderer extends DefaultTreeCellRenderer + implements TreeCellRenderer { JDatabaseTree us; public DbTreeRenderer(JDatabaseTree me) { us = me; + ToolTipManager.sharedInstance().registerComponent(dbviews); } private Component returnLabel(String txt) @@ -265,19 +281,23 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener 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) { - val = ((String) value); + val = (String) value; } } } if (value == null) { - val = (""); + val = ""; } return super.getTreeCellRendererComponent(tree, val, selected, expanded, leaf, row, hasFocus); @@ -302,7 +322,6 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener protected void okPressed() { _setSelectionState(); - closeDialog(); } @Override @@ -314,7 +333,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener closeDialog(); } - private void showDialog(Container parent) + void showDialog() { oldselection = selection; oldtsel = tsel; @@ -343,10 +362,12 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener { return; } + ok.setEnabled(false); if (dbviews.getSelectionCount() == 0) { selection = null; } + tsel = dbviews.getSelectionPaths(); boolean forcedFirstChild = false; List srcs = new ArrayList(); @@ -354,10 +375,14 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener { for (TreePath tp : tsel) { - DefaultMutableTreeNode admt, dmt = (DefaultMutableTreeNode) tp - .getLastPathComponent(); + DefaultMutableTreeNode admt, + dmt = (DefaultMutableTreeNode) tp.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()); @@ -366,13 +391,13 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener { if (allowMultiSelections) { - srcs.addAll(sfetcher.getSourceProxy((String) dmt - .getUserObject())); + srcs.addAll(sfetcher + .getSourceProxy((String) dmt.getUserObject())); } else { - srcs.add(sfetcher - .getSourceProxy((String) dmt.getUserObject()).get(0)); + srcs.add(sfetcher.getSourceProxy((String) dmt.getUserObject()) + .get(0)); forcedFirstChild = true; } } @@ -413,30 +438,30 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener } } + dbstatex.setText(" "); if (allowMultiSelections) { dbstatus.setText(MessageManager.formatMessage( - "label.selected_database_to_fetch_from", new String[] { - Integer.valueOf(srcs.size()).toString(), + "label.selected_database_to_fetch_from", new String[] + { Integer.valueOf(srcs.size()).toString(), (srcs.size() == 1 ? "" : "s"), - (srcs.size() > 0 ? " with " + x + " test quer" - + (x == 1 ? "y" : "ies") : ".") })); - dbstatex.setText(" "); + (srcs.size() > 0 + ? " with " + x + " test quer" + + (x == 1 ? "y" : "ies") + : ".") })); } else { if (nm.length() > 0) { - dbstatus.setText(MessageManager.formatMessage( - "label.database_param", new String[] { nm })); + dbstatus.setText(MessageManager + .formatMessage("label.database_param", new String[] + { nm })); if (qr.length() > 0) { - dbstatex.setText(MessageManager.formatMessage( - "label.example_param", new String[] { qr })); - } - else - { - dbstatex.setText(" "); + dbstatex.setText(MessageManager + .formatMessage("label.example_param", new String[] + { qr })); } } else @@ -549,6 +574,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener { action = arg0.getKeyCode(); okPressed(); + closeDialog(); } if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE) {