From 413f799509bfe760642adb0cf8ef71b1db5300a3 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 19 Mar 2009 11:31:11 +0000
Subject: [PATCH] use set_obsolete_on_delete in for deleting features from the
 database

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10176 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
 uk/ac/sanger/artemis/components/EditMenu.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/uk/ac/sanger/artemis/components/EditMenu.java b/uk/ac/sanger/artemis/components/EditMenu.java
index e8572af23..68ecb4049 100644
--- a/uk/ac/sanger/artemis/components/EditMenu.java
+++ b/uk/ac/sanger/artemis/components/EditMenu.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/EditMenu.java,v 1.60 2009-02-17 13:34:45 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.61 2009-03-19 11:31:11 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -61,7 +61,7 @@ import java.util.Vector;
  *  A menu with editing commands.
  *
  *  @author Kim Rutherford
- *  @version $Id: EditMenu.java,v 1.60 2009-02-17 13:34:45 tjc Exp $
+ *  @version $Id: EditMenu.java,v 1.61 2009-03-19 11:31:11 tjc Exp $
  **/
 
 public class EditMenu extends SelectionMenu
@@ -2166,7 +2166,8 @@ public class EditMenu extends SelectionMenu
       	if(GeneUtils.isDatabaseEntry(entry_group))
       	{
       		Box boption = Box.createVerticalBox();
-      		JCheckBox delete = new JCheckBox("permanently delete", false);
+      		JCheckBox delete = new JCheckBox("permanently delete", 
+      		  !Options.getOptions().getPropertyTruthValue("set_obsolete_on_delete"));
       		boption.add(new JLabel("Make "+feature_count_string+" obsolete?"));
       		boption.add(delete);
       		int res = JOptionPane.showConfirmDialog(frame, 
-- 
GitLab