openamf/src/java/org/openamf/util OpenAMFUtils.java,1.18,1.19

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

Modified Files:
	OpenAMFUtils.java 
Log Message:
updated the decodeParameter method.
This class is now dependent upon ASTranslator version 1.5.5 or later


Index: OpenAMFUtils.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/util/OpenAMFUtils.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** OpenAMFUtils.java	13 Jan 2004 07:07:19 -0000	1.18
--- OpenAMFUtils.java	15 Jan 2004 20:20:48 -0000	1.19
***************
*** 8,18 ****
  package org.openamf.util;
  
- import java.util.HashMap;
- import java.util.Map;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  import com.carbonfive.flash.ASTranslator;
  
  import flashgateway.io.ASObject;
--- 8,16 ----
  package org.openamf.util;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  import com.carbonfive.flash.ASTranslator;
+ import com.carbonfive.flash.ASTranslatorFactory;
  
  import flashgateway.io.ASObject;
***************
*** 20,25 ****
--- 18,26 ----
  /**
   * @author Jason Calabrese <[email protected]>
+  * @author Sean C. Sullivan
+  * 
   * @see XMLUtils
   * @version $Revision$, $Date$
+  * 
   */
  public final class OpenAMFUtils {
***************
*** 42,66 ****
  		}
  		
- 		if (ASObject.class.isAssignableFrom(parameterType)
- 			&& parameter instanceof ASObject) {
- 			log.debug(
- 				"Desired parameter type is an ASObject, returning parameter without decoding");
- 			return parameter;
- 		}
- 
- 		
  		if (parameter instanceof ASObject
  			&& ((ASObject) parameter).getType() == null) {
! 			if (parameterType.equals(HashMap.class)
! 				|| parameterType.equals(Map.class)) {
! 				//don't set type
! 			} else {
! 				((ASObject) parameter).setType(parameterType.getName());
! 			}
  		}
  
! 		ASTranslator translator = new ASTranslator();
  		
! 		Object decodedObject = translator.fromActionScript(parameter);
  		
  		log.debug("decodedObject: " + decodedObject);
--- 43,62 ----
  		}
  		
  		if (parameter instanceof ASObject
  			&& ((ASObject) parameter).getType() == null) {
! 			
! 			ASObject aso = (ASObject) parameter;
! 			aso.setType(parameterType.getName());
! 			
  		}
  
! 		Object decodedObject = null;
  		
! 		ASTranslatorFactory factory = null;
! 		
! 		factory = ASTranslatorFactory.getInstance();
! 		ASTranslator translator = factory.getASTranslator();
! 		
! 		decodedObject = translator.fromActionScript(parameter);
  		
  		log.debug("decodedObject: " + decodedObject);




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn