[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXEnterpriseObject.java,1.3,1.4 ERXGenericRecord.java,1.71,1.72 ERXCustomObject.java,1.9,1.10

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22833/Common/Frameworks/ERExtensions/Sources/er/extensions

Modified Files:
	ERXEnterpriseObject.java ERXGenericRecord.java 
	ERXCustomObject.java 
Log Message:
added hack for isDeletedEO

Index: ERXEnterpriseObject.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEnterpriseObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ERXEnterpriseObject.java	20 Feb 2006 06:45:15 -0000	1.3
--- ERXEnterpriseObject.java	23 Feb 2006 12:59:04 -0000	1.4
***************
*** 331,340 ****
       * Determines if this object is a deleted object by
       * checking to see if it is included in the deletedObjects
!      * array of the editing context or if it's editing context
!      * is null.<br/>
!      * <br/>
!      * Note: after you call <code>saveChanges()</code>, committing the
!      * delete, this method will return false because the object
!      * will no longer be registered in an editing context.
       * @return if the object is a deleted object
       */
--- 331,336 ----
       * Determines if this object is a deleted object by
       * checking to see if it is included in the deletedObjects
!      * array of the editing context or - if it's editing context
!      * is null - it already has a global id. 
       * @return if the object is a deleted object
       */

Index: ERXGenericRecord.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXGenericRecord.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ERXGenericRecord.java	15 Sep 2005 13:16:39 -0000	1.71
--- ERXGenericRecord.java	23 Feb 2006 12:59:06 -0000	1.72
***************
*** 522,528 ****
       */
      public boolean isDeletedEO() {
!         if (log.isDebugEnabled())
              log.debug("editingContext() = " + editingContext() + " this object: " + this);
!         boolean isDeleted = editingContext() == null;
          return isDeleted || (editingContext() != null && editingContext().deletedObjects().containsObject(this));
      }
--- 522,531 ----
       */
      public boolean isDeletedEO() {
!         if (log.isDebugEnabled()) {
              log.debug("editingContext() = " + editingContext() + " this object: " + this);
!         }
!         // HACK AK: using private API here
!         EOGlobalID gid = __globalID();
!         boolean isDeleted = (editingContext() == null && (gid != null && !gid.isTemporary()));
          return isDeleted || (editingContext() != null && editingContext().deletedObjects().containsObject(this));
      }

Index: ERXCustomObject.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXCustomObject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ERXCustomObject.java	14 Sep 2005 15:49:46 -0000	1.9
--- ERXCustomObject.java	23 Feb 2006 12:59:06 -0000	1.10
***************
*** 522,530 ****
       * @see er.extensions.ERXEnterpriseObject#isDeletedEO()
       */
-     // CHECKME: Might be able to tell better by checking EOGlobalIDs
      public boolean isDeletedEO() {
!         if (log.isDebugEnabled())
              log.debug("editingContext() = " + editingContext() + " this object: " + this);
!         return editingContext() != null && editingContext().deletedObjects().containsObject(this);
      }
  
--- 522,533 ----
       * @see er.extensions.ERXEnterpriseObject#isDeletedEO()
       */
      public boolean isDeletedEO() {
!         if (log.isDebugEnabled()) {
              log.debug("editingContext() = " + editingContext() + " this object: " + this);
!         }
!         // HACK AK: using private API here
!         EOGlobalID gid = __globalID();
!         boolean isDeleted = (editingContext() == null && (gid != null && !gid.isTemporary()));
!         return isDeleted || (editingContext() != null && editingContext().deletedObjects().containsObject(this));
      }