[Modeling-cvs] ProjectModeling/Modeling TODO,1.13,1.14 CHANGES,1.126,1.127 EditingContext.py,1.29,1.
Status: Abandoned
Brought to you by:
sbigaret
|
From: <sbi...@us...> - 2003-07-18 14:30:49
|
Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv21897
Modified Files:
TODO CHANGES EditingContext.py
Log Message:
Fixed bug #772997: deleted then re-insert objects not correctly handled.
Index: TODO
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/TODO,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TODO 28 Jun 2003 15:45:26 -0000 1.13
--- TODO 18 Jul 2003 14:30:45 -0000 1.14
***************
*** 160,163 ****
--- 160,167 ----
memory footprint low.
+ EditingContext.insertObject(): cf. comment when reinserting a previously
+ deleted object: if we had our own snapshoting in EC we could decide
+ whether an re-inserted object should be marked as updated or not.
+
* CustomObject & observability: the implementation requires that willRead()
and willChange() are called, when appropriate. This should be
Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/CHANGES,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** CHANGES 18 Jul 2003 13:37:26 -0000 1.126
--- CHANGES 18 Jul 2003 14:30:45 -0000 1.127
***************
*** 8,11 ****
--- 8,13 ----
--------------------------------------------------------
+ * Fixed bug #772997: deleted then re-insert objects not correctly handled.
+
* Added the ability to fetch raw rows (dictionaries instead of fully
intialized objects) --see FetchSpecification.setFetchesRawRows() and
Index: EditingContext.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/EditingContext.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** EditingContext.py 18 Jul 2003 13:43:39 -0000 1.29
--- EditingContext.py 18 Jul 2003 14:30:45 -0000 1.30
***************
*** 906,912 ****
else:
raise ValueError, 'Object already registered'
! if gID in self._pendingDeletedObjects:
! self._pendingDeletedObjects.remove(gID)
! self._pendingInsertedObjects.append(gID)
insert=insertObject
--- 906,918 ----
else:
raise ValueError, 'Object already registered'
! else: # cancel the deletion
! if gID in self._pendingDeletedObjects:
! self._pendingDeletedObjects.remove(gID)
! if gID in self._deletedObjects:
! self._deletedObjects.remove(gID)
! # Mark it as updated, because we here have no way to know whether
! # it was updated or not before it was deleted, or even between its
! # deletion and the cancellation of its deletion!
! self._pendingUpdatedObjects.append(gID)
insert=insertObject
|