Changeset 686 for trunk

Timestamp:

04/08/11 16:11:53 (13 years ago)

Author:

wschamai

Message:

MOD: instantiated requirements view

File:

• trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/views/InstantiatedRequirementsView.java (modified) (9 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.helper/src/org/openmodelica/modelicaml/helper/views/InstantiatedRequirementsView.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem;
@@ -10 +14 @@
 import org.eclipse.papyrus.diagram.common.editparts.IUMLEditPart;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.layout.GridData;
@@ -21 +26 @@
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Type;
 import org.eclipse.wb.swt.SWTResourceManager;
+import org.openmodelica.modelicaml.common.instantiation.ClassInstantiation;
+import org.openmodelica.modelicaml.common.instantiation.TreeObject;
+import org.openmodelica.modelicaml.common.instantiation.TreeParent;
 import org.openmodelica.modelicaml.helper.dialogs.InstantiateRequirementsDialog;
 
@@ -37 +45 @@
     private Composite shell;
     private Class selectedClass;
-    private List<Property> reqList = new ArrayList<Property>();
+    
     private List<ExpandItem> reqGraphicalItemsList = new ArrayList<ExpandItem>();
     private List<Group> reqGraphicalGroupItemsList = new ArrayList<Group>();
+    
+    
+    private HashMap<Element, ArrayList<String>> reqClassInstantiations = new HashMap<Element,ArrayList<String>>();  
+    private HashMap<String, Element> reqClassNameToElement = new HashMap<String, Element>();
+    private List<String> reqClassesNames = new ArrayList<String>();
+    private EList<Property> reqInstancesList = new BasicEList<Property>(); 
+    
+    
     
     
@@ -81 +97 @@
             if (selectedElement instanceof Class ) {
                 selectedClass = (Class) selectedElement;
-                reqList = getInstatiatedRequirementsList(selectedClass);
+                //reqList = getInstatiatedRequirementsList(selectedClass);
+                
+                // clear all lists
+                reqClassInstantiations.clear();
+                reqClassNameToElement.clear();
+                reqClassesNames.clear();
+                reqInstancesList.clear(); 
+                
+                // instantiate class 
+                ClassInstantiation ci = new ClassInstantiation(selectedClass, false);
+                ci.createTree();
+                TreeParent treeRoot = ci.getTreeRoot();
+                
+                // collect all requirements instances and create maps
+                collectRequirements(treeRoot);
+                
+                // sort requirements classes by name
+                reqClassesNames.addAll(reqClassNameToElement.keySet());
+                Collections.sort(reqClassesNames);
+                
+//              for (String string : list) {
+//                  Element aClass = reqClassNameToElement.get(string);
+//                  System.err.println(string + ":  " + reqClassInstantiations.get(aClass).toString());
+//              }
+                
                 drawContents();
             }
-        }
-    }
-    
-    private void clearItemsList(){
-        for (ExpandItem item : reqGraphicalItemsList) {
-            item.dispose();
-        }
-        for (Group group : reqGraphicalGroupItemsList) {
-            group.dispose();
         }
     }
