Changeset 1629

Timestamp:

08/16/12 15:48:03 (12 years ago)

Author:

wschamai

Message:

BUG FIX: creating and updating of components and extends relations

File:

• trunk/modelicaml/org.openmodelica.modelicaml.modelica.importer/src/org/openmodelica/modelicaml/modelica/importer/helper/ModelicaMLElementsCreator.java (modified) (5 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.modelica.importer/src/org/openmodelica/modelicaml/modelica/importer/helper/ModelicaMLElementsCreator.java

@@ -522 +522 @@
                             setMonitorTaskName("Creating component: " + component.getQName());
                             addToLog("Creating component: " + component.getQName());
-    //                      System.out.println("Creating component: " + component.getQName());
                             
                             // set the component type (uml class that was just created) 
@@ -535 +534 @@
                             treeBuilder.addProxyToMaps((NamedElement) modelicaMLPropertyProxy);
                             
-                            // update (stereotype) properties
-                            updateProperty(owningClass, modelicaMLPropertyProxy, component, applyProxyStereotype);
+                            /*
+                             * Note, the update operation (i.e. set stereotype etc.) is moved into the createProperty operation
+                             * in order to avoid live validation messages caused by the fact the the stereotype was not
+                             * applied yet. 
+                             */
+//                          // update (stereotype) properties
+//                          updateProperty(owningClass, modelicaMLPropertyProxy, component, applyProxyStereotype);
+                            
                         }
                         else { // update the existing proxy
@@ -544 +549 @@
                                     setMonitorTaskName("Updating component: " + ((NamedElement)modelicaMLPropertyProxy).getQualifiedName());
                                     addToLog("Updating component: " + ((NamedElement)modelicaMLPropertyProxy).getQualifiedName());
-    //                              System.out.println("Updating component: " + ((NamedElement)modelicaMLPropertyProxy).getQualifiedName());
                                 }
                                 // update
@@ -556 +560 @@
                         }
                     }
+                    
+                    
                     
                     // create extends relations
@@ -1074 +1080 @@
                     
                     Element updatedProperty = updatePropertyCommand(owningClass, property, componentTreeObject, applyProxyStereotype);
+                    
                     if (updatedProperty != null) {
                         updatedProperties.add(updatedProperty);