[jboss-svn-commits] JBL Code SVN: r10283 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-03-16 15:47:56 -0400 (Fri, 16 Mar 2007)
New Revision: 10283

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProxyUtils.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java
Log:
JBLAB-780
rw proxy: enum fix + cleanup


Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProxyUtils.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProxyUtils.java	2007-03-16 19:18:47 UTC (rev 10282)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProxyUtils.java	2007-03-16 19:47:56 UTC (rev 10283)
@@ -26,6 +26,8 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
  */
@@ -40,10 +42,13 @@
 													  		"reatinAll",
 													  		"set"};
 	
+	private static Logger log = Logger.getLogger(ProxyUtils.class);
+	
 	public static boolean isSimpleType(Class<? extends Object> type) {
 		
 		boolean result = type.isPrimitive() ||
-				type.getPackage().getName().startsWith("java.lang");
+						 type.isEnum() ||
+						 type.getPackage().getName().startsWith("java.lang");
 		
 		return result;
 	}	
@@ -116,25 +121,24 @@
 
 	public static Object getRWType(Class<?> type) {
 		
-		if (isSimpleType(type)) {
-			return null;
-		}
-		
 		String classString = type.getName().
 								replace("project.", "project.rw.").concat("RW");
 		
 		try {
 			
-			System.out.println("ClassString: " + classString);
-			
 			Class<?> retClass = Thread.currentThread().getContextClassLoader().
 														loadClass(classString);
 			
+			if (retClass.isEnum()) {
+				return null; // Although we check if the base class is enum,
+							 // this check is necessary.
+			}
+			
 			return retClass.newInstance();
 			
 		} catch (Exception e) {
 		
-			System.out.println("EX: " + e);
+			log.debug("Could not instantinate: " + type.getName(), e);
 			
 			return null;
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java	2007-03-16 19:18:47 UTC (rev 10282)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java	2007-03-16 19:47:56 UTC (rev 10283)
@@ -100,13 +100,10 @@
     		
     		// For getters, return empty object if return is null
     		// (makes JSF easier)
-    		if ((result == null) && ProxyUtils.isGetter(m)) {
+    		if ((result == null) && ProxyUtils.isGetter(m)
+    				&& !ProxyUtils.isSimpleType(m.getReturnType())) {
     			
-    			System.out.println("NULL RESULT " + m.getName());
-    			
     			result = ProxyUtils.getRWType(m.getReturnType());
-    			
-    			System.out.println("RESULT: " + result);
     		}
     		
         return ProxyUtils.wrapSync(result);