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

Timestamp:

01/24/12 18:01:39 (13 years ago)

Author:

wschamai

Message:

bug fix: sync. of proxies behavior (FunctionBehavior? should not be deleted)

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

@@ -953 +953 @@
             Classifier clazz = (Classifier)element;
             
-            // delete existing opaqueBehaviors
+            /*
+             * Delete existing OpaqueBehaviors before recreating class algorithm or equation sections.
+             * Note, we assume that the proxies are not modified in the ModelicaML model. So that there are no State Machines
+             * or other behavior except OpaqueBehaviors. That is why we only delete OpaqueBehaviors.
+             * One exception: FunctionBehavaior is a sub-type of OpaqueBehavior. These should not be deleted. 
+             */
             EList<Element> existingElements = clazz.getOwnedElements();
             EList<Behavior> existingBehaviors = new BasicEList<Behavior>();
 
             for (Element existingElement : existingElements) {
-                if (existingElement instanceof OpaqueBehavior) {
+                if (existingElement instanceof OpaqueBehavior && !(existingElement instanceof FunctionBehavior)) {
                     existingBehaviors.add((Behavior) existingElement);
                 }
@@ -964 +969 @@
             
             deleteElements(new HashSet<Element>(existingBehaviors));
+            
             
             // Create initialAlgorithms