You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/04/24 02:16:51 UTC

svn commit: r768107 - /myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java

Author: lu4242
Date: Fri Apr 24 00:16:51 2009
New Revision: 768107

URL: http://svn.apache.org/viewvc?rev=768107&view=rev
Log:
MYFACES-2202 myfaces builder plugin does not recognize properties returning arrays

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=768107&r1=768106&r2=768107&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Fri Apr 24 00:16:51 2009
@@ -1239,6 +1239,14 @@
         
         fullyQualifiedReturnType = getFullyQualifiedClassName(clazz,fullyQualifiedReturnType);
         
+        if (returnType.isArray() && (fullyQualifiedReturnType.indexOf('[') == -1))
+        {
+            for (int i = 0; i < returnType.getDimensions();i++)
+            {
+                fullyQualifiedReturnType = fullyQualifiedReturnType + "[]";
+            }
+        }
+                
         String className = getString(clazz,"className",props, fullyQualifiedReturnType);
         String deferredValueType = getString(clazz, "deferredValueType", props, null);
         String deferredMethodSignature = getString(clazz, "deferredMethodSignature", props, null);
@@ -1551,6 +1559,14 @@
         
         fullyQualifiedReturnType = getFullyQualifiedClassName(clazz, fullyQualifiedReturnType);
         
+        if (returnType.isArray() && (fullyQualifiedReturnType.indexOf('[') == -1))
+        {
+            for (int i = 0; i < returnType.getDimensions();i++)
+            {
+                fullyQualifiedReturnType = fullyQualifiedReturnType + "[]";
+            }
+        }
+        
         PropertyMeta p = new PropertyMeta();
         p.setName(methodToPropName(method.getName()));
         p.setClassName(fullyQualifiedReturnType);