X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignFrame.java;h=2d3eaa4b47dca77d4b197203b9c448cb3e17d042;hb=914a9aaf5a2eeb3cdedf136c2e6b4b6e4b5d6174;hp=0672136b2e39f5d4fdca9dc57677717079ad5644;hpb=dd31808c17e9882806a200438d319cb1374f203c;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 0672136..2d3eaa4 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1100,15 +1100,76 @@ public class GAlignFrame extends JInternalFrame
       }
     });
 
-    JMenuItem loadTreeDb = new JMenuItem(
-            MessageManager.getString("label.from_database"));
-    loadTreeDb.addActionListener(new ActionListener()
+
+
+    JMenuItem loadTreeBaseStudy = new JMenuItem(
+            MessageManager.getString("label.treebase_study"));
+    loadTreeBaseStudy.addActionListener(new ActionListener()
+    {
+
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        loadTreeBaseStudy_actionPerformed(e);
+
+      }    });
+
+
+
+    JMenuItem loadTreeBase = new JMenuItem(
+            MessageManager.getString("label.treebase"));
+    loadTreeBase.addActionListener(new ActionListener()
+    {
+
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        loadTreeBase_actionPerformed(e);
+
+      }
+
+
+    });
+    JMenuItem loadTreePfam = new JMenuItem(
+            MessageManager.getString("label.pfam"));
+    loadTreePfam.addActionListener(new ActionListener()
+    {
+
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        loadTreePfam_actionPerformed(e);
+
+      }
+
+    });
+    JMenuItem loadTreeFam = new JMenuItem(
+            MessageManager.getString("label.treefam"));
+    loadTreeFam.addActionListener(new ActionListener()
+    {
+
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        loadTreeFam_actionPerformed(e);
+
+      }
+
+    });
+
+    JMenuItem loadTreeOfLife = new JMenuItem(
+            MessageManager.getString("label.tree_of_life"));
+    loadTreeOfLife.addActionListener(new ActionListener()
     {
+
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        loadTreeDbItem_actionPerformed(e);
+        loadTreeOfLife_actionPerformed(e);
+
       }
+
+
     });
 
     scaleAbove.setVisible(false);
@@ -1704,6 +1765,10 @@ public class GAlignFrame extends JInternalFrame
 
     JMenu exportImageMenu = new JMenu(
             MessageManager.getString("label.export_image"));
+
+    JMenu loadTreeDb = new JMenu(
+            MessageManager.getString("label.from_database"));
+
     JMenu loadTreeMenu = new JMenu(
             MessageManager.getString("label.load_associated_tree"));
     // loadTreeMenu.setToolTipText(
@@ -1711,6 +1776,12 @@ public class GAlignFrame extends JInternalFrame
     
     JMenu fileMenu = new JMenu(MessageManager.getString("action.file"));
 
+    loadTreeDb.add(loadTreeBaseStudy);
+    loadTreeDb.add(loadTreeBase);
+    loadTreeDb.add(loadTreePfam);
+    loadTreeDb.add(loadTreeFam);
+    loadTreeDb.add(loadTreeOfLife);
+
     loadTreeMenu.add(loadTreeFile);
     loadTreeMenu.add(loadTreeUrl);
     loadTreeMenu.add(loadTreeDb);
@@ -1888,6 +1959,36 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
+  protected void loadTreeOfLife_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void loadTreeFam_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void loadTreePfam_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void loadTreeBase_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  protected void loadTreeBaseStudy_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
   /**
    * Constructs the entries on the Colour menu (but does not add them to the
    * menu).
@@ -2406,10 +2507,7 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
-  protected void loadTreeDbItem_actionPerformed(ActionEvent e)
-  {
 
-  }
 
   /**
    * Template method to handle the 'load T-Coffee scores' menu event.