Changeset 1627 for trunk/modelicaml/org.openmodelica.modelicaml.modelica.importer/src

Timestamp:

08/16/12 14:40:33 (12 years ago)

Author:

wschamai

Message:

BUG FIX: creating and updating of extends relations
MOD: message of the C01 rules now contains the qualified name of the problem element

File:

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

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

@@ -592 +592 @@
                             extendsRelation.setModelicaMLProxy(modelicaMLGeneralizationProxy);
                             
-                            if (modelicaMLGeneralizationProxy != null) {
-                                // update
-                                updateExtendsRelation(modelicaMLGeneralizationProxy, extendsRelation, applyProxyStereotype);
-                            }
+                            
+                            /*
+                             * Note, the update operations was moved to the create operation in order to avoid live valiation problems 
+                             * due to unapplied stereotypes.
+                             */
+//                          if (modelicaMLGeneralizationProxy != null) {
+//                              // update
+//                              updateExtendsRelation(modelicaMLGeneralizationProxy, extendsRelation, applyProxyStereotype);
+//                          }
                         }
                         else {
@@ -763 +768 @@
                 }
                 
+                /*
+                 *  Update (i.e. apply sterotypes, etc.) after creating in order to avoid live validation problems
+                 */
                 if (createdElement instanceof Generalization) {
+                    
+                    Element updatedRelation = updateExtendsRelationCommand(createdElement, extendsRelationTreeObject, applyProxyStereotype);
                 }           
                 else {