From eee5b44590fa2272393be1f11a35ca828be87806 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 21 Oct 2014 11:48:45 +0100 Subject: [PATCH] JAL-674 JAL-1551 imports dropped during merge --- src/jalview/analysis/AlignSeq.java | 25 ++++++++++++++++++------- src/jalview/datamodel/SequenceI.java | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/jalview/analysis/AlignSeq.java b/src/jalview/analysis/AlignSeq.java index d05aa96..f5afa9c 100755 --- a/src/jalview/analysis/AlignSeq.java +++ b/src/jalview/analysis/AlignSeq.java @@ -20,13 +20,24 @@ */ package jalview.analysis; -import java.util.*; - -import java.awt.*; - -import jalview.datamodel.*; -import jalview.schemes.*; -import jalview.util.*; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.Mapping; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; +import jalview.schemes.ResidueProperties; +import jalview.schemes.ScoreMatrix; +import jalview.util.Comparison; +import jalview.util.Format; +import jalview.util.MapList; +import jalview.util.MessageManager; + +import java.awt.Color; +import java.awt.Graphics; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.StringTokenizer; /** * diff --git a/src/jalview/datamodel/SequenceI.java b/src/jalview/datamodel/SequenceI.java index 2e68371..876db03 100755 --- a/src/jalview/datamodel/SequenceI.java +++ b/src/jalview/datamodel/SequenceI.java @@ -21,6 +21,7 @@ package jalview.datamodel; import java.util.List; +import java.util.Vector; import fr.orsay.lri.varna.models.rna.RNA; -- 1.7.10.2