- transition and control flow guards fixes on disconnection (but does…

… not work properly yet)
amolenaar · Mar 2, 2010 · f06acd8 · f06acd8
1 parent ef558ba
commit f06acd8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/gaphor/adapters/propertypages.py b/gaphor/adapters/propertypages.py
@@ -1337,7 +1337,8 @@ def construct(self):
 
         def handler(event):
             entry.handler_block(changed_id)
-            entry.set_text(event.new_value)
+            v = event.new_value
+            entry.set_text(v if v else '')
             entry.handler_unblock(changed_id)
 
         self.watcher.watch('guard<LiteralSpecification>.value', handler).register_handlers()

diff --git a/gaphor/adapters/states/propertypages.py b/gaphor/adapters/states/propertypages.py
@@ -39,7 +39,8 @@ def construct(self):
 
         def handler(event):
             entry.handler_block(changed_id)
-            entry.set_text(event.new_value)
+            v = event.new_value
+            entry.set_text(v if v else '')
             entry.handler_unblock(changed_id)
 
         self.watcher.watch('guard<Constraint>.specification<LiteralSpecification>.value', handler).register_handlers()

diff --git a/gaphor/adapters/states/vertexconnect.py b/gaphor/adapters/states/vertexconnect.py
@@ -22,6 +22,9 @@ def connect_subject(self, handle):
                     ('source', 'outgoing'),
                     ('target', 'incoming'))
         self.line.subject = relation
+        if relation.guard is None:
+            relation.guard = self.element_factory.create(UML.Constraint)
+            relation.guard.specification = self.element_factory.create(UML.LiteralSpecification)
 
 
 

diff --git a/gaphor/diagram/actions/flow.py b/gaphor/diagram/actions/flow.py
@@ -46,13 +46,9 @@ def postload(self):
 
 
     def on_control_flow_guard(self, event):
-        log.debug('Flow guard about to change %s, %s' % (self.subject, event))
-        try:
-            self._guard.text = self.subject.guard.value
-            log.debug('Flow %s guard set to %s' % (self.subject, self._guard.text))
-        except AttributeError, e:
-            log.error('Error while updating flow guard', e)
-            self._guard.text = ''
+        subject = self.subject
+        self._guard.text = subject.guard.value if subject and subject.guard else ''
+        log.debug('Flow %s guard set to %s' % (self.subject, self._guard.text))
         self.request_update()
 
 

diff --git a/gaphor/diagram/states/transition.py b/gaphor/diagram/states/transition.py
@@ -39,11 +39,6 @@ def postload(self):
 
 
     def on_guard(self, event):
-        subject = self.subject
-        if subject.guard is None:
-            subject.guard = self.element_factory.create(UML.Constraint)
-            subject.guard.specification = self.element_factory.create(UML.LiteralSpecification)
-
         try:
             self._guard.text = self.subject.guard.specification.value or ''
         except AttributeError: