JAL-1684 JAL-1452 new applet parameters defaultColourNuc

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

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 4b55697..7ef2d59 100644 (file)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -21,9 +21,7 @@
 package jalview.appletgui;
 
 import jalview.analysis.NJTree;
-import jalview.api.AlignExportSettingI;
 import jalview.api.AlignViewportI;
-import jalview.api.FeatureRenderer;
 import jalview.bin.JalviewLite;
 import jalview.commands.CommandI;
 import jalview.datamodel.AlignmentI;
@@ -59,10 +57,6 @@ public class AlignViewport extends AlignmentViewport implements
 
   private AnnotationColumnChooser annotationColumnSelectionState;
 
-  private FeatureRenderer featureRenderer;
-
-  private AlignExportSettingI exportSettings;
-
   public void finalize()
   {
     applet = null;
@@ -193,8 +187,13 @@ public class AlignViewport extends AlignmentViewport implements
 
     if (applet != null)
     {
-      String colour = applet.getParameter("defaultColour");
-
+      String colour = al.isNucleotide() ? applet
+              .getParameter("defaultColourNuc") : applet
+              .getParameter("defaultColourProt");
+      if (colour == null)
+      {
+        colour = applet.getParameter("defaultColour");
+      }
       if (colour == null)
       {
         colour = applet.getParameter("userDefinedColour");
@@ -293,7 +292,6 @@ public class AlignViewport extends AlignmentViewport implements
     return font;
   }
 
-
   public void resetSeqLimits(int height)
   {
     setEndSeq(height / getCharHeight());
@@ -309,7 +307,6 @@ public class AlignViewport extends AlignmentViewport implements
     return currentTree;
   }
 
-
   boolean centreColumnLabels;
 
   public boolean getCentreColumnLabels()
@@ -331,8 +328,8 @@ public class AlignViewport extends AlignmentViewport implements
   public void sendSelection()
   {
     getStructureSelectionManager().sendSelection(
-                    new SequenceGroup(getSelectionGroup()),
-                    new ColumnSelection(getColumnSelection()), this);
+            new SequenceGroup(getSelectionGroup()),
+            new ColumnSelection(getColumnSelection()), this);
   }
 
   /**
@@ -473,5 +470,4 @@ public class AlignViewport extends AlignmentViewport implements
     }
   }
 
-
 }