Changeset 2074

Timestamp:

09/01/07 13:43:29 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Fixed signal emission from umlproperties, do undo manager can deal with them.
Be more strict in emitting events.
Also extended test cases.

Files:

• gaphor/trunk/gaphor/UML/properties.py (modified) (9 diffs)
• gaphor/trunk/gaphor/UML/tests/test_properties.py (modified) (4 diffs)
• gaphor/trunk/gaphor/services/tests/test_undomanager.py (modified) (8 diffs)
• gaphor/trunk/gaphor/services/undomanager.py (modified) (2 diffs)

gaphor/trunk/gaphor/UML/properties.py

@@ -176 +176 @@
-            return
-
-        #undoattributeaction(self, obj, self._get(obj))
-        if value == self.default:
-            delattr(obj, self._name)
@@ -187 +186 @@
-        old = self._get(obj)
-        try:
-            #undoattributeaction(self, obj, self._get(obj))
-            delattr(obj, self._name)
-        except AttributeError:
@@ -194 +192 @@
-            component.handle(AttributeChangeEvent(obj, self, old, self.default))
-            self.notify(obj)
-
-
-#class undosetassociationaction(undoaction):
-#    """
-#    Undo a 'set' action in an association.
-#    """
-#
-#    def undo(self):
-#        #log.debug('undosetassociationaction del: %s %s %s' % (self.obj, self.prop.name, self.value))
-#        self.prop._del(self.obj, self.value)
-#        return self.redo
-#
-#    def redo(self):
-#        #log.debug('undosetassociationaction set: %s %s %s' % (self.obj, self.prop.name, self.value))
-#        self.prop._set(self.obj, self.value)
-##        return self.undo
-
-
-#class undodelassociationaction(undoaction):
-#    """Undo a 'del' action in an association.
-#    """
-#
-#    def undo(self):
-#        #log.debug('undodelassociationaction set: %s %s %s' % (self.obj, self.prop.name, self.value))
-#        self.prop._set(self.obj, self.value)
-#        return self.redo
-#
-#    def redo(self):
-#        #log.debug('undodelassociationaction del: %s %s %s' % (self.obj, self.prop.name, self.value))
-#        self.prop._del(self.obj, self.value)
-#        return self.undo
-
-
@@ -300 +267 @@
-        This method is called from the opposite association property.
-        """
-
+, self._get(obj)
-        if not (isinstance(value, self.type) or \
-                (value is None and self.upper == 1)):
@@ -309 +276 @@
-
-            # do nothing if we are assigned our current value:
+            # Still do your thing, since undo handlers expect that.
-            if value is old:
-                return
-
-            if old:
-
-
-
-
-
-
-
-
-
-
+
+
-            if do_notify:
-                event = AssociationSetEvent(obj, self, old, value)
+
+            if value is None:
+                if do_notify:
+                    self.notify(obj)
+                    component.handle(event)
+                return
+
+            setattr(obj, self._name, value)
+
-        else:
-            # Set the actual value
@@ -351 +320 @@
-            component.handle(event)
-
-
+, do_notify=True
-        """
-        Delete is used for element deletion and for removal of
@@ -368 +337 @@
-            getattr(type(value), self.opposite)._del(value, obj, from_opposite=True)
-
+        event = None
-        if self.upper > 1:
-            c = self._get(obj)
@@ -377 +347 @@
-                    pass
-                else:
-
+
+
-
-                # Remove items collection if empty
@@ -388 +359 @@
-                pass
-            else:
-
+
+
-
-        value.disconnect(self.__on_unlink, obj)
-        if self.composite:
-            obj.disconnect(self.__on_composite_unlink, value)
-
+
+
+
-
-    def __on_unlink(self, value, pspec, obj):

gaphor/trunk/gaphor/UML/tests/test_properties.py

@@ -22 +22 @@
-        assert b.two is a
-
+        a.one = None
+        assert a.one is None
+        assert b.two is None
+
+        a.one = b
+        assert a.one is b
+        assert b.two is a
+
+        del a.one
+        assert a.one is None
+        assert b.two is None
+
+
-    def test_association_n_x(self):
-        #
@@ -38 +51 @@
-        assert b in a.one
-        assert b.two is a
+
-
-    def test_association_1_1(self):
@@ -79 +93 @@
-        assert len(a._observers.get('__unlink__')) == 0
-        assert len(b._observers.get('__unlink__')) == 0
+
-
-    def test_association_1_n(self):
@@ -150 +165 @@
-        else:
-            assert 0, 'should not be removed'
+
-
-    def test_association_n_n(self):

