Changeset 1112

Timestamp:

12/18/06 13:35:32 (2 years ago)

Author:

arjanmol

Message:

• got combined join/fork and decision/merge nodes working
  
• updated testset
  

Files:

• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (15 diffs)
• gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py (modified) (5 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/activitynodes.py (modified) (1 diff)

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

@@ -409 +409 @@
-        return connected_items
-
-
+, handle
-        """
-        Establish the relationship at model level.
@@ -435 +435 @@
-            opposite = self.line.opposite(handle)
-            if opposite.connected_to:
-
+handle
-                line = self.line
-                if line.subject:
@@ -491 +491 @@
-        return super(DependencyConnect, self).glue(handle, x, y)
-
-
+, handle
-        """
-        TODO: cleck for existing relationships (use self.relation())
@@ -549 +549 @@
-        return super(ImplementationConnect, self).glue(handle, x, y)
-
-
+, handle
-        relation = self.relationship_or_new(UML.Implementation,
-                    ('contract', None),
@@ -587 +587 @@
-        return super(GeneralizationConnect, self).glue(handle, x, y)
-
-
+, handle
-        relation = self.relationship_or_new(UML.Generalization,
-                    ('general', None),
@@ -627 +627 @@
-        return super(IncludeConnect, self).glue(handle, x, y)
-
-
+, handle
-        relation = self.relationship_or_new(UML.Include,
-                    ('addition', None),
@@ -667 +667 @@
-        return super(ExtendConnect, self).glue(handle, x, y)
-
-
+, handle
-        relation = self.relationship_or_new(UML.Extend,
-                    ('extendedCase', None),
@@ -714 +714 @@
-        return super(ExtensionConnect, self).glue(handle, x, y)
-
-
+, handle
-        element = self.element
-        line = self.line
@@ -811 +811 @@
-        return super(AssociationConnect, self).glue(handle, x, y)
-
-
+, handle
-        element = self.element
-        line = self.line
@@ -931 +931 @@
-        return super(FlowConnect, self).glue(handle, x, y)
-
-
+, handle
-        line = self.line
-        element = self.element
@@ -947 +947 @@
-        if not relation.guard:
-            relation.guard = UML.create(UML.LiteralSpecification)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-component.provideAdapter(factory=FlowConnect,
@@ -1003 +1015 @@
-        line = self.line
-        element = self.element
-        join_node = element.subject
-        if element.combined:
-            return
-
-        # determine flow class:
-        if [ f for f in join_node.incoming if isinstance(f, UML.ObjectFlow) ]:
-            flow_class = UML.ObjectFlow
-        else:
-            flow_class = UML.ControlFlow
-        
-        UML.swap_element(join_node, join_node_class)
-        fork_node = UML.create(UML.ForkNode)
-        for flow in join_node.outgoing:
-            flow.source = fork_node
-        flow = UML.create(flow_class)
-        flow.source = join_node
-        flow.target = fork_node
-
-        element.combined = fork_node
-
-    def decombine_nodes(self, fork_node_class, join_node_class):
-        """
-        Decombine join/fork or decision/merge nodes.
-        """
-        line = self.line
-        element = self.element
-        if element.combined:
-            join_node = element.subject
-            flow = subject.outgoing[0]
-            fork_node = flow.target
-            assert fork_node is element.combined
-            assert isinstance(join_node, join_node_class)
-            assert isinstance(fork_node, fork_node_class)
-
-            if len(join_node.incoming) < 2 or len(fork_node.outgoing) < 2:
-                # Move all outgoing edges to the first node (the join node):
-                for flow in fork_node.outgoing:
-                    flow.source = join_node
-                flow.unlink()
-                fork_node.unlink()
-
-                # swap subject to fork node if outgoing > 1
-                if len(subject.outgoing) > 1:
-                    assert len(subject.incoming) < 2
-                    UML.swap_element(subject, fork_node_class)
-            else:
-                # Illegal state!
-                pass
-            element.combined = None
-
-    def connect_subject(self, fork_node_class, join_node_class):
-        """
-        In addition to a subject connect, the subject of the element may 
-        be changed.
-        For readability, parameters are named afther the classes used by
-        Join/Fork nodes.
-        """
-        super(FlowForkDecisionNodeConnect, self).connect_subject()
-
-        # Switch class for self.element Join/Fork depending on the number
-        # of incoming/outgoing edges.
-        element = self.element
-        subject = element.subject
-        if len(subject.incoming) > 1 and len(subject.outgoing) < 2:
@@ -1072 +1022 @@
-            UML.swap_element(subject, fork_node_class)
-            element.request_update()
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        super(FlowForkDecisionNodeConnect, self).disconnect_subject()
-        if self.element.combined:
-
-
-
+
-
-
@@ -1089 +1093 @@
-    component.adapts(items.ForkNodeItem, items.FlowItem)
-
-
-
+
+
+
+
+
+
+
-
-component.provideAdapter(FlowForkNodeConnect)
@@ -1101 +1110 @@
-    component.adapts(items.DecisionNodeItem, items.FlowItem)
-
-
-
+
+
+
+
+
+
+
-
-component.provideAdapter(FlowDecisionNodeConnect)

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

@@ -611 +611 @@
-        a2 = diagram.create(items.ActionItem, subject=UML.create(UML.Action))
-        a3 = diagram.create(items.ActionItem, subject=UML.create(UML.Action))
+        a4 = diagram.create(items.ActionItem, subject=UML.create(UML.Action))
-        f1 = diagram.create(itemClass, subject=UML.create(joinNodeClass))
-
@@ -617 +618 @@
-        # Connect between two actions (ControlFlow)
-        # Connecting line this:
-          
+head  tail
-        # [ a1 ] --flow1-->|
-        #                  |--flow3-->[ a3 ]
@@ -653 +654 @@
-        assert flow2.subject in f1.subject.outgoing
-        assert type(f1.subject) is joinNodeClass
+        assert flow2.canvas
-
-        adapter = component.queryMultiAdapter((f1, flow3), IConnect)
@@ -660 +662 @@
-        assert flow3.subject.source is f1.subject
-        assert flow3.subject in f1.subject.outgoing
+        assert len(f1.subject.outgoing) == 2
-
-        assert type(f1.subject) is forkNodeClass, f1.subject
-
-can't be an incoming flow
+will force the forknode to become a combined node
-
-        adapter = component.queryMultiAdapter((f1, flow4), IConnect)
-        assert adapter
-        adapter.connect(flow4.tail, flow4.tail.x, flow4.tail.y)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # flow4 can be connected as outgoing flow though:
-
-
-
-
-
+
+
+
+
-
-        adapter.disconnect(flow4.head)
-        assert flow4.head.connected_to is None
+        adapter = component.queryMultiAdapter((f1, flow4), IConnect)
+        adapter.disconnect(flow4.tail)
+        assert not f1.combined
+        
+        assert flow2.canvas
+        assert flow2.canvas.solver
-
-        # Now change the ForkNode back into a JoinNode by moving flow2
@@ -711 +734 @@
-
-        # And of course I can't add another outgoing edge:
-
-
-
-
+#
+#
+#
+#
-
-

gaphor/branches/new-canvas/gaphor/diagram/activitynodes.py

@@ -133 +133 @@
-
-    def _set_combined(self, value):
-
+#
-        self._combined = value
-