From: tcofoegbu Date: Thu, 3 Sep 2015 15:11:24 +0000 (+0100) Subject: house keeping X-Git-Tag: Release_2_10_0~504 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4200d569e2d29da8594fcd3599493889b086db56;p=jalview.git house keeping --- diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 39aa257..2a360cc 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -3065,15 +3065,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements } - // public static AlignFrame getCurrentAlignFrame() - // { - // return currentAlignFrame; - // } - // - // public static void setCurrentAlignFrame(AlignFrame currentAlignFrame) - // { - // Desktop.currentAlignFrame = currentAlignFrame; - // } + public static AlignFrame getCurrentAlignFrame() + { + return currentAlignFrame; + } + + public static void setCurrentAlignFrame(AlignFrame currentAlignFrame) + { + Desktop.currentAlignFrame = currentAlignFrame; + } } diff --git a/src/jalview/json/binding/biojson/v1/JalviewBioJsColorSchemeMapper.java b/src/jalview/json/binding/biojson/v1/JalviewBioJsColorSchemeMapper.java index 094adad..92184ea 100644 --- a/src/jalview/json/binding/biojson/v1/JalviewBioJsColorSchemeMapper.java +++ b/src/jalview/json/binding/biojson/v1/JalviewBioJsColorSchemeMapper.java @@ -22,7 +22,7 @@ public enum JalviewBioJsColorSchemeMapper "zappo", new ZappoColourScheme()), TAYLOR("Taylor", "taylor", new TaylorColourScheme()), NUCLEOTIDE("Nucleotide", "nucleotide", new NucleotideColourScheme()), PURINE_PYRIMIDINE( - "Purine/Pyrimidine", "purine", new PurinePyrimidineColourScheme()), HELIX_PROPENCITY( + "Purine/Pyrimidine", "purine", new PurinePyrimidineColourScheme()), HELIX_PROPENSITY( "Helix Propensity", "helix", new HelixColourScheme()), TURN_PROPENSITY( "Turn Propensity", "turn", new TurnColourScheme()), STRAND_PROPENSITY( "Strand Propensity", "strand", new StrandColourScheme()), BURIED_INDEX(