X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=2a3d7887d9454c0066b60f09430ed894d37945ed;hb=7c692f60c72e7a76f5bb4b2129edf6b4330e0a02;hp=c6b16b152eca0eb3b6f2fe42abdc053f4c3d924a;hpb=ad1ffbe2154b4171ca223c4400552def22c7606d;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index c6b16b1..2a3d788 100644
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -1,11 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import jalview.bin.Cache;
+import jalview.util.MessageManager;
 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;
@@ -13,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;
@@ -25,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;
@@ -39,16 +62,19 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 {
   boolean allowMultiSelections = false;
 
+  public int action;
+
   JButton getDatabaseSelectorButton()
   {
-    final JButton viewdbs = new JButton("--- Select Database ---");
+    final JButton viewdbs = new JButton(
+            MessageManager.getString("action.select_ddbb"));
     viewdbs.addActionListener(new ActionListener()
     {
 
       @Override
       public void actionPerformed(ActionEvent arg0)
       {
-        showDialog(null);
+        showDialog();
       }
     });
     return viewdbs;
@@ -64,7 +90,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
@@ -75,7 +103,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     Hashtable<String, DefaultMutableTreeNode> source = new Hashtable<String, DefaultMutableTreeNode>();
     sfetcher = sfetch;
     String dbs[] = sfetch.getSupportedDb();
-    Hashtable<String,String> ht = new Hashtable<String,String>();
+    Hashtable<String, String> ht = new Hashtable<String, String>();
     for (int i = 0; i < dbs.length; i++)
     {
       tn = source.get(dbs[i]);
@@ -142,6 +170,19 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
         _setSelectionState();
       }
     });
+    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);
@@ -161,6 +202,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     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);
@@ -170,33 +212,41 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
   private void sortTreeNodes(DefaultMutableTreeNode root)
   {
-    if (root.getChildCount()==0)
+    if (root.getChildCount() == 0)
     {
       return;
     }
-    int count=root.getChildCount();
-    String[] names=new String[count];
-    DefaultMutableTreeNode[] nodes=new DefaultMutableTreeNode[count];
-    for (int i=0;i<count;i++)
+    int count = root.getChildCount();
+    String[] names = new String[count];
+    DefaultMutableTreeNode[] nodes = new DefaultMutableTreeNode[count];
+    for (int i = 0; i < count; i++)
     {
       TreeNode node = root.getChildAt(i);
       if (node instanceof DefaultMutableTreeNode)
       {
-        DefaultMutableTreeNode child=(DefaultMutableTreeNode) node;
-        nodes[i]=child;
-        if (child.getUserObject() instanceof DbSourceProxy) {
-          names[i]=((DbSourceProxy)child.getUserObject()).getDbName().toLowerCase();
-        } else {
+        DefaultMutableTreeNode child = (DefaultMutableTreeNode) node;
+        nodes[i] = child;
+        if (child.getUserObject() instanceof DbSourceProxy)
+        {
+          names[i] = ((DbSourceProxy) child.getUserObject()).getDbName()
+                  .toLowerCase();
+        }
+        else
+        {
           names[i] = ((String) child.getUserObject()).toLowerCase();
           sortTreeNodes(child);
         }
-      } else {
-        throw new Error("Implementation Error: Can't reorder this tree. Not DefaultMutableTreeNode.");
+      }
+      else
+      {
+        throw new Error(
+                MessageManager
+                        .getString("error.implementation_error_cant_reorder_tree"));
       }
     }
-    jalview.util.QuickSort.sort(names,  nodes);
+    jalview.util.QuickSort.sort(names, nodes);
     root.removeAllChildren();
-    for (int i=count-1;i>=0;i--)
+    for (int i = count - 1; i >= 0; i--)
     {
       root.add(nodes[i]);
     }
@@ -210,6 +260,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     public DbTreeRenderer(JDatabaseTree me)
     {
       us = me;
+      ToolTipManager.sharedInstance().registerComponent(dbviews);
     }
 
     private Component returnLabel(String txt)
@@ -231,19 +282,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);
@@ -268,7 +323,6 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   protected void okPressed()
   {
     _setSelectionState();
-    closeDialog();
   }
 
   @Override
@@ -280,7 +334,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     closeDialog();
   }
 
-  private void showDialog(Container parent)
+  void showDialog()
   {
     oldselection = selection;
     oldtsel = tsel;
@@ -309,10 +363,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<DbSourceProxy> srcs = new ArrayList<DbSourceProxy>();
@@ -324,6 +380,10 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
                 .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());
@@ -337,21 +397,9 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
             }
             else
             {
-              if ((admt = dmt.getFirstLeaf()) != null
-                      && admt.getUserObject() != null)
-              {
-                // modify db selection to just first leaf.
-                if (admt.getUserObject() instanceof DbSourceProxy)
-                {
-                  srcs.add((DbSourceProxy) admt.getUserObject());
-                }
-                else
-                {
-                  srcs.add(sfetcher.getSourceProxy(
-                          (String) admt.getUserObject()).get(0));
-                }
-                forcedFirstChild = true;
-              }
+              srcs.add(sfetcher
+                      .getSourceProxy((String) dmt.getUserObject()).get(0));
+              forcedFirstChild = true;
             }
           }
         }
@@ -391,29 +439,26 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       }
     }
 
+    dbstatex.setText(" ");
     if (allowMultiSelections)
     {
-      dbstatus.setText("Selected "
-              + srcs.size()
-              + " database"
-              + (srcs.size() == 1 ? "" : "s")
-              + " to fetch from"
-              + (srcs.size() > 0 ? " with " + x + " test quer"
-                      + (x == 1 ? "y" : "ies") : "."));
-      dbstatex.setText(" ");
+      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") : ".") }));
     }
     else
     {
       if (nm.length() > 0)
       {
-        dbstatus.setText("Database: " + nm);
+        dbstatus.setText(MessageManager.formatMessage(
+                "label.database_param", new String[] { nm }));
         if (qr.length() > 0)
         {
-          dbstatex.setText("Example: " + qr);
-        }
-        else
-        {
-          dbstatex.setText(" ");
+          dbstatex.setText(MessageManager.formatMessage(
+                  "label.example_param", new String[] { qr }));
         }
       }
       else
@@ -524,10 +569,13 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   {
     if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
     {
+      action = arg0.getKeyCode();
       okPressed();
+      closeDialog();
     }
     if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
     {
+      action = arg0.getKeyCode();
       cancelPressed();
     }
   }