Changeset 2226

Timestamp:

02/26/08 04:06:00 (3 months ago)

Author:

arj..@yirdis.nl

Message:

connector fixes

Files:

• gaphor/trunk/gaphor/adapters/connectors.py (modified) (2 diffs)
• gaphor/trunk/gaphor/adapters/tests/test_connector.py (modified) (2 diffs)
• gaphor/trunk/gaphor/diagram/activitynodes.py (modified) (3 diffs)
• gaphor/trunk/gaphor/diagram/objectnode.py (modified) (1 diff)
• gaphor/trunk/gaphor/tests/testcase.py (modified) (1 diff)

gaphor/trunk/gaphor/adapters/connectors.py

@@ -90 +90 @@
-        def _disconnect():
-            self.disconnect(handle)
-            handle.disconnect = lambda: 0
-        handle.disconnect = _disconnect
-
@@ -101 +100 @@
-        """
-        self.disconnect_constraints(handle)
-        # TODO: AJM: is this correct? Should move to handle.disconnect()?
-        handle.connected_to = None
+        handle.disconnect = lambda: 0
-
-

gaphor/trunk/gaphor/adapters/tests/test_connector.py

@@ -42 +42 @@
-        assert not comment.subject.annotatedElement, comment.subject.annotatedElement
-
-print '# now connect the actor'
+ now connect the actor
-
-        adapter = component.queryMultiAdapter((actor, line), IConnect)
@@ -74 +74 @@
-        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
-        assert not actor2.subject in comment.subject.annotatedElement, comment.subject.annotatedElement
+
+        adapter = component.queryMultiAdapter((comment, line), IConnect)
+
+        handle = line.head
+        adapter.disconnect(handle)
+        
+
+    def test_commentline_class(self):
+        """
+        Connect a CommentLine to a class and unlink the commentLine
+        afterwards.
+        """
+        clazz = self.create(items.ClassItem, UML.Class)
+        comment = self.create(items.CommentItem, UML.Comment)
+        line = self.create(items.CommentLineItem)
+
+        adapter = component.queryMultiAdapter((comment, line), IConnect)
+        handle = line.head
+        adapter.connect(handle)
+
+        adapter = component.queryMultiAdapter((clazz, line), IConnect)
+        handle = line.tail
+        adapter.connect(handle)
+
+        assert clazz.subject in comment.subject.annotatedElement
+        assert comment.subject in clazz.subject.ownedComment
+
+        line.unlink()
+
+        assert not comment.subject.annotatedElement
+        assert not clazz.subject.ownedComment
+
+
+    def test_commentline_relationship_unlink(self):
+        """
+        Connect a CommentLine to a relationship item.
+        Removing the relationship should work.
+
+        Demonstrates defect #103.
+        """
+        clazz1 = self.create(items.ClassItem, UML.Class)
+        clazz2 = self.create(items.ClassItem, UML.Class)
+        gen = self.create(items.GeneralizationItem)
+
+        adapter = component.queryMultiAdapter((clazz1, gen), IConnect)
+        handle = gen.head
+        adapter.connect(handle)
+
+        adapter = component.queryMultiAdapter((clazz2, gen), IConnect)
+        handle = gen.tail
+        adapter.connect(handle)
+
+        assert gen.subject
+
+        # And now the comment:
+
+        comment = self.create(items.CommentItem, UML.Comment)
+        line = self.create(items.CommentLineItem)
+
+        adapter = component.queryMultiAdapter((comment, line), IConnect)
+        handle = line.head
+        adapter.connect(handle)
+
+        adapter = component.queryMultiAdapter((gen, line), IConnect)
+        handle = line.tail
+        adapter.connect(handle)
+
+        assert gen.subject in comment.subject.annotatedElement
+        assert comment.subject in gen.subject.ownedComment
+
+        gen.unlink()
+
+        assert not comment.subject.annotatedElement
+        assert not gen.subject
-
-

gaphor/trunk/gaphor/diagram/activitynodes.py

@@ -216 +216 @@
-            visible=self.is_join_spec_visible)
-
-obj._name = obj
+self._name = self
-                    'text-align': self.style.name_align,
-                    'text-padding': self.style.name_padding,
@@ -224 +224 @@
-                }, editable=True)
-
-
-
-
+self.
+self.
+self.
-
-
@@ -331 +331 @@
-
-    def on_named_element_name(self, event):
-
-
+
+
+
+
-
-    def on_join_node_join_spec(self, event):
-        subject = self.subject
-elf.s
+
-                (event.element is subject.joinSpec or \
-                 event.element is subject.joinSpec.value):

gaphor/trunk/gaphor/diagram/objectnode.py

@@ -49 +49 @@
-            visible=self._get_show_ordering)
-
-
-
+
-        self.add_watch(UML.ObjectNode.ordering)
-

gaphor/trunk/gaphor/tests/testcase.py

@@ -10 +10 @@
-
-from gaphor import UML
-
+.storage
-from gaphor.application import Application
-from gaphor.misc.xmlwriter import XMLWriter