svn commit: r13035 - trunk/src_new/org/argouml/uml/diagram/state/ui

Author: tfmorris
Date: 2007-07-10 11:50:51-0700
New Revision: 13035

Modified:
   trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java
   trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java

Log:
Issue 4789 - Get root model from model subsystem instead of Project

Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java?view=diff&rev=13035&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java&r1=13034&r2=13035
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java	2007-07-10 11:50:51-0700
@@ -30,7 +30,6 @@
 

 import org.argouml.application.helpers.ResourceLoaderWrapper;

 import org.argouml.i18n.Translator;

-import org.argouml.kernel.ProjectManager;

 import org.argouml.model.Model;

 import org.argouml.ui.targetmanager.TargetManager;

 import org.tigris.gef.undo.UndoableAction;

@@ -53,11 +52,12 @@
     }

 

     public void actionPerformed(ActionEvent e) {

-        if (!isEnabled()) return;

+        if (!isEnabled()) {

+            return;

+        }

         super.actionPerformed(e);

         Object target = TargetManager.getInstance().getModelTarget();

-        Object model =

-            ProjectManager.getManager().getCurrentProject().getModel();

+        Object model = Model.getFacade().getModel(target);

         Object ns = Model.getStateMachinesHelper()

                     .findNamespaceForEvent(target, model);

         Object event = createEvent(ns);


Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java?view=diff&rev=13035&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java&r1=13034&r2=13035
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java	2007-07-10 11:50:51-0700
@@ -28,7 +28,6 @@
 

 import org.argouml.application.helpers.ResourceLoaderWrapper;

 import org.argouml.i18n.Translator;

-import org.argouml.kernel.ProjectManager;

 import org.argouml.model.Model;

 import org.argouml.ui.targetmanager.TargetEvent;

 import org.argouml.ui.targetmanager.TargetListener;

@@ -57,8 +56,7 @@
         if (!isEnabled()) return;

         super.actionPerformed(e);

         Object target = TargetManager.getInstance().getModelTarget();

-        Object model =

-            ProjectManager.getManager().getCurrentProject().getModel();

+        Object model = Model.getFacade().getModel(target);

         Object ns = Model.getStateMachinesHelper()

                     .findNamespaceForEvent(target, model);

         Object event = createEvent(ns);