diff --git a/uk/ac/sanger/artemis/circular/DNADraw.java b/uk/ac/sanger/artemis/circular/DNADraw.java index 84083be5246c15c76008ff92cd6a0d036bc90355..6327e80574aee65401de32aa023966e892db925f 100644 --- a/uk/ac/sanger/artemis/circular/DNADraw.java +++ b/uk/ac/sanger/artemis/circular/DNADraw.java @@ -1010,7 +1010,7 @@ public class DNADraw extends ScrollPanel { public void actionPerformed(ActionEvent e) { - Wizard.readEntry(DNADraw.this); + Wizard.readEntry(DNADraw.this, getBases()); viewer.refresh(); repaint(); } diff --git a/uk/ac/sanger/artemis/circular/Wizard.java b/uk/ac/sanger/artemis/circular/Wizard.java index 3bacaf11870a1f14934f17e6c82b874814640c29..b28299755af177887b646e3a55c9671e5bc45e9a 100644 --- a/uk/ac/sanger/artemis/circular/Wizard.java +++ b/uk/ac/sanger/artemis/circular/Wizard.java @@ -44,6 +44,7 @@ import uk.ac.sanger.artemis.Options; import uk.ac.sanger.artemis.SimpleEntryGroup; import uk.ac.sanger.artemis.io.Range; import uk.ac.sanger.artemis.io.RangeVector; +import uk.ac.sanger.artemis.sequence.Bases; import uk.ac.sanger.artemis.sequence.NoSequenceException; import uk.ac.sanger.artemis.util.OutOfRangeException; @@ -271,7 +272,8 @@ public class Wizard - protected static DNADraw readEntry(final DNADraw dna_current) + protected static DNADraw readEntry(final DNADraw dna_current, + final Bases bases) { Options.getOptions(); uk.ac.sanger.artemis.components.FileDialogEntrySource entrySource = @@ -279,7 +281,7 @@ public class Wizard try { - final Entry entry = entrySource.getEntry(true); + final Entry entry = entrySource.getEntry(bases,true); dna_current.getArtemisEntryGroup().add(entry); FeatureVector features = entry.getAllFeatures(); @@ -313,14 +315,12 @@ public class Wizard } catch(OutOfRangeException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - catch(NoSequenceException e) - { - // TODO Auto-generated catch block - e.printStackTrace(); + JOptionPane.showMessageDialog(null, + "Feature found out of range:\n"+ + e.getMessage(),"Out of Range", + JOptionPane.WARNING_MESSAGE); } + return dna_current; }