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

Timestamp:

08/16/12 17:40:42 (12 years ago)

Author:

wschamai

Message:

BUG FIX: validation rules
MOD: validate action activated again, old is deactivated
BUG FIX: creation of extends relation (no cycles for anonym classes)
BUG FIX: components tree ISelection usage

File:

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

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

@@ -762 +762 @@
                 Element target = treeBuilder.getTypeElement(extendsRelation.getTargetQname());
                 
-                if (target instanceof Classifier) {
+                TreeParent owningClass = extendsRelation.getParent();
+                
+                /*
+                 * Avoid creating extends relations that point to the element it self. 
+                 * This may happen when anonym classes are used in Modelica.
+                 */
+                if (target instanceof Classifier 
+                        && !extendsRelation.getTargetQname().equals(extendsRelation.getSourceQname())
+                        && !extendsRelation.getTargetQname().equals(owningClass.getQName())
+                        ) {
 //                  System.out.println("Creating extends relation: " + extendsRelationTreeObject.getSourceQname() + " -> " + extendsRelation.getTargetQname());
                     addToLog("Creating extends relation: " + extendsRelationTreeObject.getSourceQname() + " -> " + extendsRelation.getTargetQname());