Changeset 1635 for trunk/modelicaml

Timestamp:

08/20/12 13:13:59 (12 years ago)

Author:

wschamai

Message:

MOD: progress monitor for instantiating a class and validating the components modifications

File:

• trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src/org/openmodelica/modelicaml/view/componentstree/views/ComponentsTree.java (modified) (6 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src/org/openmodelica/modelicaml/view/componentstree/views/ComponentsTree.java

@@ -62 +62 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.LocalSelectionTransfer;
@@ -2179 +2180 @@
         
         // build new tree
-        createTree();
+        if (sel instanceof IStructuredSelection) {
+            EObject selectedElement = null;
+        
+            if (getCurrentSelections() != null && getCurrentSelections().size() > 0 ) {
+                selectedElement = (EObject) adaptSelectedElement(getCurrentSelections().get(0));
+                if (selectedElement instanceof Class ) {
+                    selectedClass = (Class) selectedElement;
+
+                    createTree();
+                }
+            }
+        }
         
         // set new input from the selection.
@@ -2280 +2292 @@
             getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(listener);
             
-            createTree();
+            if (sel instanceof IStructuredSelection) {
+                EObject selectedElement = null;
+            
+                if (getCurrentSelections() != null && getCurrentSelections().size() > 0 ) {
+                    selectedElement = (EObject) adaptSelectedElement(getCurrentSelections().get(0));
+                    if (selectedElement instanceof Class ) {
+                        selectedClass = (Class) selectedElement;
+
+                        createTree();
+                    }
+                }
+            }
+            
+//          createTree();
         }
     }
