X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=c6b16b152eca0eb3b6f2fe42abdc053f4c3d924a;hb=44120c9a2b84039ad1513a2ea5a267713d1e291a;hp=385d1bd146c58d318817886759745399c56a3089;hpb=080dd87e67e470834a0d889c39081558f21c48b4;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 385d1bd..c6b16b1 100644
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -8,9 +8,13 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Vector;
@@ -21,20 +25,20 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
-import javax.swing.JViewport;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import com.sun.java.help.search.DBPartParameters;
-
-public class JDatabaseTree extends JalviewDialog
+public class JDatabaseTree extends JalviewDialog implements KeyListener
 {
+  boolean allowMultiSelections = false;
+
   JButton getDatabaseSelectorButton()
   {
     final JButton viewdbs = new JButton("--- Select Database ---");
@@ -56,20 +60,22 @@ public class JDatabaseTree extends JalviewDialog
 
   private jalview.ws.SequenceFetcher sfetcher;
 
+  private JLabel dbstatus, dbstatex;
+
   public JDatabaseTree(jalview.ws.SequenceFetcher sfetch)
   {
-    super();
+    initDialogFrame(this, true, false, "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
      * identical DB sources, and should be collapsed.
      */
     DefaultMutableTreeNode tn = null, root = new DefaultMutableTreeNode();
-    Hashtable<DbSourceProxy, DefaultMutableTreeNode> tns = new Hashtable<DbSourceProxy, DefaultMutableTreeNode>();
     Hashtable<String, DefaultMutableTreeNode> source = new Hashtable<String, DefaultMutableTreeNode>();
     sfetcher = sfetch;
     String dbs[] = sfetch.getSupportedDb();
-    Hashtable ht = new Hashtable();
+    Hashtable<String,String> ht = new Hashtable<String,String>();
     for (int i = 0; i < dbs.length; i++)
     {
       tn = source.get(dbs[i]);
@@ -84,8 +90,12 @@ public class JDatabaseTree extends JalviewDialog
         {
           tn.add(new DefaultMutableTreeNode(dbp, false));
           ht.put(dbp.getDbName(), dbp.getDbName());
-        } else {
-          System.err.println("dupe ig for : "+dbs[i]+" \t"+dbp.getDbName());
+        }
+        else
+        {
+          System.err.println("dupe ig for : " + dbs[i] + " \t"
+                  + dbp.getDbName() + " (" + dbp.getDbSource() + ")");
+          source.remove(tn);
         }
       }
     }
@@ -98,36 +108,100 @@ public class JDatabaseTree extends JalviewDialog
       }
       if (tn.getChildCount() == 1)
       {
+        DefaultMutableTreeNode ttn = (DefaultMutableTreeNode) tn
+                .getChildAt(0);
         // remove nodes with only one child
-        source.put(dbs[i], tn = (DefaultMutableTreeNode) tn.getChildAt(0));
+        tn.setUserObject(ttn.getUserObject());
+        tn.removeAllChildren();
+        source.put(dbs[i], tn);
+        tn.setAllowsChildren(false);
       }
       root.add(tn);
     }
-    initDialogFrame(this, true, false, "Select Database Retrieval Source",
-            400, 300);
+    // and sort the tree
+    sortTreeNodes(root);
     svp = new JScrollPane();
-    //svp.setAutoscrolls(true);
+    // 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,250));
-    //svp.setSize(300,250);
-//    JPanel panel=new JPanel();
-//    panel.setSize(new Dimension(350,220));
-//    panel.add(svp);
-    
-    add(svp, BorderLayout.NORTH);
-    JPanel j = new JPanel(new FlowLayout());
-    j.setPreferredSize(new Dimension(300,50));
+    // 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.addTreeSelectionListener(new TreeSelectionListener()
+    {
+
+      @Override
+      public void valueChanged(TreeSelectionEvent arg0)
+      {
+        _setSelectionState();
+      }
+    });
+    JPanel jc = new JPanel(new BorderLayout()), j = new JPanel(
+            new FlowLayout());
+    jc.add(svp, BorderLayout.CENTER);
+
+    java.awt.Font f;
+    // TODO: make the panel stay a fixed size for longest dbname+example set.
+    JPanel dbstat = new JPanel(new GridLayout(2, 1));
+    dbstatus = new JLabel(" "); // set the height correctly for layout
+    dbstatus.setFont(f = JvSwingUtils.getLabelFont(false, true));
+    dbstatus.setSize(new Dimension(290, 50));
+    dbstatex = new JLabel(" ");
+    dbstatex.setFont(f);
+    dbstatex.setSize(new Dimension(290, 50));
+    dbstat.add(dbstatus);
+    dbstat.add(dbstatex);
+    jc.add(dbstat, BorderLayout.SOUTH);
+    jc.validate();
+    // j.setPreferredSize(new Dimension(300,50));
+    add(jc, BorderLayout.CENTER);
     j.add(ok);
     j.add(cancel);
-    add(j, BorderLayout.CENTER);
+    add(j, BorderLayout.SOUTH);
+    dbviews.addKeyListener(this);
     validate();
   }
 
