From d0d355ec92c2850602a1d12a5bb9c38e80fb0ff6 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Thu, 9 Jan 2003 07:03:36 +0000
Subject: [PATCH] Remove of action/outlet/class now acts correctly when user
 cancels.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@15568 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog      |  7 +++++++
 GormDocument.m | 25 +++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3f29fde..7a280e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-09  Gregory John Casamento <greg_casamento@yahoo.com
+
+	* GormDocument.m: [GormDocument remove:]: added code
+	to check the boolean returned from the removeConnection
+	methods.  If the result is NO, dont proceed with the
+	delete.
+	
 2003-01-09  Gregory John Casamento <greg_casamento@yahoo.com
 
 	* GormDocument.m: [GormDocument remove:]: added code
diff --git a/GormDocument.m b/GormDocument.m
index fabdf6ce..891c90a5 100644
--- a/GormDocument.m
+++ b/GormDocument.m
@@ -970,9 +970,12 @@ static NSImage	*classesImage = nil;
 		  BOOL removed = [self removeConnectionsWithLabel: name 
 				       forClassNamed: itemBeingEdited
 				       isAction: YES];
-		  [classManager removeAction: name
-				fromClassNamed: itemBeingEdited];
-		  [classesView removeItemAtRow: i];
+		  if(removed)
+		    {
+		      [classManager removeAction: name
+				    fromClassNamed: itemBeingEdited];
+		      [classesView removeItemAtRow: i];
+		    }
 		}
 	    }
 	  else if([classesView editType] == Outlets)
@@ -985,9 +988,12 @@ static NSImage	*classesImage = nil;
 		  BOOL removed = [self removeConnectionsWithLabel: name 
 				       forClassNamed: itemBeingEdited
 				       isAction: NO];
-		  [classManager removeOutlet: name
-				fromClassNamed: itemBeingEdited];
-		  [classesView removeItemAtRow: i];
+		  if(removed)
+		    {
+		      [classManager removeOutlet: name
+				    fromClassNamed: itemBeingEdited];
+		      [classesView removeItemAtRow: i];
+		    }
 		}
 	    }
 	}
@@ -1002,8 +1008,11 @@ static NSImage	*classesImage = nil;
 	  if([classManager isCustomClass: anitem])
 	    {
 	      BOOL removed = [self removeConnectionsForClassNamed: anitem];
-	      [classManager removeClassNamed: anitem];
-	      [classesView reloadData];
+	      if(removed)
+		{
+		  [classManager removeClassNamed: anitem];
+		  [classesView reloadData];
+		}
 	    }
 	}
       else