From 648ab7d29d683f065f1f11c3f8d373c7ca8d1cbf Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 3 Sep 2015 21:21:08 +0100 Subject: [PATCH] JAL-1550 JAL-1551 formatting --- src/jalview/schemes/RNAHelicesColour.java | 8 ++++---- src/jalview/schemes/RNAHelicesColourChooser.java | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/jalview/schemes/RNAHelicesColour.java b/src/jalview/schemes/RNAHelicesColour.java index 2beb4cf..76592ba 100644 --- a/src/jalview/schemes/RNAHelicesColour.java +++ b/src/jalview/schemes/RNAHelicesColour.java @@ -20,15 +20,15 @@ */ package jalview.schemes; -import java.awt.*; -import java.util.Hashtable; -import java.util.Map; - import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; +import java.awt.Color; +import java.util.Hashtable; +import java.util.Map; + /** * Looks at the information computed from an RNA Stockholm format file on the * secondary structure of the alignment. Extracts the information on the diff --git a/src/jalview/schemes/RNAHelicesColourChooser.java b/src/jalview/schemes/RNAHelicesColourChooser.java index ee9792a..05cffc2 100644 --- a/src/jalview/schemes/RNAHelicesColourChooser.java +++ b/src/jalview/schemes/RNAHelicesColourChooser.java @@ -20,13 +20,13 @@ */ package jalview.schemes; -import java.util.*; -import java.awt.event.*; - import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.datamodel.SequenceGroup; + +import java.awt.event.ActionEvent; +import java.util.Hashtable; +import java.util.Vector; /** * Helps generate the colors for RNA secondary structure. Future: add option to @@ -81,9 +81,13 @@ public class RNAHelicesColourChooser { String label = av.getAlignment().getAlignmentAnnotation()[i].label; if (!list.contains(label)) + { list.addElement(label); + } else + { list.addElement(label + "_" + (index++)); + } } adjusting = false; -- 1.7.10.2