Changeset 2287

Timestamp:

04/07/08 01:21:21 (1 month ago)

Author:

arj..@yirdis.nl

Message:

Fixes #112 and make flow/fork/decision unit tests pass.

Files:

• gaphor/trunk/gaphor/adapters/connectors.py (modified) (1 diff)
• gaphor/trunk/gaphor/diagram/activitynodes.py (modified) (1 diff)

gaphor/trunk/gaphor/adapters/connectors.py

@@ -958 +958 @@
-#        h1, h2 = self.element.handles()
-#        return geometry.distance_line_point(h1.pos, h2.pos, (x, y))[1]
+        
+        # No cyclic connect is possible on a Flow/Decision node:
+        line = self.line
+        subject = self.element.subject
+        
+        if handle is line.head and line.tail.connected_to and line.tail.connected_to.subject is subject \
+           or handle is line.tail and line.head.connected_to and line.head.connected_to.subject is subject:
+            return None
-
-        return super(FlowForkDecisionNodeConnect, self).glue(handle)

gaphor/trunk/gaphor/diagram/activitynodes.py

@@ -339 +339 @@
-        subject = self.subject
-        if subject and is_join_node(subject) and \
-
+
+
-                 event.element is subject.joinSpec.value):
-            if is_join_node(subject) and not (subject.joinSpec and subject.joinSpec.value):