svn commit: r12559 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2007-05-06 13:46:34-0700
New Revision: 12559

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java

Log:
Issue 4569 - add isSynch for ObjectFlowState

Also fix NPE & ClassCastException in findClassifierByName and findStateByName

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java?view=diff&rev=12559&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java&r1=12558&r2=12559
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsHelperMDRImpl.java	2007-05-06 13:46:34-0700
@@ -35,6 +35,7 @@
 import org.omg.uml.behavioralelements.statemachines.CompositeState;
 import org.omg.uml.behavioralelements.statemachines.State;
 import org.omg.uml.behavioralelements.statemachines.StateMachine;
+import org.omg.uml.behavioralelements.statemachines.StateVertex;
 import org.omg.uml.foundation.core.BehavioralFeature;
 import org.omg.uml.foundation.core.Classifier;
 import org.omg.uml.foundation.core.ModelElement;
@@ -82,7 +83,7 @@
             while (i.hasNext()) {
                 ModelElement classifier = (ModelElement) i.next();
                 String cn = classifier.getName();
-                if (cn.equals(s)) {
+                if (cn != null && cn.equals(s)) {
                     return classifier;
                 }
             }
@@ -92,10 +93,7 @@
         return null;
     }
 
-    /*
-     * @see org.argouml.model.ActivityGraphsHelper#findStateByName(
-     *         java.lang.Object, java.lang.String)
-     */
+
     public Object findStateByName(Object c, String s) {
         if (!(c instanceof Classifier)) {
             throw new IllegalArgumentException();
@@ -114,7 +112,7 @@
                 Model.getStateMachinesHelper().getAllSubStates(top);
             Iterator ii = allStates.iterator();
             while (ii.hasNext()) {
-                State state = (State) ii.next();
+                StateVertex state = (StateVertex) ii.next();
 
                 String statename = state.getName();
                 if (statename != null) {
@@ -127,19 +125,14 @@
         return null;
     }
 
-    /*
-     * @see org.argouml.model.ActivityGraphsHelper#isAddingActivityGraphAllowed(java.lang.Object)
-     */
+
     public boolean isAddingActivityGraphAllowed(Object context) {
         return context instanceof BehavioralFeature
             || context instanceof Classifier
             || context instanceof UmlPackage;
     }
 
-    /*
-     * @see org.argouml.model.ActivityGraphsHelper#addInState(
-     *         java.lang.Object, java.lang.Object)
-     */
+
     public void addInState(Object classifierInState, Object state) {
         if (classifierInState instanceof ClassifierInState
                 && state instanceof State) {
@@ -151,9 +144,7 @@
         }
     }
 
-    /*
-     * @see org.argouml.model.ActivityGraphsHelper#setInStates(java.lang.Object, java.util.Collection)
-     */
+
     public void setInStates(Object classifierInState, Collection newStates) {
         if (classifierInState instanceof ClassifierInState) {
             ClassifierInState cis = (ClassifierInState) classifierInState;
@@ -163,10 +154,8 @@
                     "classifierInState: " + classifierInState);
         }
     }
+    
 
-    /*
-     * @see org.argouml.model.ActivityGraphsHelper#setContents(java.lang.Object, java.util.Collection)
-     */
     public void setContents(Object partition, Collection contents) {
         if (partition instanceof Partition) {
             Partition p = (Partition) partition;
@@ -177,6 +166,17 @@
         }
     }
 
+    /**
+     * @deprecated Use {@link #setSynch(Object,boolean)} instead
+     */
+    public void setIsSynch(Object objectFlowState, boolean isSynch) {
+        setSynch(objectFlowState, isSynch);
+    }
+
+    public void setSynch(Object objectFlowState, boolean isSynch) {
+        ((ObjectFlowState) objectFlowState).setSynch(isSynch);
+    }
+
 
 }
 

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=12559&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=12558&r2=12559
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2007-05-06 13:46:34-0700
@@ -966,7 +966,6 @@
         return illegalArgumentBoolean(handle);
     }
 
-
     public boolean isNavigable(Object handle) {
         try {
             if (handle instanceof AssociationEnd) {
@@ -4453,4 +4452,8 @@
         return illegalArgumentList(handle);
     }
 
+    public boolean isSynch(Object handle) {
+        return ((ObjectFlowState) handle).isSynch();
+    }
+
 }