From: jprocter <Jim Procter>
Date: Wed, 17 Aug 2005 16:30:35 +0000 (+0000)
Subject: GUI modifications for service discovery.
X-Git-Tag: Release_2_03~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=de8ca844b40be7b588074f824eb0b6e067e39aad;p=jalview.git

GUI modifications for service discovery.
---

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 7d09f1b..4c5cdfe 100755
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -36,6 +36,7 @@ public class GAlignFrame
   protected JMenu colourMenu = new JMenu();
   protected JMenu calculateMenu = new JMenu();
   protected JMenu webService = new JMenu();
+  protected JMenuItem webServiceNoServices;
   protected JMenuItem selectAllSequenceMenuItem = new JMenuItem();
   protected JMenuItem deselectAllSequenceMenuItem = new JMenuItem();
   protected JMenuItem invertSequenceMenuItem = new JMenuItem();
@@ -101,7 +102,6 @@ public class GAlignFrame
   public JCheckBoxMenuItem fullSeqId = new JCheckBoxMenuItem();
   JMenuItem epsFile = new JMenuItem();
   JMenuItem LoadtreeMenuItem = new JMenuItem();
-  JMenuItem jnet = new JMenuItem();
   public JCheckBoxMenuItem scaleAbove = new JCheckBoxMenuItem();
   public JCheckBoxMenuItem scaleLeft = new JCheckBoxMenuItem();
   public JCheckBoxMenuItem scaleRight = new JCheckBoxMenuItem();
@@ -110,10 +110,8 @@ public class GAlignFrame
   protected JMenu sortByTreeMenu = new JMenu();
   protected JMenu sort = new JMenu();
   JMenu calculate = new JMenu();
-  JMenuItem msaAlignMenuItem = new JMenuItem();
   JMenu jMenu2 = new JMenu();
   JMenuItem padGapsMenuitem = new JMenuItem();
-  JMenuItem ClustalRealign = new JMenuItem();
   protected ButtonGroup colours = new ButtonGroup();
 
   public GAlignFrame()
@@ -471,14 +469,6 @@ public class GAlignFrame
         neighbourTreeMenuItem_actionPerformed(e);
       }
     });
-    clustalAlignMenuItem.setText("Clustal Alignment");
-    clustalAlignMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        clustalAlignMenuItem_actionPerformed(e);
-      }
-    });
     this.getContentPane().setLayout(borderLayout1);
     alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11));
     alignFrameMenuBar.addAncestorListener(new AncestorListener()
@@ -858,14 +848,6 @@ public class GAlignFrame
         LoadtreeMenuItem_actionPerformed(e);
       }
     });
-    jnet.setText("JNet");
-    jnet.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        jpred_actionPerformed(e);
-      }
-    });
     scaleAbove.setVisible(false);
     scaleAbove.setText("Scale Above");
     scaleAbove.addActionListener(new java.awt.event.ActionListener()
@@ -914,14 +896,7 @@ public class GAlignFrame
     sortByTreeMenu.setText("By Tree Order");
     sort.setText("Sort");
     calculate.setText("Calculate Tree");
-    msaAlignMenuItem.setText("Muscle Alignment");
-    msaAlignMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        msaAlignMenuItem_actionPerformed(e);
-      }
-    });
+
     jMenu2.setText("Export");
     padGapsMenuitem.setText("Pad Gaps");
     padGapsMenuitem.addActionListener(new ActionListener()
@@ -931,20 +906,13 @@ public class GAlignFrame
         padGapsMenuitem_actionPerformed(e);
       }
     });
-    ClustalRealign.setText("Clustal Realign");
-    ClustalRealign.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        ClustalRealign_actionPerformed(e);
-      }
-    });
     alignFrameMenuBar.add(fileMenu);
     alignFrameMenuBar.add(editMenu);
     alignFrameMenuBar.add(searchMenu);
     alignFrameMenuBar.add(viewMenu);
     alignFrameMenuBar.add(colourMenu);
     alignFrameMenuBar.add(calculateMenu);
+    alignFrameMenuBar.add(webService);
     fileMenu.add(saveAlignmentMenu);
     fileMenu.add(jMenu2);
     fileMenu.add(outputTextboxMenu);
@@ -1013,12 +981,8 @@ public class GAlignFrame
     calculateMenu.addSeparator();
     calculateMenu.add(pairwiseAlignmentMenuItem);
     calculateMenu.add(PCAMenuItem);
-    calculateMenu.addSeparator();
-    calculateMenu.add(webService);
-    webService.add(clustalAlignMenuItem);
-    webService.add(msaAlignMenuItem);
-    webService.add(jnet);
-    webService.add(ClustalRealign);
+    webServiceNoServices=new JMenuItem("<No Services>");
+    webService.add(webServiceNoServices);
     this.getContentPane().add(statusBar, BorderLayout.SOUTH);
     jMenu1.add(pasteNew);
     jMenu1.add(pasteThis);