Changeset 1562 for trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src

Timestamp:

07/04/12 17:25:21 (12 years ago)

Author:

wschamai

Message:

MOD: marker support
NEW: (Initial) Discovery of relations between scenarios and requirements

File:

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

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

@@ -113 +113 @@
 import org.openmodelica.modelicaml.common.services.StringUtls;
 import org.openmodelica.modelicaml.common.utls.ResourceManager;
+import org.openmodelica.modelicaml.common.validation.services.ModelicaMLMarkerSupport;
 import org.openmodelica.modelicaml.gen.modelica.cg.helpers.OMCClassValidator;
 import org.openmodelica.modelicaml.helper.handlers.InstantiateRequirementsHandler;
@@ -1233 +1234 @@
                     
                     String fullModificationString = item.getDotPathWithoutFirstLevelComponent() + " = " + modificationString;
-                    
-                    //modificationStringDialog = new DialogModificationStringInput(shell, "Edit Component Modification", item.getDothPath() + " = ", modificationString, item, null, root);
                     modificationStringDialog = new DialogComponentModification(shell, "Edit Component Modification", item.getDotPath(), fullModificationString, item, null, root);
                     
@@ -1244 +1243 @@
                         
                         if ( string.trim().equals("")) {
-                            // Delete modification in items firstLevelComponent
+
                             // Delete modification
                             Element modificationStoreLocation = item.getModificationStoreLocation();
@@ -1256 +1255 @@
                             ModificationManager.deleteComponentModificationBasedOnLeftHandValue(modificationStoreLocation, componentPath);
 
-                            // Delete modification in item list.
-                            //item.deleteFromModificationListBasedOnLeftRightHandValue(item.getDothPath(), modificationString);
-
-                            item.setFinalModificationRightHand(null); // TODO: verify against the line above
+                            item.setFinalModificationRightHand(null); 
                             item.setFinalModificationSource(null);
-//                          viewer.update(item, null);
-//                          updateItem(item);
+                            
                         }
                         else {
@@ -1288 +1283 @@
                                 item.setFinalModificationRightHand(null); // verify against the line above
                                 item.setFinalModificationSource(null);
-//                              viewer.update(item, null);
-//                              updateItem(item);
 
                             }
@@ -1295 +1288 @@
                             
                             // Add the new value to firstLevelComponent and to the component modifications list.
-                            //ModificationManager.addComponentModification(item.getFirstLevelComponent(), item.getDotPathWithoutFirstLevelComponent(), modificationStringDialog.getValue(), true);
                             String[] parts = modStringWithoutBraces.split("=");
                             if (parts.length > 0) {
-//                              String leftHandPart = parts[0];
                                 
                                 // TODO: test it!
@@ -1312 +1303 @@
                                     String rightHandPart = parts[1];
                                     //System.err.println("rightHandPart " + rightHandPart);
+                                    
                                     ModificationManager.addComponentModification(item.getModificationStoreLocation(), leftHandPart, rightHandPart, true);
-                                    //ModificationManager.addComponentModification(item.getFirstLevelComponent(), item.getDotPathWithoutFirstLevelComponent(), modificationStringDialog.getValue(), true); // OLD
-                                    
-//                                  // Add to the modification in item list.
-//                                  //item.addToModificationList(item.getDothPath() + " = " + modificationStringDialog.getValue()); // OLD
-//                                  String storeString = "";
-//                                  if (hasOutterBraces) {
-//                                      storeString = "(" + StringUtls.replaceSpecChar(item.getFirstLevelComponent().getName()) + "." + modStringWithoutBraces + ")";
-//                                  }
-//                                  else {
-//                                      storeString = StringUtls.replaceSpecChar(item.getFirstLevelComponent().getName()) + "." + modStringWithoutBraces ;
-//                                  }
-                                    //item.addToModificationList(storeString); // Store with braces if there are any!
+
                                     item.setFinalModificationRightHand(rightHandPart); // verify this against the line above!
                                     item.setFinalModificationSource(item.getFirstLevelComponent()); // TODO: this is wrong if the modification source is Generalization! 
-//                                  viewer.update(item, null);
-//                                  updateItem(item);
+                                    
+                                    /*
+                                     * In case there were markers that were for not successful value bindings: 
+                                     * -> Delete those markers that have the first level component as source 
+                                     * and the marker message contains the item dot path.
+                                     */
+//                                  ModelicaMLMarkerSupport.deleteMarker(item.getFirstLevelComponent(), Constants.MARKERTYPE_VALUEBINDINGS);
+                                    ModelicaMLMarkerSupport.deleteMarker(item.getFirstLevelComponent(), item.getDotPath(), Constants.MARKERTYPE_VALUEBINDINGS);
+                                    
                                 }
                                 else {
@@ -1339 +1327 @@
                                 MessageDialog.openError(shell, "ModelicaML modifications parsing error (ComponentsTree.java 04)", "The modification string '"+string+"' does not contain an equality lign ('='). It will not be stored.");
                             }
-                            //viewer.update(item, null);
                         }
-                        //viewer.update(item, null);
                     }
-//                  viewer.update(item, null);
                     updateItem(item);
                 }