Changeset 1388 for trunk/modelicaml/org.openmodelica.modelicaml.simulation

Timestamp:

03/12/12 14:19:21 (13 years ago)

Author:

wschamai

Message:

BUG FIX: canceling of the "run design verification models action"

File:

• trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/handlers/GenerateTestSiMDataAction.java (modified) (4 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/handlers/GenerateTestSiMDataAction.java

@@ -164 +164 @@
         // set the list of simulation models to be executed.
         EObject rootModel = null;
-
+        boolean someModelsSelected = false;
         try {
             rootModel = umlModel.lookupRoot();
             if (rootModel instanceof Model) {
-                setTestModels((Element) rootModel);
+                someModelsSelected = setTestModels((Element) rootModel);
             }
         } catch (NotFoundException e) {
@@ -175 +175 @@
         }
         
-        if (rootModel != null && VerificationExecutionServices.verificationModels != null && VerificationExecutionServices.verificationModels.size() > 0) {
+        if (someModelsSelected && rootModel != null && VerificationExecutionServices.verificationModels != null && VerificationExecutionServices.verificationModels.size() > 0) {
             
             org.eclipse.emf.common.util.URI chainURI = null;
@@ -244 +244 @@
                 MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Error", "Could not save the model and load the generation chain...");
             }
-        }
-        
-        CompoundCommand cc = new CompoundCommand("Verification Models Data Generation");
-        return (cc.unwrap());
-    }
-
-    
-    public void setTestModels(Element rootModel){
+            CompoundCommand cc = new CompoundCommand("Verification Models Data Generation");
+            return (cc.unwrap());
+        }
+        return null;
+    }
+
+    
+    public boolean setTestModels(Element rootModel){
         ElementsCollector ec = new ElementsCollector();
         ec.collectElementsFromModel(rootModel, Constants.stereotypeQName_VerificationModel);
@@ -267 +267 @@
                 }
             }
-        }
+            
+            return true;
+        }
+        return false;
     }