From 23106935c936542e520d975e8dafcc001f61523f Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 24 Nov 2009 12:40:05 +0000
Subject: [PATCH] fixes
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@12426 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../components/genebuilder/BasicGeneBuilderFrame.java | 2 +-
.../components/genebuilder/BasicGeneViewerPanel.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/genebuilder/BasicGeneBuilderFrame.java b/uk/ac/sanger/artemis/components/genebuilder/BasicGeneBuilderFrame.java
index 30db27311..1bcc11e40 100644
--- a/uk/ac/sanger/artemis/components/genebuilder/BasicGeneBuilderFrame.java
+++ b/uk/ac/sanger/artemis/components/genebuilder/BasicGeneBuilderFrame.java
@@ -206,7 +206,7 @@ public class BasicGeneBuilderFrame extends JFrame
{
GFFStreamFeature transcript = (GFFStreamFeature) transcripts.get(i);
tabPane.insertTab(GeneUtils.getUniqueName(transcript),
- null, new JPanel(new BorderLayout()), "", i);
+ null, new JPanel(new BorderLayout()), null, i);
}
tabPane.insertTab("+",
diff --git a/uk/ac/sanger/artemis/components/genebuilder/BasicGeneViewerPanel.java b/uk/ac/sanger/artemis/components/genebuilder/BasicGeneViewerPanel.java
index 57ef3247b..c9bbac260 100644
--- a/uk/ac/sanger/artemis/components/genebuilder/BasicGeneViewerPanel.java
+++ b/uk/ac/sanger/artemis/components/genebuilder/BasicGeneViewerPanel.java
@@ -250,7 +250,6 @@ public class BasicGeneViewerPanel extends MapPanel
{
for(int i = 0; i < features.size(); i++)
GeneUtils.deleteAllFeature(features.elementAt(i), chado_gene);
- repaint();
}
else
{
@@ -258,6 +257,11 @@ public class BasicGeneViewerPanel extends MapPanel
}
gbFrame.dispose(true);
}
+ catch(NullPointerException npe)
+ {
+ // can't reopen
+ gbFrame.dispose(false);
+ }
catch(ReadOnlyException e)
{
JOptionPane.showMessageDialog(null,
--
GitLab