svn commit: r12732 - trunk/src_new/org/argouml: kernel ui/targetmanager uml/diagram

Author: mvw
Date: 2007-05-30 12:32:42-0700
New Revision: 12732

Modified:
   trunk/src_new/org/argouml/kernel/Project.java
   trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java
   trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java

Log:
Reduce the dependency from the Project (org.argouml.kernel) on the GUI (org.argouml.ui.targetmanager).

All Diagrams in ArgoUML now send a "remove" event when they are deleted - IIUC we had this before - why was it removed?

Modified: trunk/src_new/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/Project.java?view=diff&rev=12732&p1=trunk/src_new/org/argouml/kernel/Project.java&p2=trunk/src_new/org/argouml/kernel/Project.java&r1=12731&r2=12732
==============================================================================
--- trunk/src_new/org/argouml/kernel/Project.java	(original)
+++ trunk/src_new/org/argouml/kernel/Project.java	2007-05-30 12:32:42-0700
@@ -1098,8 +1098,6 @@
                 models.remove(obj);
             }
         } else if (obj instanceof ArgoDiagram) {
-            TargetManager.getInstance().removeTarget(obj);
-            TargetManager.getInstance().removeHistoryElement(obj);
             removeProjectMemberDiagram((ArgoDiagram) obj);
             // only need to manually delete diagrams because they
             // don't have a decent event system set up.

Modified: trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java?view=diff&rev=12732&p1=trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java&p2=trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java&r1=12731&r2=12732
==============================================================================
--- trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java	(original)
+++ trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java	2007-05-30 12:32:42-0700
@@ -974,9 +974,7 @@
          * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
          */
         public void propertyChange(PropertyChangeEvent evt) {
-            if ((evt instanceof DeleteInstanceEvent)
-                    && "remove".equals(evt.getPropertyName())) {
-
+            if ("remove".equals(evt.getPropertyName())) {
                 remove(evt.getSource());
             }
         }

Modified: trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java?view=diff&rev=12732&p1=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&r1=12731&r2=12732
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	2007-05-30 12:32:42-0700
@@ -472,6 +472,7 @@
             Fig f = (Fig) contents.get(i);
             f.removeFromDiagram();
         }
+        firePropertyChange("remove", null, null);
         super.remove();
     }