+  private void sortTreeNodes(DefaultMutableTreeNode root)
+  {
+    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++)
+    {
+      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 {
+          names[i] = ((String) child.getUserObject()).toLowerCase();
+          sortTreeNodes(child);
+        }
+      } else {
+        throw new Error("Implementation Error: Can't reorder this tree. Not DefaultMutableTreeNode.");
+      }
+    }
+    jalview.util.QuickSort.sort(names,  nodes);
+    root.removeAllChildren();
+    for (int i=count-1;i>=0;i--)
+    {
+      root.add(nodes[i]);
+    }
+  }
+
   private class DbTreeRenderer extends DefaultTreeCellRenderer implements
           TreeCellRenderer
   {
@@ -177,7 +251,9 @@ public class JDatabaseTree extends JalviewDialog
     }
   }
 
-  List<DbSourceProxy> selection = null;
+  List<DbSourceProxy> oldselection, selection = null;
+
+  TreePath[] tsel = null, oldtsel = null;
 
   @Override
   protected void raiseClosed()
@@ -198,11 +274,16 @@ public class JDatabaseTree extends JalviewDialog
   @Override
   protected void cancelPressed()
   {
+    selection = oldselection;
+    tsel = oldtsel;
+    _revertSelectionState();
     closeDialog();
   }
 
   private void showDialog(Container parent)
   {
+    oldselection = selection;
+    oldtsel = tsel;
     validate();
     waitForInput();
   }
@@ -217,30 +298,131 @@ public class JDatabaseTree extends JalviewDialog
     return selection;
   }
 
+  /**
+   * disable or enable selection handler
+   */
+  boolean handleSelections = true;
+
   private void _setSelectionState()
   {
+    if (!handleSelections)
+    {
+      return;
+    }
     if (dbviews.getSelectionCount() == 0)
     {
       selection = null;
     }
+    tsel = dbviews.getSelectionPaths();
+    boolean forcedFirstChild = false;
     List<DbSourceProxy> srcs = new ArrayList<DbSourceProxy>();
-    for (TreePath tp : dbviews.getSelectionPaths())
+    if (tsel != null)
+    {
+      for (TreePath tp : tsel)
+      {
+        DefaultMutableTreeNode admt, dmt = (DefaultMutableTreeNode) tp
+                .getLastPathComponent();
+        if (dmt.getUserObject() != null)
+        {
+          if (dmt.getUserObject() instanceof DbSourceProxy)
+          {
+            srcs.add((DbSourceProxy) dmt.getUserObject());
+          }
+          else
+          {
+            if (allowMultiSelections)
+            {
+              srcs.addAll(sfetcher.getSourceProxy((String) dmt
+                      .getUserObject()));
+            }
+            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;
+              }
+            }
+          }
+        }
+      }
+    }
+    updateDbStatus(srcs, forcedFirstChild);
+    selection = srcs;
+  }
+
+  private void _revertSelectionState()
+  {
+    handleSelections = false;
+    if (selection == null || selection.size() == 0)
     {
-      DefaultMutableTreeNode dmt = (DefaultMutableTreeNode) tp
-              .getLastPathComponent();
-      if (dmt.getUserObject() != null)
+      dbviews.clearSelection();
+    }
+    else
+    {
+      dbviews.setSelectionPaths(tsel);
+    }
+    handleSelections = true;
+  }
+
+  private void updateDbStatus(List<DbSourceProxy> srcs,
+          boolean forcedFirstChild)
+  {
+    int x = 0;
+    String nm = "", qr = "";
+    for (DbSourceProxy dbs : srcs)
+    {
+      String tq = dbs.getTestQuery();
+      nm = dbs.getDbName();
+      if (tq != null && tq.trim().length() > 0 && dbs.isValidReference(tq))
+      {
+        qr = tq;
+        x++;
+      }
+    }
+
+    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(" ");
+    }
+    else
+    {
+      if (nm.length() > 0)
       {
-        if (dmt.getUserObject() instanceof DbSourceProxy)
+        dbstatus.setText("Database: " + nm);
+        if (qr.length() > 0)
         {
-          srcs.add((DbSourceProxy) dmt.getUserObject());
+          dbstatex.setText("Example: " + qr);
         }
         else
         {
-          srcs.addAll(sfetcher.getSourceProxy((String) dmt.getUserObject()));
+          dbstatex.setText(" ");
         }
       }
+      else
+      {
+        dbstatus.setText(" ");
+      }
     }
-    selection = srcs;
+    dbstatus.invalidate();
+    dbstatex.invalidate();
   }
 
   public String getSelectedItem()
@@ -259,13 +441,19 @@ public class JDatabaseTree extends JalviewDialog
       return null;
     }
     StringBuffer sb = new StringBuffer();
+    HashSet<String> hs = new HashSet<String>();
     for (DbSourceProxy dbs : getSelectedSources())
     {
-      if (sb.length() > 0)
+      String tq = dbs.getTestQuery();
+      ;
+      if (hs.add(tq))
       {
-        sb.append(";");
+        if (sb.length() > 0)
+        {
+          sb.append(";");
+        }
+        sb.append(tq);
       }
-      sb.append(dbs.getTestQuery());
     }
     return sb.toString();
   }
@@ -330,4 +518,31 @@ public class JDatabaseTree extends JalviewDialog
     } while (nultimes > 0 && foo.isVisible());
     foo.setVisible(false);
   }
+
+  @Override
+  public void keyPressed(KeyEvent arg0)
+  {
+    if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
+    {
+      okPressed();
+    }
+    if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
+    {
+      cancelPressed();
+    }
+  }
+
+  @Override
+  public void keyReleased(KeyEvent arg0)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void keyTyped(KeyEvent arg0)
+  {
+    // TODO Auto-generated method stub
+
+  }
 }