svn commit: r13547 - trunk/src_new/org/argouml: kernel ui/explorer

Author: mvw
Date: 2007-09-14 00:07:03-0700
New Revision: 13547

Modified:
   trunk/src_new/org/argouml/kernel/ProjectImpl.java
   trunk/src_new/org/argouml/kernel/ProjectManager.java
   trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java

Log:
Remove a dependency of the kernel to the UI.

Modified: trunk/src_new/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13547&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13546&r2=13547
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java	2007-09-14 00:07:03-0700
@@ -50,7 +50,6 @@
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.ui.explorer.ExplorerEventAdaptor;
 import org.argouml.uml.CommentEdge;
 import org.argouml.uml.Profile;
 import org.argouml.uml.ProfileException;
@@ -881,9 +880,9 @@
             }
         } else if (obj instanceof ArgoDiagram) {
             removeProjectMemberDiagram((ArgoDiagram) obj);
-            // only need to manually delete diagrams because they
-            // don't have a decent event system set up.
-            ExplorerEventAdaptor.getInstance().modelElementRemoved(obj);
+            // Need to manually delete diagrams from explorer because they
+            // don't have a decent event system set up:
+            ProjectManager.getManager().firePropertyChanged("remove", obj, null);
         } else if (obj instanceof Fig) {
             ((Fig) obj).deleteFromModel();
             // TODO: Bob says - I've never seen this appear in the log.

Modified: trunk/src_new/org/argouml/kernel/ProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectManager.java?view=diff&rev=13547&p1=trunk/src_new/org/argouml/kernel/ProjectManager.java&p2=trunk/src_new/org/argouml/kernel/ProjectManager.java&r1=13546&r2=13547
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectManager.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectManager.java	2007-09-14 00:07:03-0700
@@ -163,7 +163,7 @@
      * @param oldValue The old value.
      * @param newValue The new value.
      */
-    private void firePropertyChanged(String propertyName,
+    void firePropertyChanged(String propertyName,
                                      Object oldValue, Object newValue) {
         // Guaranteed to return a non-null array
         Object[] listeners = listenerList.getListenerList();

Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java?view=diff&rev=13547&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java&r1=13546&r2=13547
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerEventAdaptor.java	2007-09-14 00:07:03-0700
@@ -190,6 +190,10 @@
             || Notation.KEY_SHOW_STEREOTYPES.isChangedProperty(pce)) {
             // notation events
             treeModel.structureChanged();
+        } else if (pce.getSource() instanceof ProjectManager) {
+            if ("remove".equals(pce.getPropertyName())) {
+                treeModel.modelElementRemoved(pce.getOldValue());
+            }
         }