Changeset 696 for trunk/org.modelica.uml.sysml/src/org/modelica/uml/sysml/operations

Timestamp:

04/12/11 08:18:29 (13 years ago)

Author:

adrpo

Message:

• updates

File:

• trunk/org.modelica.uml.sysml/src/org/modelica/uml/sysml/operations/ModelicaTypeOperations.java (modified) (3 diffs)

trunk/org.modelica.uml.sysml/src/org/modelica/uml/sysml/operations/ModelicaTypeOperations.java

@@ -38 +38 @@
 
         ModelicaComposition composition = (ModelicaComposition) package_
-                .createOwnedType(null,
-                        SysmlPackage.Literals.MODELICA_COMPOSITION);
+        .createOwnedType(null,
+                SysmlPackage.Literals.MODELICA_COMPOSITION);
 
         createAssociationEnd(type, composition, false,
@@ -46 +46 @@
         createAssociationEnd(end1Type, composition, false,
                 AggregationKind.NONE_LITERAL, end2Name, 0, -1, type);
-        
+
         composition.setAccess(AccessKind.PUBLIC_LITERAL);
         composition.setDirection(FlowDirection.IN_LITERAL);
-        
+
         return composition;
     }
 
-    
-    
+
+
     public static List getCompositionProperties(ModelicaClass modelicaClass) {
         List properties = new ArrayList();
 
         org.eclipse.uml2.uml.Package package_ = modelicaClass
-                .getNearestPackage();
-
+        .getNearestPackage();
+        
         if (package_ == null) {
             throw new IllegalStateException();
@@ -71 +71 @@
             if (type instanceof ModelicaComposition) {
                 Property classEnd = (Property) ((ModelicaComposition) type)
-                        .getOwnedEnds().get(1);
-
+                .getOwnedEnds().get(1);
+                
                 // checking if modelicaClass participates in composition
                 // association
-                if (classEnd.getType().equals(modelicaClass)) {
+                if ((((ModelicaComposition) type)
+                        .getSource()).equals(modelicaClass)) {
                     // save another end
                     properties.add(((ModelicaComposition) type).getOwnedEnds()