X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FRNAHelicesColourChooser.java;h=a7bdd8ef4c5eb92215c9b2800789154347a5cdb9;hb=2755c8765d39da0da2be087b301d47fc153d9236;hp=39062e7bcea9e20fa65e51006fe46b16aaacf184;hpb=b81d4d7d46ea8b1c89df086fb847baab6b69d427;p=jalview.git
diff --git a/src/jalview/schemes/RNAHelicesColourChooser.java b/src/jalview/schemes/RNAHelicesColourChooser.java
index 39062e7..a7bdd8e 100644
--- a/src/jalview/schemes/RNAHelicesColourChooser.java
+++ b/src/jalview/schemes/RNAHelicesColourChooser.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
@@ -47,13 +50,14 @@ public class RNAHelicesColourChooser
boolean adjusting = false;
- public RNAHelicesColourChooser(AlignViewportI av, final AlignmentViewPanel ap)
+ public RNAHelicesColourChooser(AlignViewportI av,
+ final AlignmentViewPanel ap)
{
oldcs = av.getGlobalColourScheme();
if (av.getAlignment().getGroups() != null)
{
oldgroupColours = new Hashtable();
- for (SequenceGroup sg:ap.getAlignment().getGroups())
+ for (SequenceGroup sg : ap.getAlignment().getGroups())
{
if (sg.cs != null)
{
@@ -95,25 +99,22 @@ public class RNAHelicesColourChooser
{
return;
}
-
- currentAnnotation = av.getAlignment().getAlignmentAnnotation()[0];// annotations.getSelectedIndex()];
-
RNAHelicesColour rhc = null;
- rhc = new RNAHelicesColour(currentAnnotation);
-
+ rhc = new RNAHelicesColour(av.getAlignment());
+
av.setGlobalColourScheme(rhc);
if (av.getAlignment().getGroups() != null)
{
- for (SequenceGroup sg:ap.getAlignment().getGroups())
+ for (SequenceGroup sg : ap.getAlignment().getGroups())
{
if (sg.cs == null)
{
continue;
}
- sg.cs = new RNAHelicesColour(currentAnnotation);
+ sg.cs = new RNAHelicesColour(sg);
}
}
@@ -126,7 +127,7 @@ public class RNAHelicesColourChooser
av.setGlobalColourScheme(oldcs);
if (av.getAlignment().getGroups() != null)
{
- for (SequenceGroup sg:ap.getAlignment().getGroups())
+ for (SequenceGroup sg : ap.getAlignment().getGroups())
{
sg.cs = (ColourSchemeI) oldgroupColours.get(sg);
}