@@ -2292 +2317 @@
      */
     private void createClassTree(Class selectedClass){
-        // reset
-//      org.openmodelica.modelicaml.common.instantiation.TreeUtls.componentsTreeRoot = null;
-        
+
         if (selectedClass != null && !(selectedClass instanceof Behavior) && isValid(selectedClass)) {
             
@@ -2304 +2327 @@
             root = ast.getTreeRoot();
             
-            // set the static variable to be used by other plugins. This is done in order to avoid cyclic plugin dependecies
+            // set the static variable to be used by other plugins. This is done in order to avoid cyclic plugin dependencies
             org.openmodelica.modelicaml.common.instantiation.TreeUtls.classInstantiation = ast;
             org.openmodelica.modelicaml.common.instantiation.TreeUtls.componentsTreeRoot = root;
@@ -2314 +2337 @@
     public void createTree(){
         
-        if (sel instanceof IStructuredSelection) {
-            EObject selectedElement = null;
-        
-            if (getCurrentSelections() != null && getCurrentSelections().size() > 0 ) {
-                selectedElement = (EObject) adaptSelectedElement(getCurrentSelections().get(0));
-            }
+        if (selectedClass != null && !(selectedClass instanceof Behavior) && isValid(selectedClass)) {
             
-            if (selectedElement instanceof Class ) {
-                selectedClass = (Class) selectedElement;
-                
-                if (selectedClass != null && !(selectedClass instanceof Behavior) && isValid(selectedClass)) {
-                    actionSimulate.setEnabled(true);
-                    actionValidate.setEnabled(true);
-                    actionReload.setEnabled(true);
-                    actionCollapseAll.setEnabled(true);
-                    
-                    createClassTree(selectedClass); // build the entire tree
-                }
-                else {
-                    actionSimulate.setEnabled(false);
-                    actionValidate.setEnabled(false);
-                    actionReload.setEnabled(false);
-                    actionCollapseAll.setEnabled(false);
-                }
-            }
+            // set actions
+            actionSimulate.setEnabled(true);
+            actionValidate.setEnabled(true);
+            actionReload.setEnabled(true);
+            actionCollapseAll.setEnabled(true);
+            
+            ProgressMonitorDialog progressDialog = new ProgressMonitorDialog(ModelicaMLServices.getShell());
+            progressDialog.getProgressMonitor().setTaskName("Instantiating " + ModelicaMLServices.getName(selectedClass));
+            
+            try {
+                progressDialog.run(false, true, new IRunnableWithProgress() {
+                    
+                    @Override
+                    public void run(IProgressMonitor monitor) throws InvocationTargetException,
+                            InterruptedException {
+
+                        monitor.subTask("Creating class components tree ...");
+                        // instantiate the selected class
+                        createClassTree(selectedClass); // build the entire tree
+                        
+                        //validate component modifications
+                        monitor.subTask("Validating component modifications ...");
+
+                        ComponentModificationValidator validator = new ComponentModificationValidator(root);
+                        validator.validate();
+                        
+                        viewer.refresh();
+                        
+                        monitor.done();
+                    }
+                });
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+                MessageDialog.openError(ModelicaMLServices.getShell(), "Class Instantiation Error", "Could not invoce the class instantiation operation.");
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                MessageDialog.openInformation(ModelicaMLServices.getShell(), "Class Instantiation Canceled", "Class instantiation operation was canceled.");
+            }
+        }
+        else {
+            actionSimulate.setEnabled(false);
+            actionValidate.setEnabled(false);
+            actionReload.setEnabled(false);
+            actionCollapseAll.setEnabled(false);
+        }
+        
+        
+//      if (sel instanceof IStructuredSelection) {
+//          EObject selectedElement = null;
+//        
+//          if (getCurrentSelections() != null && getCurrentSelections().size() > 0 ) {
+//              selectedElement = (EObject) adaptSelectedElement(getCurrentSelections().get(0));
+//          }
+//          
+//          if (selectedElement instanceof Class ) {
+//              selectedClass = (Class) selectedElement;
+//              
+//              if (selectedClass != null && !(selectedClass instanceof Behavior) && isValid(selectedClass)) {
+//                  actionSimulate.setEnabled(true);
+//                  actionValidate.setEnabled(true);
+//                  actionReload.setEnabled(true);
+//                  actionCollapseAll.setEnabled(true);
+//                  
+//                  ProgressMonitorDialog progressDialog = new ProgressMonitorDialog(ModelicaMLServices.getShell());
+//                  progressDialog.getProgressMonitor().setTaskName("Instantiating " + ModelicaMLServices.getName(selectedClass));
+//                  
+//                  try {
+//                      progressDialog.run(false, true, new IRunnableWithProgress() {
+//                          
+//                          @Override
+//                          public void run(IProgressMonitor monitor) throws InvocationTargetException,
+//                                  InterruptedException {
+//
+//                              monitor.subTask("Creating class components tree ...");
+//                              // instantiate the selected class
+//                              createClassTree(selectedClass); // build the entire tree
+//                              
+//                              //validate component modifications
+//                              monitor.subTask("Validating component modifications ...");
+//
+//                              ComponentModificationValidator validator = new ComponentModificationValidator(root);
+//                              validator.validate();
+//                              
+//                              viewer.refresh();
+//                              
+//                              monitor.done();
+//                          }
+//                      });
+//                  } catch (InvocationTargetException e) {
+//                      e.printStackTrace();
+//                      MessageDialog.openError(ModelicaMLServices.getShell(), "Class Instantiation Error", "Could not invoce the class instantiation operation.");
+//                  } catch (InterruptedException e) {
+//                      e.printStackTrace();
+//                      MessageDialog.openInformation(ModelicaMLServices.getShell(), "Class Instantiation Canceled", "Class instantiation operation was canceled.");
+//                  }
+//              }
+//              else {
+//                  actionSimulate.setEnabled(false);
+//                  actionValidate.setEnabled(false);
+//                  actionReload.setEnabled(false);
+//                  actionCollapseAll.setEnabled(false);
+//              }
+//          }
 
 //          createTree(selectedClass); // build the entire tree
-        }
+//      }
     }