From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Fri, 7 Dec 2012 14:19:57 +0000 (+0000)
Subject: gui hooks for contrafold and RNAfold services. commented because they should be added... 
X-Git-Tag: Jalview_2_9~221^2^2~8^2~34
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a137c9f323a2f2ed7994419e904c8d40b2b25d07;p=jalview.git

gui hooks for contrafold and RNAfold services. commented because they should be added via the web service menu framework rather than explicitly hardcoded in the popup menu
---

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index f19a2c0..6bc8daf 100644
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -130,7 +130,11 @@ public class PopupMenu extends JPopupMenu
   JMenu pdbMenu = new JMenu();
 
   JMenuItem pdbFromFile = new JMenuItem();
-
+    // JBPNote: Commented these out - Should add these services via the web services menu system.
+    // JMenuItem ContraFold = new JMenuItem();
+  
+    // JMenuItem RNAFold = new JMenuItem();
+  
   JMenuItem enterPDB = new JMenuItem();
 
   JMenuItem discoverPDB = new JMenuItem();
@@ -1207,6 +1211,9 @@ public class PopupMenu extends JPopupMenu
     editMenu.add(lowerCase);
     editMenu.add(toggle);
     pdbMenu.add(pdbFromFile);
+    // JBPNote: These shouldn't be added here - should appear in a generic 'apply web service to this sequence menu'
+    //    pdbMenu.add(RNAFold);
+    //    pdbMenu.add(ContraFold);
     pdbMenu.add(enterPDB);
     pdbMenu.add(discoverPDB);
     jMenu1.add(groupName);
@@ -1999,7 +2006,18 @@ public class PopupMenu extends JPopupMenu
     }
 
   }
-
+    // JBNote: commented out - these won't be instantiated here...!  
+//  public void RNAFold_actionPerformed() throws Exception
+//  {
+//	  Predict2D P2D = new Predict2D();
+//	  P2D.getStructure2DFromRNAFold("toto");
+//  }
+//  
+//  public void ContraFold_actionPerformed() throws Exception
+//  {
+//	  Predict2D P2D = new Predict2D();
+//	  P2D.getStructure2DFromContraFold("toto");
+//  }
   public void enterPDB_actionPerformed()
   {
     String id = JOptionPane.showInternalInputDialog(Desktop.desktop,