[Commits] (pavlov) Making it so that excluding an item will also remove it from the include list if it is there

[commits at osafoundation.org]

Commit by: pavlov
Modified files:
chandler/parcels/osaf/contentmodel/ItemCollection.py 1.1 1.2

Log message:
Making it so that excluding an item will also remove it from the include list if it is there


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ItemCollection.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: chandler/parcels/osaf/contentmodel/ItemCollection.py
diff -u chandler/parcels/osaf/contentmodel/ItemCollection.py:1.1 chandler/parcels/osaf/contentmodel/ItemCollection.py:1.2
--- chandler/parcels/osaf/contentmodel/ItemCollection.py:1.1	Thu Jun 17 14:00:15 2004
+++ chandler/parcels/osaf/contentmodel/ItemCollection.py	Thu Jun 17 14:03:28 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.1 $"
-__date__      = "$Date: 2004/06/17 21:00:15 $"
+__revision__  = "$Revision: 1.2 $"
+__date__      = "$Date: 2004/06/17 21:03:28 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -84,6 +84,11 @@
         uuid = item.itsUUID
         self.exclusions.append(uuid)
 
+        # if the item we're excluded was already included, remove it
+        # from that list
+        if uuid in self.inclusions:
+            self.inclusions.remove(uuid)
+
         if uuid in self.results:
             self.results.remove(uuid)
             self.__dirty()