[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXGenericRecord.jav

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	ERXGenericRecord.java 
Log Message:
1.5'd up a bit

Index: ERXGenericRecord.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXGenericRecord.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** ERXGenericRecord.java	28 Sep 2007 21:35:44 -0000	1.99
--- ERXGenericRecord.java	27 Nov 2007 19:59:10 -0000	1.100
***************
*** 61,65 ****
  
      /** holds all subclass related Logger's */
!     private static NSMutableDictionary classLogs = new NSMutableDictionary();
  
      public static boolean shouldTrimSpaces(){
--- 61,65 ----
  
      /** holds all subclass related Logger's */
!     private static NSMutableDictionary<Class, Logger> classLogs = new NSMutableDictionary<Class, Logger>();
  
      public static boolean shouldTrimSpaces(){
***************
*** 85,88 ****
--- 85,89 ----
  		}
  		
+ 		@Override
  		public Object valueInObject(Object object) {
  			ERXGenericRecord eo = (ERXGenericRecord) object;
***************
*** 107,110 ****
--- 108,112 ----
  		}
  
+ 		@Override
  		public void setValueInObject(Object value, Object object) {
  			ERXGenericRecord eo = (ERXGenericRecord) object;
***************
*** 114,117 ****
--- 116,120 ----
  	}
  
+ 	@Override
  	public NSKeyValueCoding._KeyBinding _otherStorageBinding(String key) {
  		NSKeyValueCoding._KeyBinding result;
***************
*** 258,262 ****
      }
      
!     public Object willReadRelationship(Object aObject) {
          boolean old = updateInverseRelationships(false);
          try {
--- 261,266 ----
      }
      
!     @Override
! 	public Object willReadRelationship(Object aObject) {
          boolean old = updateInverseRelationships(false);
          try {
***************
*** 375,379 ****
       *		correct type of delegate set.
       */
!     public void awakeFromClientUpdate(EOEditingContext editingContext) {
          _checkEditingContextDelegate(editingContext);
          super.awakeFromClientUpdate(editingContext);
--- 379,384 ----
       *		correct type of delegate set.
       */
!     @Override
! 	public void awakeFromClientUpdate(EOEditingContext editingContext) {
          _checkEditingContextDelegate(editingContext);
          super.awakeFromClientUpdate(editingContext);
***************
*** 387,391 ****
       *		correct type of delegate set.
       */
!     public void awakeFromInsertion(EOEditingContext editingContext) {
      	boolean old = updateInverseRelationships(false);
      	try {
--- 392,397 ----
       *		correct type of delegate set.
       */
!     @Override
! 	public void awakeFromInsertion(EOEditingContext editingContext) {
      	boolean old = updateInverseRelationships(false);
      	try {
***************
*** 416,420 ****
      }
  
!     public void clearProperties() {
      	boolean old = updateInverseRelationships(false);
      	try {
--- 422,427 ----
      }
  
!     @Override
! 	public void clearProperties() {
      	boolean old = updateInverseRelationships(false);
      	try {
***************
*** 424,428 ****
      	}
      }
! 
  	/**
       * used for initialization stuff instead of awakeFromInsertion.
--- 431,435 ----
      	}
      }
!     
  	/**
       * used for initialization stuff instead of awakeFromInsertion.
***************
*** 446,450 ****
       *		correct type of delegate set.
       */
!     public void awakeFromFetch(EOEditingContext editingContext) {
      	boolean old = updateInverseRelationships(false);
      	try {
--- 453,458 ----
       *		correct type of delegate set.
       */
!     @Override
! 	public void awakeFromFetch(EOEditingContext editingContext) {
      	boolean old = updateInverseRelationships(false);
      	try {
***************
*** 463,467 ****
       * @param key relationship to add the object to.
       */
!     public void addObjectToBothSidesOfRelationshipWithKey(EORelationshipManipulation eo, String key) {
          if (eo!=null &&
              ((EOEnterpriseObject)eo).editingContext()!=editingContext() &&
--- 471,476 ----
       * @param key relationship to add the object to.
       */
!     @Override
! 	public void addObjectToBothSidesOfRelationshipWithKey(EORelationshipManipulation eo, String key) {
          if (eo!=null &&
              ((EOEnterpriseObject)eo).editingContext()!=editingContext() &&
***************
*** 535,540 ****
       * @see er.extensions.ERXEnterpriseObject#primaryKeyAttributeNames()
       */
!     public NSArray primaryKeyAttributeNames() {
!         return entity().primaryKeyAttributeNames();
      }
  
--- 544,550 ----
       * @see er.extensions.ERXEnterpriseObject#primaryKeyAttributeNames()
       */
!     @SuppressWarnings("unchecked")
! 	public NSArray<String> primaryKeyAttributeNames() {
!         return (NSArray<String>)entity().primaryKeyAttributeNames();
      }
  
***************
*** 572,576 ****
       */
      // FIXME: this method is really misnamed; it should be called rawPrimaryKeyDictionary
!     public NSDictionary primaryKeyDictionary(boolean inTransaction) {
          if(_primaryKeyDictionary == null) {
              if (!inTransaction) {
--- 582,587 ----
       */
      // FIXME: this method is really misnamed; it should be called rawPrimaryKeyDictionary
!     @SuppressWarnings("unchecked")
! 	public NSDictionary<String, Object> primaryKeyDictionary(boolean inTransaction) {
          if(_primaryKeyDictionary == null) {
              if (!inTransaction) {
***************
*** 578,583 ****
                  if (rawPK != null) {
                      if (log.isDebugEnabled()) log.debug("Got raw key: "+ rawPK);
!                     NSArray primaryKeyAttributeNames=primaryKeyAttributeNames();
!                     _primaryKeyDictionary = new NSDictionary(rawPK instanceof NSArray ? (NSArray)rawPK : new NSArray(rawPK), primaryKeyAttributeNames);
                  } else {
                      if (log.isDebugEnabled()) log.debug("No raw key, trying single key");
--- 589,594 ----
                  if (rawPK != null) {
                      if (log.isDebugEnabled()) log.debug("Got raw key: "+ rawPK);
!                     NSArray<String> primaryKeyAttributeNames = primaryKeyAttributeNames();
!                     _primaryKeyDictionary = new NSDictionary<NSArray<String>, NSArray<Object>>(rawPK instanceof NSArray ? (NSArray<Object>)rawPK : new NSArray<Object>(rawPK), primaryKeyAttributeNames);
                  } else {
                      if (log.isDebugEnabled()) log.debug("No raw key, trying single key");
***************
*** 631,635 ****
       * @see er.extensions.ERXEnterpriseObject#localInstancesOf(com.webobjects.foundation.NSArray)
       */
!     public NSArray localInstancesOf(NSArray eos) {
          return ERXEOControlUtilities.localInstancesOfObjects(editingContext(), eos);
      }
--- 642,647 ----
       * @see er.extensions.ERXEnterpriseObject#localInstancesOf(com.webobjects.foundation.NSArray)
       */
!     @SuppressWarnings("unchecked")
! 	public NSArray localInstancesOf(NSArray eos) {
          return ERXEOControlUtilities.localInstancesOfObjects(editingContext(), eos);
      }
***************
*** 685,689 ****
                  }
                  else if ( generateIfMissing ) {
!                     final NSDictionary primaryKeyDictionary = primaryKeyDictionary(false);
                      final Object[] values;
  
--- 697,701 ----
                  }
                  else if ( generateIfMissing ) {
!                     final NSDictionary<String, Object> primaryKeyDictionary = primaryKeyDictionary(false);
                      final Object[] values;
  
***************
*** 692,696 ****
                      }
                      else {
!                         final NSArray sortedKeys = ERXDictionaryUtilities.stringKeysSortedAscending(primaryKeyDictionary);
  
                          values = primaryKeyDictionary.objectsForKeys(sortedKeys, null).objects();
--- 704,708 ----
                      }
                      else {
!                         final NSArray<String> sortedKeys = ERXDictionaryUtilities.stringKeysSortedAscending(primaryKeyDictionary);
  
                          values = primaryKeyDictionary.objectsForKeys(sortedKeys, null).objects();
***************
*** 727,731 ****
       *		object.
       */
!     public String toString() {
          String pk = primaryKey();
          pk = (pk == null) ? "null" : pk;
--- 739,744 ----
       *		object.
       */
!     @Override
! 	public String toString() {
          String pk = primaryKey();
          pk = (pk == null) ? "null" : pk;
***************
*** 765,769 ****
          * @deprecated use {@link ERXGenericRecord#isNewObject}
       */
!     public boolean isNewEO() {
          return isNewObject();
      }
--- 778,783 ----
          * @deprecated use {@link ERXGenericRecord#isNewObject}
       */
!     @SuppressWarnings("dep-ann")
! 	public boolean isNewEO() {
          return isNewObject();
      }
***************
*** 804,808 ****
       * @return the validated value
       */
!     public Object validateValueForKey(Object value, String key) throws NSValidation.ValidationException {
          if (validation.isDebugEnabled())
              validation.debug("ValidateValueForKey on eo: " + this + " value: " + value + " key: " + key);
--- 818,823 ----
       * @return the validated value
       */
!     @Override
! 	public Object validateValueForKey(Object value, String key) throws NSValidation.ValidationException {
          if (validation.isDebugEnabled())
              validation.debug("ValidateValueForKey on eo: " + this + " value: " + value + " key: " + key);
***************
*** 816,819 ****
--- 831,835 ----
                  ((ERXEntityClassDescription)cd).validateObjectWithUserInfo(this, value, "validateForKey." + key, key);
              }
+             value = _validateValueForKey(value, key);
          } catch (ERXValidationException e) {
              throw e;
***************
*** 833,836 ****
--- 849,856 ----
      }
  
+ 	protected Object _validateValueForKey(Object value, String key) throws NSValidation.ValidationException {
+ 		return value;
+ 	}
+ 
      /**
       * This method performs a few checks before invoking
***************
*** 841,845 ****
       *		pass validation for saving to the database.
       */
!     public void validateForSave( )  throws NSValidation.ValidationException {
          // This condition shouldn't ever happen, but it does ;)
          // CHECKME: This was a 4.5 issue, not sure if this one has been fixed yet.
--- 861,866 ----
       *		pass validation for saving to the database.
       */
!     @Override
! 	public void validateForSave( )  throws NSValidation.ValidationException {
          // This condition shouldn't ever happen, but it does ;)
          // CHECKME: This was a 4.5 issue, not sure if this one has been fixed yet.
***************
*** 860,864 ****
       *		pass validation for saving to the database.
       */
!     public void validateForInsert() throws NSValidation.ValidationException {
          EOClassDescription cd = classDescription();
          if(cd instanceof ERXEntityClassDescription) {
--- 881,886 ----
       *		pass validation for saving to the database.
       */
!     @Override
! 	public void validateForInsert() throws NSValidation.ValidationException {
          EOClassDescription cd = classDescription();
          if(cd instanceof ERXEntityClassDescription) {
***************
*** 873,877 ****
       *		pass validation for saving to the database.
       */
!     public void validateForUpdate() throws NSValidation.ValidationException {
          EOClassDescription cd = classDescription();
          if(cd instanceof ERXEntityClassDescription) {
--- 895,900 ----
       *		pass validation for saving to the database.
       */
!     @Override
! 	public void validateForUpdate() throws NSValidation.ValidationException {
          EOClassDescription cd = classDescription();
          if(cd instanceof ERXEntityClassDescription) {
***************
*** 896,900 ****
       * Overridden to support two-way relationship setting.
       */
!     protected void includeObjectIntoPropertyWithKey(Object o, String key) {
      	super.includeObjectIntoPropertyWithKey(o, key);
      	if(ERXEnterpriseObject.updateInverseRelationships && o != null) {
--- 919,924 ----
       * Overridden to support two-way relationship setting.
       */
!     @Override
! 	protected void includeObjectIntoPropertyWithKey(Object o, String key) {
      	super.includeObjectIntoPropertyWithKey(o, key);
      	if(ERXEnterpriseObject.updateInverseRelationships && o != null) {
***************
*** 921,925 ****
       * Overridden to support two-way relationship setting.
       */
!     protected void excludeObjectFromPropertyWithKey(Object o, String key) {
         	super.excludeObjectFromPropertyWithKey(o, key);
      	if(ERXEnterpriseObject.updateInverseRelationships && o != null) {
--- 945,950 ----
       * Overridden to support two-way relationship setting.
       */
!     @Override
! 	protected void excludeObjectFromPropertyWithKey(Object o, String key) {
         	super.excludeObjectFromPropertyWithKey(o, key);
      	if(ERXEnterpriseObject.updateInverseRelationships && o != null) {
***************
*** 944,948 ****
       * Overridden to support two-way relationship setting.
       */
!     public void takeStoredValueForKey(Object object, String key) {
      	// we only handle toOne keys here, but there is no API for that so
      	// this unreadable monster first checks the fastest thing, the the slower conditions
--- 969,974 ----
       * Overridden to support two-way relationship setting.
       */
!     @Override
! 	public void takeStoredValueForKey(Object object, String key) {
      	// we only handle toOne keys here, but there is no API for that so
      	// this unreadable monster first checks the fastest thing, the the slower conditions
***************
*** 1017,1020 ****
       
       */
-     
  }
--- 1043,1045 ----

[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXGenericRecord.jav

[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXGenericRecord.java, 1.99, 1.100