Changeset 2218

Timestamp:

02/15/08 05:56:45 (3 months ago)

Author:

arj..@yirdis.nl

Message:

• use event blocker when loading model.
  
• diagram items trigger on ModelFactoryEvent
  

Files:

• gaphor/trunk/gaphor/UML/interfaces.py (modified) (1 diff)
• gaphor/trunk/gaphor/adapters/connectors.py (modified) (1 diff)
• gaphor/trunk/gaphor/diagram/diagramitem.py (modified) (2 diffs)
• gaphor/trunk/gaphor/storage/storage.py (modified) (6 diffs)
• gaphor/trunk/gaphor/ui/namespace.py (modified) (1 diff)

gaphor/trunk/gaphor/UML/interfaces.py

@@ -23 +23 @@
-
-class IElementChangeEvent(IElementEvent):
-
+
+
-    """
-    property = interface.Attribute("The property that changed")

gaphor/trunk/gaphor/adapters/connectors.py

@@ -296 +296 @@
-            if isinstance(opposite.connected_to.subject, UML.Comment):
-                del opposite.connected_to.subject.annotatedElement[handle.connected_to.subject]
-se
+if opposite.connected_to.subject
-                del handle.connected_to.subject.annotatedElement[opposite.connected_to.subject]
-        super(CommentLineElementConnect, self).disconnect(handle)

gaphor/trunk/gaphor/diagram/diagramitem.py

@@ -259 +259 @@
-
-    def register_handlers(self):
+        Application.register_handler(self.on_model_factory_event)
-        Application.register_handler(self.on_element_change)
-        Application.register_handler(self.on_presentation_subject)
@@ -267 +268 @@
-
-    def unregister_handlers(self):
+        Application.unregister_handler(self.on_model_factory_event)
-        Application.unregister_handler(self.on_presentation_subject)
-        Application.unregister_handler(self.on_element_change)
+
+
+    @component.adapter(UML.interfaces.IModelFactoryEvent)
+    def on_model_factory_event(self, event):
+        self.on_presentation_subject(None)
-
-

gaphor/trunk/gaphor/storage/storage.py

@@ -22 +22 @@
-
-from gaphor import UML
+from gaphor.UML.elementfactory import ElementChangedEventBlocker
-from gaphor import diagram
-from gaphor.storage import parser
@@ -180 +181 @@
-    def update_status_queue(_n=[0]):
-        n = _n[0] = _n[0] + 1
-1
+3
-            return (n * 100) / size
-
@@ -195 +196 @@
-    # The elements are stored as attribute 'element' on the parser objects:
-    for id, elem in elements.items():
-
+
+
-        if isinstance(elem, parser.element):
-            cls = getattr(UML, elem.type)
@@ -215 +217 @@
-    # load attributes and create references:
-    for id, elem in elements.items():
-
+
+
-        # Ensure that all elements have their element instance ready...
-        assert hasattr(elem, 'element')
@@ -286 +289 @@
-    # do a postload:
-    for id, elem in elements.items():
-
+
+
-        elem.element.postload()
-
@@ -336 +340 @@
-        gc.collect()
-        log.info("Read %d elements from file" % len(elements))
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        gc.collect()
-        yield 100

gaphor/trunk/gaphor/ui/namespace.py

@@ -362 +362 @@
-            index = parent.index(node)
-            return parent[index + 1]
-IndexError
+(IndexError, ValueError)
-            return None
-