X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=7ef2d59c3fd8c0eb6a7d041578400a2ad05eb0c7;hb=18425bf4b285d3d8aeefd8ddbe77b1d6fd434f60;hp=e4e3e1777a886f3ec492a021878d43b9c6a184fc;hpb=ca431c5b3c0febeecdf541537070d5141d3b531a;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index e4e3e17..7ef2d59 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -187,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"); @@ -287,7 +292,6 @@ public class AlignViewport extends AlignmentViewport implements return font; } - public void resetSeqLimits(int height) { setEndSeq(height / getCharHeight()); @@ -303,7 +307,6 @@ public class AlignViewport extends AlignmentViewport implements return currentTree; } - boolean centreColumnLabels; public boolean getCentreColumnLabels() @@ -325,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); } /** @@ -467,5 +470,4 @@ public class AlignViewport extends AlignmentViewport implements } } - }