v2

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

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 6876984..494e8fe 100644 (file)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -52,6 +52,7 @@ import jalview.schemes.NucleotideColourScheme;
 import jalview.schemes.PIDColourScheme;\r
 import jalview.schemes.PurinePyrimidineColourScheme;\r
 import jalview.schemes.RNAHelicesColourChooser;\r
+import jalview.schemes.RNAInteractionColourScheme;\r
 import jalview.schemes.ResidueProperties;\r
 import jalview.schemes.StrandColourScheme;\r
 import jalview.schemes.TCoffeeColourScheme;\r
@@ -211,6 +212,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
       RNAHelixColour.setEnabled(false);\r
       purinePyrimidineColour.setEnabled(false);\r
     }\r
+    \r
     // Some JVMS send keyevents to Top frame or lowest panel,\r
     // Havent worked out why yet. So add to both this frame and seqCanvas for\r
     // now\r
@@ -1009,6 +1011,10 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
     {\r
       changeColour(new PurinePyrimidineColourScheme());\r
     }\r
+    else if (source == RNAInteractionColour)\r
+    {\r
+      changeColour(new RNAInteractionColourScheme());\r
+    }\r
     else if (source == RNAHelixColour)\r
     {\r
       new RNAHelicesColourChooser(viewport, alignPanel);\r
@@ -2783,6 +2789,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
   MenuItem buriedColour = new MenuItem();\r
 \r
   MenuItem purinePyrimidineColour = new MenuItem();\r
+  MenuItem RNAInteractionColour = new MenuItem();\r
   MenuItem RNAHelixColour = new MenuItem();\r
 \r
   MenuItem userDefinedColour = new MenuItem();\r
@@ -2978,6 +2985,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
     buriedColour.addActionListener(this);\r
     purinePyrimidineColour.setLabel("Purine/Pyrimidine");\r
     purinePyrimidineColour.addActionListener(this);\r
+    RNAInteractionColour.setLabel("Purine/Pyrimidine");\r
+    RNAInteractionColour.addActionListener(this);\r
     RNAHelixColour.setLabel("by RNA Helices");\r
     RNAHelixColour.addActionListener(this);\r
     userDefinedColour.setLabel("User Defined...");\r
@@ -3196,6 +3205,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
     colourMenu.add(buriedColour);\r
     colourMenu.add(nucleotideColour);\r
     colourMenu.add(purinePyrimidineColour);\r
+    colourMenu.add(RNAInteractionColour);\r
     colourMenu.add(tcoffeeColour);\r
     colourMenu.add(userDefinedColour);\r
     colourMenu.addSeparator();\r
@@ -3638,8 +3648,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,  ItemLis
  * @throws ExceptionFileFormatOrSyntax \r
  * @throws ExceptionLoadingFailed \r
  * @throws ExceptionPermissionDenied \r
+ * @throws InterruptedException \r
    */\r
-  public boolean loadScoreFile( String source ) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed {\r
+  public boolean loadScoreFile( String source ) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException {\r
 \r
     TCoffeeScoreFile file = new TCoffeeScoreFile(source, AppletFormatAdapter.checkProtocol(source));\r
          if( !file.isValid()) {\r