X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=6f602ada76a9a247781e414938f519b21cccd8c1;hb=ec8d3431b7f8c7cfecddb5bd87997434cdcf96c2;hp=30fbe134e98b63c53fcaf8d217325759b52cc68e;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 30fbe13..6f602ad 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.8.2)
- * Copyright (C) 2014 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.
  * 
@@ -46,6 +46,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;
@@ -60,9 +61,12 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 {
   boolean allowMultiSelections = false;
 
+  public int action;
+
   JButton getDatabaseSelectorButton()
   {
-    final JButton viewdbs = new JButton(MessageManager.getString("action.select_ddbb"));
+    final JButton viewdbs = new JButton(
+            MessageManager.getString("action.select_ddbb"));
     viewdbs.addActionListener(new ActionListener()
     {
 
@@ -85,7 +89,9 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
   public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
   {
-    initDialogFrame(this, true, false, "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
@@ -219,7 +225,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       else
       {
         throw new Error(
-                "Implementation Error: Can't reorder this tree. Not DefaultMutableTreeNode.");
+                MessageManager
+                        .getString("error.implementation_error_cant_reorder_tree"));
       }
     }
     jalview.util.QuickSort.sort(names, nodes);
@@ -238,6 +245,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     public DbTreeRenderer(JDatabaseTree me)
     {
       us = me;
+      ToolTipManager.sharedInstance().registerComponent(dbviews);
     }
 
     private Component returnLabel(String txt)
@@ -259,19 +267,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);
@@ -365,8 +377,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
             }
             else
             {
-              srcs.add(sfetcher.getSourceProxy((String) dmt
-                      .getUserObject()).get(0));
+              srcs.add(sfetcher
+                      .getSourceProxy((String) dmt.getUserObject()).get(0));
               forcedFirstChild = true;
             }
           }
@@ -409,17 +421,24 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
     if (allowMultiSelections)
     {
-      dbstatus.setText(MessageManager.formatMessage("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") : ".")}));
+      dbstatus.setText(MessageManager.formatMessage(
+              "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(" ");
     }
     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}));
+          dbstatex.setText(MessageManager.formatMessage(
+                  "label.example_param", new String[] { qr }));
         }
         else
         {
@@ -534,10 +553,12 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   {
     if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
     {
+      action = arg0.getKeyCode();
       okPressed();
     }
     if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
     {
+      action = arg0.getKeyCode();
       cancelPressed();
     }
   }