Changeset 1088

Timestamp:

11/24/06 03:02:44 (2 years ago)

Author:

arjanmol

Message:

Copnnections on lines are now properly reflected in the data model.

Files:

• gaphor/branches/new-canvas/TODO (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (10 diffs)
• gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py (modified) (1 diff)

gaphor/branches/new-canvas/TODO

@@ -7 +7 @@
-   other support classes.
-
- - Currently (r1085) relations (association, dependency) can be created between
-   model elements. Some items (e.g. comment lines) can be connected to the
-   relationship at the time it realizes a relation at model level (both ends
-   get connected). This should result in a trigger to the attached
-   (comment-)line so it can also establish it's relationship at model level.
-   This can be solved in two places:
-   1. handle it in the DiagramItem. This will ensure such relationship is
-      always up to date, but may result in weird behavior in the loading code.
-   2. handle it in the IConnect adapters. That's the only place where
-      relationship are established so doing some extra work there won't hurt
-   Hmm.. Option 2 I guess..
-
- - using stereotypes
- - associations
- - components and stuff
-

gaphor/branches/new-canvas/gaphor/adapters/connectors.py

@@ -295 +295 @@
-        opposite = self.line.opposite(handle)
-        if handle.connected_to and opposite.connected_to:
-
+
+
+
-                del opposite.connected_to.subject.annotatedElement[handle.connected_to.subject]
-            else:
-                del handle.connected_to.subject.annotatedElement[opposite.connected_to.subject]
-        super(CommentLineLineConnect, self).disconnect(handle)
-
@@ -379 +379 @@
-        return relation
-
-trigger_connected_items(self, li
+connect_connected_items(self, connected_items=No
-        """
-        Cause items connected to @line to reconnect, allowing them to
-        establish or destroy relationships at model level.
-        """
+        line = self.line
-        canvas = line.canvas
-        solver = canvas.solver
@@ -389 +390 @@
-        # First make sure coordinates match
-        solver.solve()
-self.
+connected_items or 
-            adapter = component.queryMultiAdapter((line, item), IConnect)
-            assert adapter
-            adapter.connect(handle, handle.x, handle.y)
-        
+    def disconnect_connected_items(self):
+        """
+        Cause items connected to @line to be disconnected.
+        This is nessesary if the subject of the @line is to be removed.
+
+        Returns a list of (item, handle) pairs that were connected (this
+        list can be used to connect items again with connect_connected_items()).
+        """
+        line = self.line
+        canvas = line.canvas
+        solver = canvas.solver
+
+        # First make sure coordinates match
+        solver.solve()
+        connected_items = list(line.canvas.get_connected_items(line))
+        for item, handle in connected_items:
+            adapter = component.queryMultiAdapter((line, item), IConnect)
+            assert adapter
+            adapter.disconnect(handle)
+        return connected_items
+
-    def glue(self, handle, x, y):
-        opposite = self.line.opposite(handle)
@@ -417 +439 @@
-        """
-        raise NotImplemented, 'Implement connect_subject() in a subclass'
+
+    def disconnect_subject(self, handle):
+        """
+        Disconnect the diagram item from its model element. If there are
+        no more presentations(diagram items) connected to the model element,
+        unlink() it too.
+        """
+        line = self.line
+        old = line.subject
+        del line.subject
+        if old and len(old.presentation) == 0:
+            old.unlink()
-
-    def connect(self, handle, x, y):
@@ -429 +463 @@
-                line = self.line
-                if line.subject:
-trigger_connected_items(line
+connect_connected_items(
-
-    def disconnect(self, handle):
@@ -435 +469 @@
-        Disconnect model element.
-        """
-
+
+
-        if handle.connected_to and opposite.connected_to:
-
-
+
+
+
+
+
-            if old:
-
-
-
+
-
-        super(RelationshipConnect, self).disconnect(handle)
@@ -692 +728 @@
-        line.subject = relation
-
-
+_subject
-        """
-        Disconnect model element.
@@ -706 +742 @@
-                    e.unlink()
-                old.unlink()
-
-        super(ExtensionConnect, self).disconnect(handle)
-
-
@@ -794 +828 @@
-                line.tail_end.subject = tail_end
-
-
+_subject
-        """
-        Disconnect model element.
@@ -811 +845 @@
-                old.unlink()
-
-        super(AssociationConnect, self).disconnect(handle)
-
-
-component.provideAdapter(AssociationConnect)

gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py

@@ -222 +222 @@
-        assert assoc.subject in comment.subject.annotatedElement
-
-
+
+
-
-        adapter.disconnect(handle)