X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=0a6b9d64e9388f7c06acf22bc251aef06f3cef6a;hb=8f5e471f79fdd55b7dc397f942232cb036c14017;hp=6d8c4e0623700f1a62fb11a85d46a64c188ee0c3;hpb=1fea862e99e1fdd5eb85d5feaec2d28de58828b4;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 6d8c4e0..0a6b9d6 100644
--- 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.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;
@@ -73,7 +74,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       @Override
       public void actionPerformed(ActionEvent arg0)
       {
-        showDialog(null);
+        showDialog();
       }
     });
     return viewdbs;
@@ -87,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
@@ -147,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()
     {
 
@@ -169,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;
@@ -186,7 +201,6 @@ 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);
@@ -225,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);
@@ -238,8 +251,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     }
   }
 
-  private class DbTreeRenderer extends DefaultTreeCellRenderer implements
-          TreeCellRenderer
+  private class DbTreeRenderer extends DefaultTreeCellRenderer
+          implements TreeCellRenderer
   {
     JDatabaseTree us;
 
@@ -309,7 +322,6 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
   protected void okPressed()
   {
     _setSelectionState();
-    closeDialog();
   }
 
   @Override
@@ -321,7 +333,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     closeDialog();
   }
 
-  private void showDialog(Container parent)
+  void showDialog()
   {
     oldselection = selection;
     oldtsel = tsel;
@@ -363,8 +375,8 @@ 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)
         {
           /*
@@ -379,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;
             }
           }
@@ -430,22 +442,26 @@ 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(),
+              "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") : ".") }));
+                  (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 }));
+          dbstatex.setText(MessageManager
+                  .formatMessage("label.example_param", new String[]
+                  { qr }));
         }
       }
       else
@@ -558,6 +574,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     {
       action = arg0.getKeyCode();
       okPressed();
+      closeDialog();
     }
     if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
     {