Changeset 2246

Timestamp:

03/03/08 23:40:52 (2 months ago)

Author:

arj..@yirdis.nl

Message:

Redefine events are now only sent if the class who's property is set has the redefine declared.

Files:

• gaphor/trunk/gaphor/UML/properties.py (modified) (2 diffs)
• gaphor/trunk/gaphor/UML/tests/test_properties.py (modified) (2 diffs)
• gaphor/trunk/utils/command/gen_uml.py (modified) (1 diff)

gaphor/trunk/gaphor/UML/properties.py

@@ -569 +569 @@
-    """
-    Redefined association
-
+Element, 
-    If the redefine eclipses the original property (it has the same name)
-    it ensures that the original values are saved and restored.
-    """
-
-
+
+
-        self.name = intern(name)
-        self._name = intern('_' + name)
@@ -633 +634 @@
-    @component.adapter(IAssociationChangeEvent)
-    def _association_changed(self, event):
-
+ and isinstance(event.element, self.decl_class)
-            # mimic the events for Set/Add/Delete
-            if IAssociationSetEvent.providedBy(event):

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

@@ -608 +608 @@
-        A.a = association('a', A, upper=1)
-
-
+A, 
-        events = []
-        @component.adapter(AssociationChangeEvent)
@@ -624 +624 @@
-            Application.unregister_handler(handler)
-
+    def test_redefine_subclass(self):
+        from zope import component
+        from gaphor.application import Application
+        from gaphor.UML.event import AssociationChangeEvent
+        
+        class A(Element):
+            is_unlinked = False
+            def unlink(self):
+                self.is_unlinked = True
+                Element.unlink(self)
+
+        A.a = association('a', A, upper=1)
+
+        class B(A):
+            pass
+
+        B.b = redefine(B, 'b', A, A.a)
+        
+        events = []
+        @component.adapter(AssociationChangeEvent)
+        def handler(event, events=events):
+            events.append(event)
+
+        Application.register_handler(handler)
+        try:
+            a = A()
+            a.a = A()
+            # Only a.a changes, no B class involved
+            assert len(events) == 1
+            assert events[0].property is A.a, events[0].property
+            #assert events[1].property is A.a.original, events[1].property
+            del events[:]
+
+            a = B()
+            a.a = A()
+            # Now events are sent for both association and redefine
+            assert len(events) == 2
+            assert events[0].property is B.b, events[0].property
+            assert events[1].property is B.b.original, events[1].property
+        finally:
+            Application.unregister_handler(handler)
+
-
-if __name__ == '__main__':

gaphor/trunk/utils/command/gen_uml.py

@@ -235 +235 @@
-        """
-        self.write_property("%s.%s" % (r.class_name, r.name),
-'%s', %s, %s)" % (
+%s, '%s', %s, %s)" % (r.class_name, 
-
-