Changeset 2245

Timestamp:

03/03/08 16:02:09 (2 months ago)

Author:

wrobe..@pld-linux.org

Message:

- implemented final state and initial pseudostate correct transition

connectors

Files:

• gaphor/trunk/gaphor/adapters/states/tests/test_transition_connect.py (modified) (5 diffs)
• gaphor/trunk/gaphor/adapters/states/vertexconnect.py (modified) (2 diffs)
• gaphor/trunk/gaphor/diagram/states/pseudostates.py (modified) (2 diffs)

gaphor/trunk/gaphor/adapters/states/tests/test_transition_connect.py

@@ -1 +1 @@
-"""
-
+and state vertices 
-"""
-
@@ -18 +18 @@
-        factory = self.element_factory
-
-
-
+, UML.State
+, UML.State
-
-        t = self.create(items.TransitionItem)
@@ -40 +40 @@
-        assert len(factory.lselect(lambda e: e.isKindOf(UML.Transition))) == 1
-        
-
-
-
-
-
+
+
+
+
+
+
+
-        """Test transition and state vertices disconnection
-        """
-        factory = self.element_factory
-
-
-
+, UML.State
+, UML.State
-
-        t = self.create(items.TransitionItem)
@@ -71 +73 @@
-        assert len(factory.lselect(lambda e: e.isKindOf(UML.Transition))) == 1
-        
-.source == v1.subject.outgoing
-.target == v2.subject.incoming
+ == v1.subject.outgoing[0]
+ == v2.subject.incoming[0]
-
-        adapter.disconnect(t.tail)
@@ -81 +83 @@
-
-
+    def test_initial_pseudostate_connect(self):
+        """Test transition and initial pseudostate connection
+        """
+        factory = self.element_factory
+
+        v1 = self.create(items.InitialPseudostateItem, UML.Pseudostate)
+        assert v1._connected == False # not connected
+        v2 = self.create(items.StateItem, UML.State)
+        assert v1.subject.kind == 'initial'
+
+        t = self.create(items.TransitionItem)
+        assert t.subject is None
+
+        # connect head of transition to an initial pseudostate
+        adapter = component.queryMultiAdapter((v1, t), IConnect)
+        assert adapter is not None
+        adapter.connect(t.head)
+        assert t.subject is None
+        assert v1._connected == True # psuedostate connected
+
+        # connect tail of transition to a state
+        adapter = component.queryMultiAdapter((v2, t), IConnect)
+        assert adapter is not None
+        adapter.connect(t.tail)
+        assert t.subject is not None
+
+        assert len(factory.lselect(lambda e: e.isKindOf(UML.Transition))) == 1
+        
+        assert t.subject == v1.subject.outgoing[0]
+        assert t.subject == v2.subject.incoming[0]
+
+        # we should not be able to connect two transitions to initial
+        # pseudostate
+        t2 = self.create(items.TransitionItem)
+        adapter = component.queryMultiAdapter((v1, t2), IConnect)
+        assert adapter is not None
+        adapter.connect(t.head)
+        # connection to `t2` should not be possible as v1 is already connected
+        # to `t`
+        assert t2.head.connected_to is None
+        assert v1._connected == True # psuedostate remains connected
+
+
+    def test_initial_pseudostate_disconnect(self):
+        """Test transition and initial pseudostate disconnection
+        """
+        factory = self.element_factory
+
+        v1 = self.create(items.InitialPseudostateItem, UML.Pseudostate)
+        assert v1._connected == False # not connected
+        v2 = self.create(items.StateItem, UML.State)
+        assert v1.subject.kind == 'initial'
+
+        t = self.create(items.TransitionItem)
+        assert t.subject is None
+
+        # connect head of transition to an initial pseudostate
+        adapter = component.queryMultiAdapter((v1, t), IConnect)
+        assert adapter is not None
+        adapter.connect(t.head)
+        assert t.subject is None
+
+        assert v1._connected == True # psuedostate connected
+
+        adapter.disconnect(t.head)
+        assert v1._connected == False # psuedostate disconnected
+
+
+    def test_initial_pseudostate_tail_connect(self):
+        """Test transition tail and initial pseudostate connection
+        """
+        factory = self.element_factory
+
+        v1 = self.create(items.InitialPseudostateItem, UML.Pseudostate)
+        assert v1._connected == False # not connected
+        v2 = self.create(items.StateItem, UML.State)
+        assert v1.subject.kind == 'initial'
+
+        t = self.create(items.TransitionItem)
+        assert t.subject is None
+
+        # connect head of transition to an initial pseudostate
+        adapter = component.queryMultiAdapter((v1, t), IConnect)
+        assert adapter is not None
+        adapter.connect(t.tail)
+        assert t.tail.connected_to is None, 'no tail connection should be possible'
+        assert v1._connected == False # psuedostate not connected
+
+
+    def test_final_state_connect(self):
+        """Test transition to final state connection
+        """
+        factory = self.element_factory
+
+        v1 = self.create(items.StateItem, UML.State)
+        v2 = self.create(items.FinalStateItem, UML.FinalState)
+
+        t = self.create(items.TransitionItem)
+        assert t.subject is None
+
+        adapter = component.queryMultiAdapter((v1, t), IConnect)
+        assert adapter is not None
+        
+        # connect head of transition to a state
+        adapter.connect(t.head)
+        assert t.subject is None
+
+        adapter = component.queryMultiAdapter((v2, t), IConnect)
+        assert adapter is not None
+
+        # connect tail of transition to final state
+        adapter.connect(t.tail)
+        assert t.subject is not None
+
+        assert len(factory.lselect(lambda e: e.isKindOf(UML.Transition))) == 1
+        
+        assert t.subject == v1.subject.outgoing[0]
+        assert t.subject == v2.subject.incoming[0]
+        assert t.subject.source == v1.subject
+        assert t.subject.target == v2.subject
+
+
+    def test_final_state_head_connect(self):
+        """Test transition head to final state connection
+        """
+        factory = self.element_factory
+
+        v = self.create(items.FinalStateItem, UML.FinalState)
+        t = self.create(items.TransitionItem)
+
+        adapter = component.queryMultiAdapter((v, t), IConnect)
+        assert adapter is not None
+
+        # connect head of transition to final state
+        adapter.connect(t.head)
+        # no connection as only tail of transition can be connected
+        assert t.head.connected_to is None
+
+
-# vim:sw=4:et:ai