gaphor/trunk/gaphor/services/tests/test_undomanager.py

@@ -43 +43 @@
-        assert undo_manager._current_transaction is None
-
+        undo_manager.shutdown()
+
-    def test_not_in_transaction(self):
-        undo_manager = UndoManager()
@@ -56 +58 @@
-        assert undo_manager.can_undo()
-        assert len(undo_manager._current_transaction._actions) == 1
+
+        undo_manager.shutdown()
-
-        
@@ -96 +100 @@
-        assert undone[0] == -1, undone
-
+        undo_manager.shutdown()
+
+
-    def test_undo_attribute(self):
-        import types
@@ -120 +127 @@
-        assert a.attr == 'five'
-
-
+
+
+
-        from gaphor.UML.properties import association
-        from gaphor.UML.element import Element
@@ -144 +153 @@
-        assert a.one is b
-        assert b.two is a
+        assert len(undo_manager._undo_stack) == 1
+        assert len(undo_manager._undo_stack[0]._actions) == 2, undo_manager._undo_stack[0]._actions
-
-        undo_manager.undo_transaction()
-        assert a.one is None
-        assert b.two is None
-
-
+
+
+
+
+
+
+
+
-        assert a.one is b
-
+
+
-
-    def test_undo_association_1_n(self):
@@ -177 +195 @@
-        assert a1 in b1.two
-        assert b1 is a1.one
+        assert len(undo_manager._undo_stack) == 1
+        assert len(undo_manager._undo_stack[0]._actions) == 2, undo_manager._undo_stack[0]._actions
-
-        undo_manager.undo_transaction()
-        assert len(b1.two) == 0
-        assert a1.one is None
+        assert undo_manager.can_redo()
+        assert len(undo_manager._redo_stack) == 1
+        assert len(undo_manager._redo_stack[0]._actions) == 2, undo_manager._redo_stack[0]._actions
-
-        undo_manager.redo_transaction()
@@ -195 +218 @@
-        assert b1 is a2.one
-
+        undo_manager.shutdown()
+
+
-    def test_element_factory_undo(self):
-        from gaphor.UML.elementfactory import ElementFactory
@@ -221 +247 @@
-        assert ef.lselect()[0] is p
-        
+        undo_manager.shutdown()
+
+
+    def test_uml_associations(self):
+
+        from zope import component
+        from gaphor.UML.event import AssociationChangeEvent
+        from gaphor.UML.properties import association, derivedunion
+        from gaphor.UML import Element
+
+        class A(Element):
+            is_unlinked = False
+            def unlink(self):
+                self.is_unlinked = True
+                Element.unlink(self)
+
+        A.a1 = association('a1', A, upper=1)
+        A.a2 = association('a2', A, upper=1)
+        A.b1 = association('b1', A, upper='*')
+        A.b2 = association('b2', A, upper='*')
+        A.b3 = association('b3', A, upper=1)
+
+        A.derived_a = derivedunion('derived_a', 0, 1, A.a1, A.a2)
+        A.derived_b = derivedunion('derived_b', 0, '*', A.b1, A.b2, A.b3)
+
+        events = []
+        @component.adapter(AssociationChangeEvent)
+        def handler(event, events=events):
+            events.append(event)
+
+        Application.register_handler(handler)
+        try:
+            a = A()
+
+            undo_manager = UndoManager()
+            undo_manager.init(Application)
+            undo_manager.begin_transaction()
+
+            a.a1 = A()
+            undo_manager.commit_transaction()
+            
+            assert len(events) == 2
+            assert events[0].property is A.derived_a
+            assert events[1].property is A.a1
+            assert undo_manager.can_undo()
+
+            undo_manager.undo_transaction()
+            assert not undo_manager.can_undo()
+            assert undo_manager.can_redo()
+            assert len(events) == 4, len(events)
+            assert events[2].property is A.derived_a
+            assert events[3].property is A.a1
+
+        finally:
+            Application.unregister_handler(handler)
+            undo_manager.shutdown()
+
+
-# vim:sw=4:et

gaphor/trunk/gaphor/services/undomanager.py

@@ -208 +208 @@
-
-    def discard_transaction(self):
-
-        if not self._current_transaction:
-            raise TransactionError, 'No transaction to discard'
@@ -348 +347 @@
-        obj = event.element
-        value = event.old_value
+        #print 'got new set event', association, obj, value
-        def _undo_association_set_event():
-            #print 'undoing action', obj, value