X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=edacce80d36dab239b5f6b4c8d1c2649ed9dc07b;hb=ed581b841fe9361bfe80bb006df190a29df264fb;hp=7ce68379c8f9d53f208cc680f966c00352e53793;hpb=31048f4b0d153fac79a6508b717030851bc33525;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 7ce6837..edacce8 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -79,7 +79,7 @@ public class AlignViewport extends AlignmentViewport { try { - widthScale = new Float(param).floatValue(); + widthScale = Float.valueOf(param).floatValue(); } catch (Exception e) { } @@ -102,7 +102,7 @@ public class AlignViewport extends AlignmentViewport { try { - heightScale = new Float(param).floatValue(); + heightScale = Float.valueOf(param).floatValue(); } catch (Exception e) { } @@ -203,11 +203,11 @@ public class AlignViewport extends AlignmentViewport if (colour != null) { residueShading = new ResidueShader( - ColourSchemeProperty.getColourScheme(getAlignment(), + ColourSchemeProperty.getColourScheme(this, alignment, colour)); if (residueShading != null) { - residueShading.setConsensus(hconsensus); + residueShading.setConsensus(consensusProfiles); } } @@ -299,17 +299,6 @@ public class AlignViewport extends AlignmentViewport .getStructureSelectionManager(applet); } - @Override - public boolean isNormaliseSequenceLogo() - { - return normaliseSequenceLogo; - } - - public void setNormaliseSequenceLogo(boolean state) - { - normaliseSequenceLogo = state; - } - /** * * @return true if alignment characters should be displayed @@ -408,10 +397,4 @@ public class AlignViewport extends AlignmentViewport // TODO implement for applet } - @Override - public boolean isNormaliseHMMSequenceLogo() - { - return normaliseHMMSequenceLogo; - } - }