svn commit: r18719 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java

Author: bobtarling
Date: 2010-09-01 00:59:27-0700
New Revision: 18719

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java

Log:
Allow remove by the toolbutton

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java?view=diff&pathrev=18719&r1=18718&r2=18719
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java	2010-09-01 00:59:27-0700
@@ -1756,8 +1756,15 @@
     	     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
     	     */
     	    public Object execute() {
-    	        Model.getCoreHelper()
-    	            .removeElementResidence(target, objectToRemove);
+                Collection current = Model.getFacade().getResidentElements(target);
+                for (Iterator it = current.iterator(); it.hasNext(); ) {
+                    Object elementResidenceToDelete = it.next();
+                    if (Model.getFacade().getResident(elementResidenceToDelete) == objectToRemove) {
+                        Model.getCoreHelper().removeElementResidence(target, elementResidenceToDelete);
+                        Model.getUmlFactory().delete(elementResidenceToDelete);
+                        return null;
+                    }
+                }
     	        return null;
     	    }
     	}

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2654000

To unsubscribe from this discussion, e-mail: [[email protected]].