--- a/graphics/SFC_Objects.py	Fri Jul 10 11:41:07 2009 +0200
+++ b/graphics/SFC_Objects.py	Thu Jul 23 17:50:26 2009 +0200
@@ -913,7 +913,7 @@
         if infos[0] == "priority" and start[0] == 0 and start[1] == 0:
             self.Errors[infos[0]] = (start[1], end[1])
         elif infos[0] == "inline":
-            if infos[0] not in self.Errors:
+            if not self.Errors.has_key(infos[0]):
                 self.Errors[infos[0]] = []
             self.Errors[infos[0]].append((start[1], end[1]))
         else:
@@ -965,9 +965,9 @@
         self.Output.Draw(dc)
         if self.Type == "connection":
             self.Condition.Draw(dc)
-        if "priority" in self.Errors:
+        if self.Errors.has_key("priority"):
             HighlightErrorZone(dc, priority_pos[0], priority_pos[1], priority_size[0], priority_size[1])
-        if "inline" in self.Errors:
+        if self.Errors.has_key("inline"):
             for start, end in self.Errors["inline"]:
                 offset = dc.GetTextExtent(self.Condition[:start])
                 size = dc.GetTextExtent(self.Condition[start:end + 1])
@@ -1681,7 +1681,7 @@
         # Draw input connector
         if self.Input:
             self.Input.Draw(dc)
-        if "target" in self.Errors:
+        if self.Errors.has_key("target"):
             HighlightErrorZone(dc, target_pos[0], target_pos[1], target_size[0], target_size[1])
         
 
@@ -1807,14 +1807,14 @@
             width, height = self.Parent.GetTextExtent(action["qualifier"])
             self.ColSize[0] = max(self.ColSize[0], width + 10)
             row_height = height
-            if "duration" in action:
+            if action.has_key("duration"):
                 width, height = self.Parent.GetTextExtent(action["duration"])
                 row_height = max(row_height, height)
                 self.ColSize[0] = max(self.ColSize[0], width + 10)
             width, height = self.Parent.GetTextExtent(action["value"])
             row_height = max(row_height, height)
             self.ColSize[1] = max(self.ColSize[1], width + 10)
-            if "indicator" in action and action["indicator"] != "":
+            if action.get("indicator", "") != "":
                 width, height = self.Parent.GetTextExtent(action["indicator"])
                 row_height = max(row_height, height)
                 self.ColSize[2] = max(self.ColSize[2], width + 10)
@@ -1882,10 +1882,10 @@
     
     def AddError(self, infos, start, end):
         if infos[0] == "action" and infos[1] < len(self.Actions):
-            if infos[1] not in self.Errors:
+            if not self.Errors.has_key(infos[1]):
                 self.Errors[infos[1]] = {}
             if infos[2] == "inline":
-                if infos[2] not in self.Errors[infos[1]]:
+                if not self.Errors[infos[1]].has_key(infos[2]):
                     self.Errors[infos[1]][infos[2]] = []
                 self.Errors[infos[1]][infos[2]].append((start[1], end[1]))
             else:
@@ -1912,7 +1912,7 @@
                 dc.DrawLine(self.Pos.x, self.Pos.y + i * line_size, 
                     self.Pos.x + self.Size[0], self.Pos.y + i * line_size)
             qualifier_size = dc.GetTextExtent(action["qualifier"])
-            if "duration" in action:
+            if action.has_key("duration"):
                 qualifier_pos = (self.Pos.x + (colsize[0] - qualifier_size[0]) / 2,
                                  self.Pos.y + i * line_size + line_size / 2 - qualifier_size[1])
                 duration_size = dc.GetTextExtent(action["duration"])
@@ -1927,24 +1927,24 @@
             content_pos = (self.Pos.x + colsize[0] + (colsize[1] - content_size[0]) / 2,
                            self.Pos.y + i * line_size + (line_size - content_size[1]) / 2)
             dc.DrawText(action["value"], content_pos[0], content_pos[1])
-            if "indicator" in action:
+            if action.has_key("indicator"):
                 indicator_size = dc.GetTextExtent(action["indicator"])
                 indicator_pos = (self.Pos.x + colsize[0] + colsize[1] + (colsize[2] - indicator_size[0]) / 2,
                                  self.Pos.y + i * line_size + (line_size - indicator_size[1]) / 2)
                 dc.DrawText(action["indicator"], indicator_pos[0], indicator_pos[1])
             if i in self.Errors:
-                if "duration" in self.Errors[i] and "duration" in action:
+                if self.Errors[i].has_key("duration") and action.has_key("duration"):
                     HighlightErrorZone(dc, duration_pos[0], duration_pos[1], duration_size[0], duration_size[1])
-                if "qualifier" in self.Errors[i]:
+                if self.Errors[i].has_key("qualifier"):
                     HighlightErrorZone(dc, qualifier_pos[0], qualifier_pos[1], qualifier_size[0], qualifier_size[1])
-                if "reference" in self.Errors[i]:
+                if self.Errors[i].has_key("reference"):
                     HighlightErrorZone(dc, content_pos[0], content_pos[1], content_size[0], content_size[1])
-                elif "inline" in self.Errors[i]:
+                elif self.Errors[i].has_key("inline"):
                     for start, end in self.Errors[i]["inline"]:
                         offset = dc.GetTextExtent(action["value"][:start])
                         size = dc.GetTextExtent(action["value"][start:end + 1])
                         HighlightErrorZone(dc, content_pos[0] + offset[0], content_pos[1], size[0], size[1])
-                if "indicator" in self.Errors[i]:
+                if self.Errors[i].has_key("indicator"):
                     HighlightErrorZone(dc, indicator_pos[0], indicator_pos[1], indicator_size[0], indicator_size[1])
         # Draw input connector
         self.Input.Draw(dc)