@@ -123 +154 @@
         
         
-        for (Property property : reqList) {
-                
-                Class req = (Class) property.getType();
+        for (String reqClassName : reqClassesNames) {
+                
+                Class req = (Class) reqClassNameToElement.get(reqClassName);
+                int numberOfInstances = reqClassInstantiations.get(req).size();
                 
                 Stereotype stereotype = req.getAppliedStereotype(reqStereotypeQname);
                 if (stereotype != null) {
 //                  String title = "" + property.getName() + " (" + req.getName() + ")";
-                    String title = "" + property.getName();
+//                  String title = "" + property.getName();
                     Object id = "" + req.getValue(stereotype, "id");
-                    Object text = "" + req.getValue(stereotype, "text");;
+                    String title = "" + "(x" + numberOfInstances + ") " + id + ": " + reqClassName;
+                    Object text = "" + req.getValue(stereotype, "text");
                     String qName = "" + req.getQualifiedName();
 
@@ -155 +188 @@
                     grpId.setText(id.toString() + " : " + qName);
                     reqExpandItem.setControl(grpId);
+
+                    // Combo for requirement instance names:
+                    CCombo reqInstancesNames = new CCombo(grpId, SWT.BORDER);
+                    List<String> list = reqClassInstantiations.get(req);
+                    Collections.sort(list);
+                    reqInstancesNames.setItems(list.toArray(new String[list.size()]));
+                    reqInstancesNames.setText(list.get(0).toString());
+                    reqInstancesNames.setBounds(5, 20, 500, 18);
+                    reqInstancesNames.setEditable(false);
                     
                     //StyledText reqText = new StyledText(grpId, SWT.FULL_SELECTION | SWT.WRAP | SWT.V_SCROLL);
@@ -164 +206 @@
                     // Set Req. Text
                     reqText.setText(text.toString());
-                    //reqText.setBounds(29, 36, 656, 98);
 //                  reqText.setBounds(5, 20, expandBar.getShell().getBounds().width - 70, SWT.VERTICAL - 229);
-                    reqText.setBounds(5, 20, 600, 80);
+                    reqText.setBounds(5, 50, 600, 80);
                     reqText.setToolTipText(qName);
                     
@@ -174 +215 @@
             
         }
-        
-        
-        
-        
-    }
-    
-    
-    private List<Property> getInstatiatedRequirementsList(Class owningClass){
-        if (owningClass != null) {
-            List<Property> requirements = new ArrayList<Property>();
-            for (Property property : owningClass.getAllAttributes()) { // TODO: here use the ModelicaMLAST instead to find requirements
-                Type pType = property.getType();
-                
-                if ( pType != null && (pType.getAppliedStereotype(reqStereotypeQname) != null)) {
-                    requirements.add(property);
+    }
+    
+    private void collectRequirements(TreeParent treeRoot){
+        TreeObject[] children = treeRoot.getChildren();
+        for (int i = 0; i < children.length; i++) {
+            if (children[i].isRequirementInstance()) {
+                
+                // add to requirements instances list
+                reqInstancesList.add(children[i].getProperty());
+                
+                // add to map
+                ArrayList<String> list = reqClassInstantiations.get(children[i].getComponentType());
+                if (list == null) {
+                    list = new ArrayList<String>();
+                    list.add(children[i].getDothPath());
                 }
+                else {
+                    list.add(children[i].getDothPath());
+                }
+                reqClassNameToElement.put(children[i].getComponentType().getName(), children[i].getComponentType());
+                reqClassInstantiations.put(children[i].getComponentType(), list);
+                
             }
-            return requirements;
-        }
-        return null;
-    }
-    
+            else if (children[i].getHasRequirements()) {
+                collectRequirements((TreeParent)children[i]); // recursive call             
+            } 
+        }
+    }
+    
+    private void clearItemsList(){
+        for (ExpandItem item : reqGraphicalItemsList) {
+            item.dispose();
+        }
+        for (Group group : reqGraphicalGroupItemsList) {
+            group.dispose();
+        }
+    }
+
+    
+//  private void drawContents(){
+//
+//      clearItemsList();// clear the graphical view.
+//
+////        Label lblSelectRequirementsTo = new Label(messageComposite, SWT.NONE);
+////        lblSelectRequirementsTo.setFont(SWTResourceManager.getFont("Arial", 10, SWT.NORMAL));
+////        lblSelectRequirementsTo.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));
+////        lblSelectRequirementsTo.setBounds(0, 0, 238, 18);
+////
+////        if (reqList != null && reqList.size() > 0) {
+////            // NEW Label for the owning class name
+////            lblSelectRequirementsTo.setText("The following requirements are instantiated in:");
+////            CLabel label_1 = new CLabel(messageComposite, SWT.NONE);
+////            label_1.setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
+////            label_1.setTopMargin(0);
+////            label_1.setBottomMargin(0);
+////            
+////            // Set the name of containing class 
+////            label_1.setText(selectedClass.getName());   
+////            label_1.setFont(SWTResourceManager.getFont("Arial", 10, SWT.BOLD));
+////            label_1.setBounds(244, 0, 450, 18);
+////        }
+////        else {
+////            lblSelectRequirementsTo.setText("No requirements are instantiated in " + selectedClass.getName() +  ".");
+////        }
+//      
+//      
+//      for (Property property : reqList) {
+//              
+//              Class req = (Class) property.getType();
+//              
+//              Stereotype stereotype = req.getAppliedStereotype(reqStereotypeQname);
+//              if (stereotype != null) {
+////                    String title = "" + property.getName() + " (" + req.getName() + ")";
+//                  String title = "" + property.getName();
+//                  Object id = "" + req.getValue(stereotype, "id");
+//                  Object text = "" + req.getValue(stereotype, "text");;
+//                  String qName = "" + req.getQualifiedName();
+//
+//                  ExpandItem reqExpandItem = new ExpandItem(expandBar, SWT.NONE);
+//                  reqGraphicalItemsList.add(reqExpandItem);
+//                  reqExpandItem.setExpanded(false);
+//                  
+//                  // mark requirement that is already instantiated 
+//                  reqExpandItem.setImage(SWTResourceManager.getImage(InstantiateRequirementsDialog.class, "/icons/exists_already.png"));
+//
+//                  // Set Req. Title
+////                    reqExpandItem.setText(id + ": " + title);
+//                  reqExpandItem.setText(title);
+//                  
+//                  Group grpId = new Group(expandBar, SWT.NONE);
+//                  reqGraphicalGroupItemsList.add(grpId);
+//                  grpId.setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE));
+//                  grpId.setToolTipText(qName);
+//                  
+//                  // Set Req. ID
+//                  //grpId.setText("id: " + id.toString() + "   " + qName);
+//                  grpId.setText(id.toString() + " : " + qName);
+//                  reqExpandItem.setControl(grpId);
+//                  
+//                  //StyledText reqText = new StyledText(grpId, SWT.FULL_SELECTION | SWT.WRAP | SWT.V_SCROLL);
+//                  StyledText reqText = new StyledText(grpId, SWT.FULL_SELECTION | SWT.WRAP);
+//                  reqText.setIndent(1);
+//                  reqText.setFont(SWTResourceManager.getFont("Arial", 10, SWT.NORMAL));
+//                  reqText.setEditable(false);
+//                  
+//                  // Set Req. Text
+//                  reqText.setText(text.toString());
+//                  //reqText.setBounds(29, 36, 656, 98);
+////                    reqText.setBounds(5, 20, expandBar.getShell().getBounds().width - 70, SWT.VERTICAL - 229);
+//                  reqText.setBounds(5, 20, 600, 80);
+//                  reqText.setToolTipText(qName);
+//                  
+//                  grpId.setTabList(new Control[]{reqText});
+//                  reqExpandItem.setHeight(reqExpandItem.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).y);    
+//              }
+//          
+//      }
+//  }
+    
+//  private List<Property> getInstatiatedRequirementsList(Class owningClass){
+//      if (owningClass != null) {
+//          List<Property> requirements = new ArrayList<Property>();
+//          for (Property property : owningClass.getAllAttributes()) { // TODO: here use the ModelicaMLAST instead to find requirements
+//              Type pType = property.getType();
+//              
+//              if ( pType != null && (pType.getAppliedStereotype(reqStereotypeQname) != null)) {
+//                  requirements.add(property);
+//              }
+//          }
+//          
+//          return requirements;
+//      }
+//      return null;
+//  }
+    
+