X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=7ef2d59c3fd8c0eb6a7d041578400a2ad05eb0c7;hb=be47cdd2406f63ccb1fcf424194e82302dfc9360;hp=fdc6a0cc7caec4dc7bc6240ede4c593809e7d285;hpb=ed2283c5f54da377a2a2fdbdb7aec75ed7041714;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index fdc6a0c..7ef2d59 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -20,8 +20,6 @@ */ package jalview.appletgui; -import java.awt.Font; - import jalview.analysis.NJTree; import jalview.api.AlignViewportI; import jalview.bin.JalviewLite; @@ -40,8 +38,10 @@ import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasSource; import jalview.viewmodel.AlignmentViewport; +import java.awt.Font; + public class AlignViewport extends AlignmentViewport implements - AlignViewportI, SelectionSource, VamsasSource, CommandListener + SelectionSource, VamsasSource, CommandListener { boolean cursorMode = false; @@ -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); } /**