From a962c06ac38aee84d30c27cc0cac86a6e876fa37 Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Mon, 2 Mar 2009 09:35:34 +0000 Subject: [PATCH] * DBModeler/ModelerAttributeEditor.m (dealloc): Remove observers and release the selection, remove unused ivar. (selectionDidChange:): Remove unused local. * DBModeler/ModelerAttributeEditor.h: Remove unused ivar. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@28024 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ DBModeler/ModelerAttributeEditor.h | 1 - DBModeler/ModelerAttributeEditor.m | 14 +++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7e8827..ded6497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-03-02 Matt Rice + + * DBModeler/ModelerAttributeEditor.m (dealloc): Remove observers and + release the selection, remove unused ivar. + (selectionDidChange:): Remove unused local. + * DBModeler/ModelerAttributeEditor.h: Remove unused ivar. + 2009-03-01 Matt Rice * DBModeler/Inspectors/AttributesInspector.m: Implement diff --git a/DBModeler/ModelerAttributeEditor.h b/DBModeler/ModelerAttributeEditor.h index 75cbfc5..0245732 100644 --- a/DBModeler/ModelerAttributeEditor.h +++ b/DBModeler/ModelerAttributeEditor.h @@ -41,7 +41,6 @@ EODisplayGroup *_attributes_dg; EODisplayGroup *_relationships_dg; id _entityToObserve; - id _attributeToObserve; NSArray *_oldSelection; } diff --git a/DBModeler/ModelerAttributeEditor.m b/DBModeler/ModelerAttributeEditor.m index bdb4941..396fe71 100644 --- a/DBModeler/ModelerAttributeEditor.m +++ b/DBModeler/ModelerAttributeEditor.m @@ -198,10 +198,19 @@ - (void) dealloc { + int i, c; + if (_entityToObserve) [EOObserverCenter removeObserver:self forObject:_entityToObserve]; - if (_attributeToObserve) - [EOObserverCenter removeObserver:self forObject:_attributeToObserve]; + + c = [_oldSelection count]; + for (i = 0; i < c; i++) + { + [EOObserverCenter removeObserver:self + forObject:[_oldSelection objectAtIndex:i]]; + } + + RELEASE(_oldSelection); RELEASE(_mainView); RELEASE(_relationships_dg); RELEASE(_attributes_dg); @@ -269,7 +278,6 @@ - (void) selectionDidChange:(NSNotification *)notif { - EOModelerDocument *doc = [notif object]; NSArray *newSelection = [[EOMApp currentEditor] selectionWithinViewedObject]; int i, c;