openamf/src/java/org/openamf/util OpenAMFUtils.java,1.7,1.8
[email protected] Fri, 15 Aug 2003 11:52:10 -0700
| Newsgroups | gmane.comp.java.openamf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/openamf/openamf/src/java/org/openamf/util
In directory sc8-pr-cvs1:/tmp/cvs-serv13549/java/org/openamf/util
Modified Files:
OpenAMFUtils.java
Log Message:
javadoc fix and code cleanup
Index: OpenAMFUtils.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/util/OpenAMFUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OpenAMFUtils.java 9 Aug 2003 16:59:23 -0000 1.7
--- OpenAMFUtils.java 15 Aug 2003 18:52:08 -0000 1.8
***************
*** 33,39 ****
public static Object decodeParameter(Object parameter, Class parameterType) {
-
log.debug("Decoding parameter: " + parameter + " to type: " + parameterType);
-
if (parameter == null) {
try {
--- 33,37 ----
***************
*** 43,50 ****
}
}
!
! 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());
--- 41,45 ----
}
}
! 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());
***************
*** 53,62 ****
boolean setType = false;
-
DecoderFactory decoderFactory = DecoderFactory.getInstance();
-
if (parameter instanceof ASObject
&& ((ASObject) parameter).getType() == null) {
-
if (parameterType.equals(HashMap.class) || parameterType.equals(Map.class)) {
//don't set type
--- 48,54 ----
***************
*** 67,72 ****
}
! ActionScriptDecoder decoder =
! decoderFactory.getDecoder(parameter, parameterType);
log.debug("decoder: " + ((CachingDecoder)decoder).getNextDecoder().getClass().getName());
Object decodedObject = decoder.decodeObject(parameter, parameterType);
--- 59,63 ----
}
! ActionScriptDecoder decoder = decoderFactory.getDecoder(parameter, parameterType);
log.debug("decoder: " + ((CachingDecoder)decoder).getNextDecoder().getClass().getName());
Object decodedObject = decoder.decodeObject(parameter, parameterType);
***************
*** 78,84 ****
decodedObject = decoder.decodeObject(parameter, parameterType);
}
-
log.debug("decodedObject: " + decodedObject);
-
return decodedObject;
}
--- 69,73 ----
***************
*** 86,90 ****
public static boolean typesMatch(Class parameterType, Object parameter) {
-
log.debug("expected class: " + parameterType.getName());
if (parameter == null) {
--- 75,78 ----
***************
*** 93,99 ****
log.debug("parameter class: " + parameter.getClass().getName());
}
-
boolean typesMatch = parameterType.isInstance(parameter);
-
if (!typesMatch) {
if (parameterType.equals(Boolean.TYPE)
--- 81,85 ----
***************
*** 124,130 ****
}
}
-
return typesMatch;
}
-
}
--- 110,114 ----
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01