Maintain list of webservices and query any Service Discovery services.

[jalview.git] / src / jalview / appletgui / AlignFrame.java

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 476dbbd..db1f9c9 100755 (executable)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -81,13 +81,6 @@ public class AlignFrame
     }\r
 \r
 \r
-      if( applet.getParameter("servletAllowed") !=null)\r
-     {\r
-       ServletGUI plug = new ServletGUI(this, fileMenu, calculateMenu);\r
-     }\r
-\r
-\r
-\r
   }\r
 \r
   public void inputText_actionPerformed(ActionEvent e)\r
@@ -815,14 +808,14 @@ public class AlignFrame
 \r
       if (cs instanceof ResidueColourScheme)\r
       {\r
-        ( (ResidueColourScheme) cs).setThreshold(threshold);\r
+        ( (ResidueColourScheme) cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
       }\r
 \r
       viewport.setGlobalColourScheme(cs);\r
     }\r
     else if (cs instanceof ResidueColourScheme)\r
     {\r
-      ( (ResidueColourScheme) cs).setThreshold(0);\r
+      ( (ResidueColourScheme) cs).setThreshold(0, viewport.getIgnoreGapsConsensus());\r
     }\r
 \r
     if (viewport.getConservationSelected())\r
@@ -892,7 +885,7 @@ public class AlignFrame
         {\r
           if (sg.cs instanceof ResidueColourScheme)\r
           {\r
-            ( (ResidueColourScheme) sg.cs).setThreshold(threshold);\r
+            ( (ResidueColourScheme) sg.cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
           }\r
 \r
           sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
@@ -921,6 +914,8 @@ public class AlignFrame
       }\r
     }\r
 \r
+    updateCSConsensus();\r
+\r
     if (alignPanel.getOverviewPanel() != null)\r
     {\r
       alignPanel.getOverviewPanel().updateOverviewImage();\r
@@ -929,6 +924,12 @@ public class AlignFrame
     alignPanel.repaint();\r
   }\r
 \r
+  public void updateCSConsensus()\r
+  {\r
+    //Colour schemes must have their consensus updated\r
+\r
+  }\r
+\r
   protected void modifyPID_actionPerformed(ActionEvent e)\r
   {\r
     if (viewport.getAbovePIDThreshold())\r
@@ -1181,7 +1182,7 @@ public class AlignFrame
         int y = 5, x = 7;\r
         g.setColor(Color.black);\r
         g.setFont(new Font("Helvetica", Font.BOLD, 14));\r
-        g.drawString("JalView - Release 2.01", 200, y += fh);\r
+        g.drawString("JalView - Release 2.02", 200, y += fh);\r
         g.setFont(new Font("Helvetica", Font.PLAIN, 12));\r
         g.drawString("Authors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",\r
                      x, y += fh * 2);\r