gaphor/trunk/gaphor/adapters/states/vertexconnect.py

@@ -10 +10 @@
-from gaphor.adapters.connectors import RelationshipConnect
-
-
+
+
-    """
-Connect two state vertices using transition item
+Abstract relationship between two state vertices
-    """
-    component.adapts(items.VertexItem, items.TransitionItem)
-
-    def connect_subject(self, handle):
-        relation = self.relationship_or_new(UML.Transition,
@@ -22 +21 @@
-        self.line.subject = relation
-
+
+
+class TransitionConnect(VertexConnect):
+    """
+    Connect two state vertices using transition item.
+    """
+    component.adapts(items.VertexItem, items.TransitionItem)
+
+    def glue(self, handle):
+        """
+        Glue transition handle and vertex item. Guard from connecting
+        transition's head with final state.
+        """
+        line = self.line
+        subject = self.element.subject
+
+        is_final = isinstance(subject, UML.FinalState)
+        if isinstance(subject, UML.State) and not is_final \
+                or handle is line.tail and is_final:
+            return super(TransitionConnect, self).glue(handle)
+        else:
+            return None
+
-component.provideAdapter(TransitionConnect)
+
+
+
+class InitialPseudostateTransitionConnect(VertexConnect):
+    """
+    Connect initial pseudostate using transition item.
+
+    It modifies InitialPseudostateItem._connected attribute to disallow
+    connection of more than one transition.
+    """
+    component.adapts(items.InitialPseudostateItem, items.TransitionItem)
+
+    def glue(self, handle):
+        """
+        Glue to initial pseudostate with transition's head and when there are
+        no transitions connected.
+        """
+        line = self.line
+        subject = self.element.subject
+
+        if handle is line.head and not self.element._connected:
+            return super(InitialPseudostateTransitionConnect, self).glue(handle)
+        else:
+            return None
+
+
+    def connect(self, handle):
+        """
+        Update InitialPseudostateItem._connected attribute to `True` to
+        disallow more connections.
+        """
+        if super(InitialPseudostateTransitionConnect, self).connect(handle):
+            self.element._connected = True
+
+
+    def disconnect(self, handle):
+        """
+        Update InitialPseudostateItem._connected attribute to `False` to
+        allow transition connection again after disconnection.
+        """
+        super(InitialPseudostateTransitionConnect, self).disconnect(handle)
+        self.element._connected = False
+
+component.provideAdapter(InitialPseudostateTransitionConnect)

gaphor/trunk/gaphor/diagram/states/pseudostates.py

@@ -13 +13 @@
-
-class InitialPseudostateItem(VertexItem):
+    """
+    Initial pseudostate diagram item.
+
+    Parameters
+        - _connected - guard used to not connect more than one transition
+    """
-    __uml__   = UML.Pseudostate
-    __style__ = {
@@ -27 +33 @@
-            h.movable = False
-
+        self._connected = False
+
+
-    def draw(self, context):
-        """