From 8dbfefc69547cfbad3bc4c20c226d52d2132a767 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Mon, 9 Jul 2007 13:07:38 +0000
Subject: [PATCH] fix QualifierChoice
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@6207 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../sanger/artemis/components/ListSelectionPanel.java | 8 ++++++--
uk/ac/sanger/artemis/components/QualifierEditor.java | 10 +++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/ListSelectionPanel.java b/uk/ac/sanger/artemis/components/ListSelectionPanel.java
index 122fab64d..6c3e0a5d0 100644
--- a/uk/ac/sanger/artemis/components/ListSelectionPanel.java
+++ b/uk/ac/sanger/artemis/components/ListSelectionPanel.java
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ListSelectionPanel.java,v 1.4 2007-03-28 11:56:35 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ListSelectionPanel.java,v 1.5 2007-07-09 13:03:45 tjc Exp $
*/
package uk.ac.sanger.artemis.components;
@@ -39,6 +39,7 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import uk.ac.sanger.artemis.EntryGroup;
+import uk.ac.sanger.artemis.io.GFFDocumentEntry;
class ListSelectionPanel extends JPanel
{
@@ -125,8 +126,11 @@ class ListSelectionPanel extends JPanel
add(bdown, BorderLayout.CENTER);
+ boolean isGFF = false;
+ if(entry_group.getDefaultEntry().getEMBLEntry() instanceof GFFDocumentEntry)
+ isGFF = true;
final QualifierChoice qualifier_choice = new QualifierChoice(
- entry_group.elementAt(0).getEntryInformation(), null, null);
+ entry_group.elementAt(0).getEntryInformation(), null, null, isGFF);
JButton add_butt = new JButton("ADD");
add_butt.addActionListener(new ActionListener()
diff --git a/uk/ac/sanger/artemis/components/QualifierEditor.java b/uk/ac/sanger/artemis/components/QualifierEditor.java
index 7c5b47a9b..3a8768185 100644
--- a/uk/ac/sanger/artemis/components/QualifierEditor.java
+++ b/uk/ac/sanger/artemis/components/QualifierEditor.java
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.4 2005-02-17 10:36:28 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.5 2007-07-09 13:07:38 tjc Exp $
*/
package uk.ac.sanger.artemis.components;
@@ -28,6 +28,7 @@ package uk.ac.sanger.artemis.components;
import uk.ac.sanger.artemis.*;
import uk.ac.sanger.artemis.util.ReadOnlyException;
+import uk.ac.sanger.artemis.io.GFFDocumentEntry;
import uk.ac.sanger.artemis.io.Qualifier;
import uk.ac.sanger.artemis.io.QualifierInfo;
import uk.ac.sanger.artemis.io.QualifierVector;
@@ -46,7 +47,7 @@ import javax.swing.*;
* features at once.
*
* @author Kim Rutherford <kmr@sanger.ac.uk>
- * @version $Id: QualifierEditor.java,v 1.4 2005-02-17 10:36:28 tjc Exp $
+ * @version $Id: QualifierEditor.java,v 1.5 2007-07-09 13:07:38 tjc Exp $
**/
public class QualifierEditor extends JFrame {
@@ -69,8 +70,11 @@ public class QualifierEditor extends JFrame {
setFont (font);
+ boolean isGFF = false;
+ if(entry_group.getDefaultEntry().getEMBLEntry() instanceof GFFDocumentEntry)
+ isGFF = true;
final QualifierChoice qualifier_choice =
- new QualifierChoice (entry_information, first_feature.getKey (), null);
+ new QualifierChoice (entry_information, first_feature.getKey (), null, isGFF);
final JPanel outer_qualifier_choice_panel = new JPanel ();
final JPanel qualifier_choice_panel = new JPanel ();
--
GitLab