Changeset 1176

Timestamp:

03/27/07 13:54:18 (2 years ago)

Author:

arj..@yirdis.nl

Message:

More undo fixes

Files:

• gaphor/trunk/TODO (modified) (1 diff)
• gaphor/trunk/gaphor/UML/properties.py (modified) (1 diff)
• gaphor/trunk/gaphor/UML/tests/test_properties.py (modified) (3 diffs)
• gaphor/trunk/gaphor/misc/console.py (modified) (1 diff)
• gaphor/trunk/gaphor/ui/namespace.py (modified) (3 diffs)
• gaphor/trunk/setup.cfg (modified) (1 diff)

gaphor/trunk/TODO

@@ -8 +8 @@
-
- - Undo functionality
+    - make canvas events transactional.
-
- - use easysetup tools, move gaphas to a separate package and use

gaphor/trunk/gaphor/UML/properties.py

@@ -629 +629 @@
-
-
+@component.adapter(AssociationDeleteEvent)
+def undo_association_delete_event(event):
+    association = event.property
+    obj = event.element
+    value = event.old_value
+    def _undo_association_delete_event():
+        #print 'undoing action', obj, value
+        # Tell the assoctaion it should not need to let the opposite
+        # side connect (it has it's own signal)
+        association._set(obj, value, from_opposite=True)
+    get_undo_manager().add_undo_action(_undo_association_delete_event)
+
+component.provideHandler(undo_association_delete_event)
+
+
-try:
-    import psyco

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

@@ -1 +1 @@
-#!/usr/bin/env python
-# vim:sw=4:et:ai
-
-import unittest
@@ -397 +396 @@
-        assert a.attr == 'five'
-
-
-
+
-        from gaphor.services.undomanager import get_undo_manager
-        undo_manager = get_undo_manager()
@@ -429 +427 @@
-        assert b.two is a
-
+    def test_undo_association_1_n(self):
+        from gaphor.services.undomanager import get_undo_manager
+        undo_manager = get_undo_manager()
+ 
+        class A(Element): pass
+        class B(Element): pass
+
+        A.one = association('one', B, lower=0, upper=1, opposite='two')
+        B.two = association('two', A, lower=0, upper='*', opposite='one')
+
+        a1 = A()
+        a2 = A()
+        b1 = B()
+        b2 = B()
+
+
+        undo_manager.begin_transaction()
+        b1.two = a1
+        
+        undo_manager.commit_transaction()
+        assert a1 in b1.two
+        assert b1 is a1.one
+
+        undo_manager.undo_transaction()
+        assert len(b1.two) == 0
+        assert a1.one is None
+
+        undo_manager.redo_transaction()
+        assert a1 in b1.two
+        assert b1 is a1.one
+
+        undo_manager.begin_transaction()
+        b1.two = a2
+
+        undo_manager.commit_transaction()
+        assert a1 in b1.two
+        assert a2 in b1.two
+        assert b1 is a1.one
+        assert b1 is a2.one
+
+
+# vim:sw=4:et:ai

gaphor/trunk/gaphor/misc/console.py

@@ -17 +17 @@
-import __main__
-
-TK
+aphor
-%s
-""" % sys.version

gaphor/trunk/gaphor/ui/namespace.py

@@ -256 +256 @@
-
-        for t in toplevel:
-            #print 'factory::model toplevel', t, t.name
-            self.new_node_from_element(t, self.root)
-        #print 'self.root', self.root
-
-    def refresh(self):
@@ -277 +275 @@
-
-    def on_get_flags(self):
-
+
+
-        """
-        return 0
-
-    def on_get_n_columns(self):
-
+
+
-        """
-        return 1
-
-    def on_get_column_type(self, index):
-
+
+
-        """
-        return gobject.TYPE_PYOBJECT
-
-    def on_get_path (self, node):
-Returns the path for a node as a tuple (0, 1, 1).
-"""
-#print 'on_get_path', node
+
+Returns the path for a node as a tuple (0, 1, 1).
+"""
-        return self.path_from_element(node[0])
-
-    def on_get_iter(self, path):
-
+
+
-        The path is a tuple of values, like (0 1 1). Returns None if no
-        iterator can be created.
-        """
-        #print 'on_get_iter', path
-        return self.node_from_path(path)
-
-    def on_get_value(self, node, column):
-
+
+
-        """
-        assert column == 0, 'column can only be 0'
-        #print 'on_get_value', node, column
-        return node[0]
-
-    def on_iter_next(self, node):
-
+
+
-        next element).
-        """
-        #print 'on_iter_next:', node
-        try:
-            parent = self.node_from_element(node[0].namespace)
@@ -329 +330 @@
-        
-    def on_iter_has_child(self, node):
-Returns true if this node has children, or None.
-"""
-#print 'on_iter_has_child', node
+
+Returns true if this node has children, or None.
+"""
-        return len(node[1]) > 0
-
-    def on_iter_children(self, node):
-Returns the first child of this node, or None.
-"""
-#print 'on_iter_children'
+
+Returns the first child of this node, or None.
+"""
-        return node[1][0]
-
-    def on_iter_n_children(self, node):
-Returns the number of children of this node.
-"""
-#print 'on_iter_n_children'
+
+Returns the number of children of this node.
+"""
-        return len (node[1])
-
-    def on_iter_nth_child(self, node, n):
-Returns the nth child of this node.
-"""
-#print "on_iter_nth_child", node, n
+
+Returns the nth child of this node.
+"""
-        try:
-            if node is None:

gaphor/trunk/setup.cfg

@@ +1 @@
+
+[egg_info]
+# Point egg_base to compiled sources, cause some sources have to be generated
+egg_base=build/lib
+
-[install]
-install_data=$base/share/gaphor