Changeset 2178

Timestamp:

01/15/08 23:42:14 (11 months ago)

Author:

arj..@yirdis.nl

Message:

Cleanup of pynsource (import) module. see #92.

Files:

• gaphor/trunk/gaphor/plugins/pynsource/engineer.py (modified) (4 diffs)

gaphor/trunk/gaphor/plugins/pynsource/engineer.py

@@ -101 +101 @@
-                # Finally, create the generalization relationship
-                print 'Creating Generalization for %s' % clazz, superclass
-
-
-
+#
+#
+#
-                geni = self.diagram.create(items.GeneralizationItem)
-
+#
-                
-                adapter = component.queryMultiAdapter((superclass_item, geni), IConnect)
@@ -172 +172 @@
-            head_type_item = clazz.gaphor_class_item
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            association = self.diagram.create(items.AssociationItem)
-
-            # First connect one handle:
-            #head_type_item.connect_handle(association.handles[0])
-            adapter = component.queryMultiAdapter((head_type_item, association), IConnect)
-            assert adapter
@@ -198 +202 @@
-            adapter.connect(handle)
-
-            
-            # Now the subject
-            association.subject = relation
-            association.head_end.subject = head_end
-            association.tail_end.subject = tail_end
-
-            # Connecting the other handle last will avoid a lookup for
-            # an Association. in stead the association applied as subject
-            # is used.
-            #tail_type_item.connect_handle(association.handles[-1])
-            adapter = component.queryMultiAdapter((tail_type_item, association), IConnect)
-            assert adapter
@@ -213 +207 @@
-            adapter.connect(handle)
-
+            # Apply attribute information to the association (ends)
+            association.head_end.navigability = False
+            tail_prop = association.tail_end.subject
+            tail_prop.name = attr.attrname
+            tail_prop.visibility = self._visibility(attr.attrname)
+            tail_prop.aggregation = 'composite'
-        else:
-            # Create a simple attribute: