X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=69f0fef7aba89e2db7565a99722fe01844440798;hb=cafaf4610c39cac8347bde424e6d9984c3959a51;hp=53fc35cb38b6c97581f010b05512e4418a7ca73d;hpb=b85adcbd258498734f6635724360629b4d0f73ec;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 53fc35c..69f0fef 100644
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -1,3 +1,20 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 
+ * 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/>.
+ */
 package jalview.gui;
 
 import jalview.bin.Cache;
@@ -31,6 +48,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
@@ -74,7 +92,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]);
@@ -117,6 +135,8 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
       }
       root.add(tn);
     }
+    // and sort the tree
+    sortTreeNodes(root);
     svp = new JScrollPane();
     // svp.setAutoscrolls(true);
     dbviews = new JTree(new DefaultTreeModel(root, false));
@@ -165,6 +185,47 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
     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
   {