Changeset 1113

Timestamp:

12/18/06 13:40:53 (2 years ago)

Author:

arjanmol

Message:

minor code cleanup

Files:

• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (7 diffs)

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

@@ -747 +747 @@
-                        else:
-                            line.subject = assoc
-#                                    if (end1.type is head_type and end2.type is tail_type):
-#                                        line.head_subject = end1
-#                                        line.tail_subject = end2
-#                                    else:
-#                                        line.head_subject = end2
-#                                        line.tail_subject = end1
-                            return
-            else:
@@ -768 +762 @@
-                head_end.name = 'baseClass'
-
-
+        
-
-    def disconnect_subject(self, handle):
@@ -911 +905 @@
-            return None
-
-        # Another flow may not be connected:
-        #connected = line.canvas.get_connected_items(element)
-        #if handle is line.head:
-        #    for i, h in connected:
-        #        if isinstance(i, items.FlowItem) and h is i.head:
-        #            return None
-
-        #if handle is line.tail:
-        #    for i, h in connected:
-        #        if isinstance(i, items.FlowItem) and h is i.tail:
-        #            return None
-
-        #if handle is line.head and subject.outgoing and subject.outgoing is not line.subject:
-        #    return None
-
-        #if handle is line.tail and subject.incoming and subject.incoming is not line.subject:
-        #    return None
-
-        return super(FlowConnect, self).glue(handle, x, y)
-
@@ -1009 +985 @@
-        return super(FlowForkDecisionNodeConnect, self).glue(handle, x, y)
-
-, fork_node_class, join_node_class
+
-        """
-        Combine join/fork or decision/methe nodes into one diagram item.
-        """
+        fork_node_class = self.fork_node_class
+        join_node_class = self.join_node_class
-        line = self.line
-        element = self.element
@@ -1041 +1019 @@
-            element.combined = fork_node
-
-, fork_node_class, join_node_class
+
-        """
-        Decombine join/fork or decision/merge nodes.
-        """
+        fork_node_class = self.fork_node_class
+        join_node_class = self.join_node_class
-        line = self.line
-        element = self.element
@@ -1093 +1073 @@
-    component.adapts(items.ForkNodeItem, items.FlowItem)
-
-
-
-
-
-
-
-
+
+
-
-component.provideAdapter(FlowForkNodeConnect)
@@ -1110 +1085 @@
-    component.adapts(items.DecisionNodeItem, items.FlowItem)
-
-
-
-
-
-
-
-
+
+
-
-component.provideAdapter(FlowDecisionNodeConnect)