[Openamf-cvs] openamf/src/java/org/openamf/util OpenAMFUtils.java,1.12,1.13

[<jca...@us...>]

Update of /cvsroot/openamf/openamf/src/java/org/openamf/util
In directory sc8-pr-cvs1:/tmp/cvs-serv3985/src/java/org/openamf/util

Modified Files:
	OpenAMFUtils.java 
Log Message:
removed org.openamf.ASObject we are just using flashgateway.io.ASObject now

Index: OpenAMFUtils.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/util/OpenAMFUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OpenAMFUtils.java	20 Aug 2003 02:11:37 -0000	1.12
--- OpenAMFUtils.java	20 Aug 2003 22:30:18 -0000	1.13
***************
*** 14,18 ****
  import org.apache.commons.logging.LogFactory;
  import org.openamf.AMFMessage;
- import org.openamf.ASObject;
  
  import com.carbonfive.flash.decoder.ActionScriptDecoder;
--- 14,17 ----
***************
*** 20,23 ****
--- 19,24 ----
  import com.carbonfive.flash.decoder.DecoderFactory;
  
+ import flashgateway.io.ASObject;
+ 
  /**
   * @author Jason Calabrese <ja...@mi...>
***************
*** 33,38 ****
  	}
  
! 	public static Object decodeParameter(Object parameter, Class parameterType) {
! 		log.debug("Decoding parameter: " + parameter + " to type: " + parameterType);
  		if (parameter == null) {
  			try {
--- 34,42 ----
  	}
  
! 	public static Object decodeParameter(
! 		Object parameter,
! 		Class parameterType) {
! 		log.debug(
! 			"Decoding parameter: " + parameter + " to type: " + parameterType);
  		if (parameter == null) {
  			try {
***************
*** 42,54 ****
  			}
  		}
! 		if (parameterType.equals(java.sql.Date.class) && parameter instanceof java.util.Date) {
  			java.util.Date date = (java.util.Date) parameter;
  			java.sql.Date sqlDate = new java.sql.Date(date.getTime());
  			return sqlDate;
  		}
!     if (flashgateway.io.ASObject.class.isAssignableFrom(parameterType) && parameter instanceof flashgateway.io.ASObject) {
!       log.debug("Desired parameter type is an ASObject, returning parameter without decoding");
!       return parameter;
!     }
  
  		boolean setType = false;
--- 46,61 ----
  			}
  		}
! 		if (parameterType.equals(java.sql.Date.class)
! 			&& parameter instanceof java.util.Date) {
  			java.util.Date date = (java.util.Date) parameter;
  			java.sql.Date sqlDate = new java.sql.Date(date.getTime());
  			return sqlDate;
  		}
! 		if (ASObject.class.isAssignableFrom(parameterType)
! 			&& parameter instanceof ASObject) {
! 			log.debug(
! 				"Desired parameter type is an ASObject, returning parameter without decoding");
! 			return parameter;
! 		}
  
  		boolean setType = false;
***************
*** 56,60 ****
  		if (parameter instanceof ASObject
  			&& ((ASObject) parameter).getType() == null) {
! 			if (parameterType.equals(HashMap.class) || parameterType.equals(Map.class)) {
  				//don't set type
  			} else {
--- 63,68 ----
  		if (parameter instanceof ASObject
  			&& ((ASObject) parameter).getType() == null) {
! 			if (parameterType.equals(HashMap.class)
! 				|| parameterType.equals(Map.class)) {
  				//don't set type
  			} else {
***************
*** 64,69 ****
  		}
  
! 		ActionScriptDecoder decoder = decoderFactory.getDecoder(parameter, parameterType);
! 		log.debug("decoder: " + ((CachingDecoder)decoder).getNextDecoder().getClass().getName());
  		Object decodedObject = decoder.decodeObject(parameter, parameterType);
  
--- 72,83 ----
  		}
  
! 		ActionScriptDecoder decoder =
! 			decoderFactory.getDecoder(parameter, parameterType);
! 		log.debug(
! 			"decoder: "
! 				+ ((CachingDecoder) decoder)
! 					.getNextDecoder()
! 					.getClass()
! 					.getName());
  		Object decodedObject = decoder.decodeObject(parameter, parameterType);
  
***************
*** 78,82 ****
  	}
  
- 
  	public static boolean typesMatch(Class parameterType, Object parameter) {
  		log.debug("expected class: " + parameterType.getName());
--- 92,95 ----
***************
*** 117,132 ****
  		return typesMatch;
  	}
! 	
!     /**
!      * Logs message in debug level
!      *
!      * @param message
!      */
!     public static void logMessage(String type, AMFMessage message) {
  		if (log.isDebugEnabled()) {
!             log.debug("Dump " + type + " message:");
!             log.debug(message);
  		}
  	}
  }
- 
--- 130,144 ----
  		return typesMatch;
  	}
! 
! 	/**
! 	 * Logs message in debug level
! 	 *
! 	 * @param message
! 	 */
! 	public static void logMessage(String type, AMFMessage message) {
  		if (log.isDebugEnabled()) {
! 			log.debug("Dump " + type + " message:");
! 			log.debug(message);
  		}
  	}
  }