From 286fe80f51d59fcc9ed2c800bb5e0b57be84f1e1 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Mon, 27 Apr 2009 13:37:21 +0000
Subject: [PATCH] fix opening Artemis
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10661 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../digest/CircularGenomeController.java | 48 ++++++++-----------
1 file changed, 19 insertions(+), 29 deletions(-)
diff --git a/uk/ac/sanger/artemis/circular/digest/CircularGenomeController.java b/uk/ac/sanger/artemis/circular/digest/CircularGenomeController.java
index e3348bf07..1400f9c12 100644
--- a/uk/ac/sanger/artemis/circular/digest/CircularGenomeController.java
+++ b/uk/ac/sanger/artemis/circular/digest/CircularGenomeController.java
@@ -362,37 +362,26 @@ public class CircularGenomeController
{
public void actionPerformed(ActionEvent e)
{
- if (lastBlock == null)
+ Range range = null;
+ try
{
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- final ArtemisMain main_window = new ArtemisMain(null);
- main_window.setVisible(true);
- final EntryEdit entryEdit = new EntryEdit(dna
- .getArtemisEntryGroup());
- entryEdit.setVisible(true);
- }
- });
+ if (lastBlock == null)
+ range = new Range(1, dna.getArtemisEntryGroup().getBases()
+ .getLength());
+ else
+ range = new Range(lastBlock.getBstart(), lastBlock.getBend());
}
- else
+ catch (OutOfRangeException e1)
{
- try
- {
- final ArtemisMain main_window = new ArtemisMain(null);
- main_window.setVisible(true);
- Range range = new Range(lastBlock.getBstart(), lastBlock.getBend());
- final EntryGroup entryGroup = dna.getArtemisEntryGroup().truncate(
- range);
- final EntryEdit entryEdit = new EntryEdit(entryGroup);
- entryEdit.setVisible(true);
- }
- catch (OutOfRangeException e1)
- {
- e1.printStackTrace();
- }
- }
+ e1.printStackTrace();
+ return;
+ }
+ final ArtemisMain main_window = new ArtemisMain(null);
+ main_window.setVisible(false);
+ final EntryGroup entryGroup = dna.getArtemisEntryGroup().truncate(
+ range);
+ final EntryEdit entryEdit = new EntryEdit(entryGroup);
+ entryEdit.setVisible(true);
}
});
@@ -588,7 +577,8 @@ public class CircularGenomeController
Box yBox = Box.createVerticalBox();
JTextField enzymeList = new JTextField("HincII,hinfI,ppiI,hindiii");
yBox.add(enzymeList);
- JCheckBox methylationCheckBox = new JCheckBox("do not match methylated bases", methylation);
+ JCheckBox methylationCheckBox = new JCheckBox(
+ "RE sites will not match methylated bases", methylation);
yBox.add(methylationCheckBox);
JOptionPane.showMessageDialog(null, yBox, "Enzyme", JOptionPane.QUESTION_MESSAGE);
--
GitLab