From 778f5a77957c6d9ddad4d4c46a80433731c6257c Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Fri, 24 Oct 2008 14:55:49 +0000
Subject: [PATCH] fixes
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@9092 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/circular/DNADraw.java | 12 ++++----
uk/ac/sanger/artemis/circular/Wizard.java | 33 ++++++++++------------
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/uk/ac/sanger/artemis/circular/DNADraw.java b/uk/ac/sanger/artemis/circular/DNADraw.java
index d8bae2237..312b04e3c 100644
--- a/uk/ac/sanger/artemis/circular/DNADraw.java
+++ b/uk/ac/sanger/artemis/circular/DNADraw.java
@@ -91,7 +91,7 @@ public class DNADraw extends ScrollPanel
DragSourceListener, DropTargetListener
{
private static final long serialVersionUID = 1L;
- public static JScrollPane jsp;
+ public static JScrollPane jsp = new JScrollPane();
private DNADraw current_dna;
private JFrame mainFrame;
@@ -1405,9 +1405,7 @@ public class DNADraw extends ScrollPanel
{
public void actionPerformed(ActionEvent e)
{
- Wizard wiz = new Wizard(current_dna);
- current_dna = wiz.getDNADraw();
- jsp.setViewportView(current_dna);
+ new Wizard(current_dna);
}
});
optionMenu.add(wizard);
@@ -1417,7 +1415,8 @@ public class DNADraw extends ScrollPanel
if(getArtemisEntryGroup() != null)
{
- trackManager = new TrackManager(DNADraw.this);
+ if(trackManager == null)
+ trackManager = new TrackManager(DNADraw.this);
tracksMenu.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -1897,7 +1896,8 @@ public class DNADraw extends ScrollPanel
f.setTitle("DNAPlotter :: "+version);
Dimension d = f.getToolkit().getScreenSize();
- jsp = new JScrollPane(dna);
+
+ jsp.setViewportView(dna);
jsp.getViewport().setBackground(Color.white);
f.getContentPane().add(jsp);
f.setJMenuBar(dna.createMenuBar());
diff --git a/uk/ac/sanger/artemis/circular/Wizard.java b/uk/ac/sanger/artemis/circular/Wizard.java
index db53f1640..350e721fa 100644
--- a/uk/ac/sanger/artemis/circular/Wizard.java
+++ b/uk/ac/sanger/artemis/circular/Wizard.java
@@ -84,11 +84,11 @@ public class Wizard
public Wizard(DNADraw dna_current)
{
int n = getOption(dna_current); // option 0 - read data file
- // option 1 - create dna display
- // option 2 - edit existing dna
+ // option 1 - edit existing dna
+ // option 2 - read template
if(n == 0)
dna = getDNADrawFromFile(dna_current);
- else if(n == 3)
+ else if(n == 2)
{
StickyFileChooser chooser = new StickyFileChooser();
chooser.showOpenDialog(null);
@@ -100,7 +100,7 @@ public class Wizard
"Missing File", JOptionPane.WARNING_MESSAGE);
loadTemplate(chooser.getSelectedFile());
}
- else if(n == 1 || n == 2)
+ else if(n == 1)
{
Vector block = new Vector();
Vector restrictionEnzyme = new Vector();
@@ -741,30 +741,29 @@ public class Wizard
JRadioButton[] radioButtons;
- radioButtons = new JRadioButton[3];
+ radioButtons = new JRadioButton[2];
final ButtonGroup group = new ButtonGroup();
radioButtons[0] = new JRadioButton("Read in sequence file");
group.add(radioButtons[0]);
- radioButtons[1] = new JRadioButton("Create new dna display");
- group.add(radioButtons[1]);
+
radioButtons[0].setSelected(true);
bdown.add(radioButtons[0]);
- bdown.add(radioButtons[1]);
+
radioButtons[0].setSelected(true);
if(dna_current != null)
{
- radioButtons[2] = new JRadioButton("Edit current dna display");
- group.add(radioButtons[2]);
- radioButtons[2].setSelected(true);
+ radioButtons[1] = new JRadioButton("Edit current dna display");
+ group.add(radioButtons[1]);
+ radioButtons[1].setSelected(true);
}
else
{
- radioButtons[2] = new JRadioButton("Read template file");
- group.add(radioButtons[2]);
+ radioButtons[1] = new JRadioButton("Read template file");
+ group.add(radioButtons[1]);
}
- bdown.add(radioButtons[2]);
+ bdown.add(radioButtons[1]);
JPanel pane = new JPanel(new BorderLayout());
pane.add(bdown);
@@ -774,12 +773,10 @@ public class Wizard
if(radioButtons[0].isSelected())
return 0;
- else if(radioButtons[1].isSelected())
+ else if(radioButtons[1].isSelected() && dna_current != null)
return 1;
- else if(radioButtons[2].isSelected() && dna_current != null)
+ else if(radioButtons[1].isSelected())
return 2;
- else if(radioButtons[2].isSelected())
- return 3;
return 1;
}
--
GitLab