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 2008/04/17 07:19:23 UTC

svn commit: r648956 - in /myfaces/myfaces-build-tools/branches/builder_plugin: bigtest/core_trunk_11/api/src/main/java/javax/faces/component/ myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ myfaces-builde...

Author: lu4242
Date: Wed Apr 16 22:19:11 2008
New Revision: 648956

URL: http://svn.apache.org/viewvc?rev=648956&view=rev
Log:
more fixes and cleanup 

Modified:
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/UICommand.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/resources/META-INF/tagClass11.vm

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/UICommand.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/UICommand.java?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/UICommand.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/UICommand.java Wed Apr 16 22:19:11 2008
@@ -49,6 +49,7 @@
 
     /**
      * @JSFProperty
+     *   returnSignature="java.lang.String"
      */
     public MethodBinding getAction()
     {
@@ -62,6 +63,8 @@
 
     /**
      * @JSFProperty
+     *   returnSignature="void"
+     *   methodSignature="javax.faces.event.ActionEvent"
      */
     public MethodBinding getActionListener()
     {

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java Wed Apr 16 22:19:11 2008
@@ -161,7 +161,7 @@
                 PropertyMeta parentProp = other.getProperty(srcProp.getName());
                 if (parentProp != null)
                 {
-                    if (!srcProp.getTagExcluded().booleanValue())
+                    if (!srcProp.isTagExcluded().booleanValue())
                     {
                         srcProp.setInheritedTag(Boolean.TRUE);
                     }
@@ -378,8 +378,8 @@
             _propertyTagList = new ArrayList();
             for (Iterator it = _properties.values().iterator(); it.hasNext();){
                 PropertyMeta prop = (PropertyMeta) it.next();
-                if (!prop.getTagExcluded().booleanValue() &&
-                        !prop.getInheritedTag().booleanValue()){
+                if (!prop.isTagExcluded().booleanValue() &&
+                        !prop.isInheritedTag().booleanValue()){
                     _propertyTagList.add(prop);
                 }
             }
@@ -395,7 +395,7 @@
             _propertyComponentList = new ArrayList();
             for (Iterator it = _properties.values().iterator(); it.hasNext();){
                 PropertyMeta prop = (PropertyMeta) it.next();
-                if (!prop.getInherited().booleanValue()){
+                if (!prop.isInherited().booleanValue()){
                     _propertyComponentList.add(prop);
                 }
             }

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java Wed Apr 16 22:19:11 2008
@@ -197,7 +197,7 @@
         _transient = transient_;
     }
 
-    public Boolean getTransient()
+    public Boolean isTransient()
     {
         return ModelUtils.defaultOf(_transient, false);
     }
@@ -212,7 +212,7 @@
         _required = required;
     }
 
-    public Boolean getRequired()
+    public Boolean isRequired()
     {
         return ModelUtils.defaultOf(_required, false);
     }
@@ -226,7 +226,7 @@
         _literalOnly = literalOnly;
     }
 
-    public Boolean getLiteralOnly()
+    public Boolean isLiteralOnly()
     {
         return ModelUtils.defaultOf(_literalOnly, false);
     }
@@ -346,7 +346,7 @@
         _inherited = inherited;
     }
 
-    public Boolean getInherited()
+    public Boolean isInherited()
     {
         return ModelUtils.defaultOf(_inherited, false);
     }
@@ -356,7 +356,7 @@
         _inheritedTag = inheritedTag;
     }
 
-    public Boolean getInheritedTag()
+    public Boolean isInheritedTag()
     {
         return ModelUtils.defaultOf(_inheritedTag, false);
     }
@@ -366,7 +366,7 @@
         _tagExcluded = tagExcluded;
     }
 
-    public Boolean getTagExcluded()
+    public Boolean isTagExcluded()
     {
         return ModelUtils.defaultOf(_tagExcluded, false);
     }
@@ -392,7 +392,7 @@
         _stateHolder = stateHolder;
     }
 
-    public Boolean getStateHolder()
+    public Boolean isStateHolder()
     {
         return ModelUtils.defaultOf(_stateHolder, false);
     }

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/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/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Wed Apr 16 22:19:11 2008
@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -18,9 +19,9 @@
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ClassMeta;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.MethodSignatureMeta;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.RenderKitMeta;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
 
 import com.thoughtworks.qdox.JavaDocBuilder;
@@ -562,6 +563,8 @@
             descDflt = "no description";
         }
         String shortDescription = getString(clazz, "desc", props, descDflt);
+        String returnSignature = getString(clazz, "returnSignature", props, null);
+        String methodSignature = getString(clazz, "methodSignature", props, null);
 
         Type returnType = method.getReturns();
         
@@ -575,6 +578,26 @@
         p.setTagExcluded(tagExcluded);
         p.setDescription(shortDescription);
         p.setLongDescription(longDescription);
+        
+        if (returnSignature != null)
+        {
+            MethodSignatureMeta signature = new MethodSignatureMeta();
+            signature.setReturnType(returnSignature);
+            
+            if (methodSignature != null)
+            {
+                String[] params = StringUtils.split(methodSignature,',');
+                
+                if (params != null)
+                {
+                    for (int i = 0; i < params.length; i++)
+                    {
+                        signature.addParameterType(params[i].trim());
+                    }
+                }
+            }
+            p.setMethodBindingSignature(signature);
+        }
         
         //If the method is abstract this should be generated
         if (method.isAbstract()){

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java Wed Apr 16 22:19:11 2008
@@ -63,7 +63,7 @@
         if (property.isMethodBinding())
             return "MethodExpression";
 
-        if (!property.getLiteralOnly().booleanValue())
+        if (!property.isLiteralOnly().booleanValue())
             return "ValueExpression";
         else
             return property.getClassName();

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/resources/META-INF/tagClass11.vm
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/resources/META-INF/tagClass11.vm?rev=648956&r1=648955&r2=648956&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/resources/META-INF/tagClass11.vm (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/resources/META-INF/tagClass11.vm Wed Apr 16 22:19:11 2008
@@ -96,10 +96,9 @@
             }
         }
 #elseif ($property.isMethodBinding())##                 2
-        //MethodBinding
         if ($field != null)
         {
-#if ($utils.isStringMethodBindingReturnType($property.methodBindingSignature)))##3
+#if ($utils.isStringMethodBindingReturnType($property.methodBindingSignature))##3
             MethodBinding mb;
             if (isValueReference($field))
             {
@@ -117,13 +116,13 @@
 #else##                                                 3
             MethodBinding mb = context.getApplication().createMethodBinding(
                 $field, $utils.getSignatureParams($property.methodBindingSignature));
-            comp.setActionListener(mb);
 #end##                                                  3
+            comp.${utils.getPrefixedPropertyName("set",$property.name)}(mb);
         }
 #else##                                               2
         if ($field != null)
         {
-#if ($property.isLiteralOnly)##                         3
+#if ($property.isLiteralOnly())##                         3
 #set ($className = $utils.getPrimitiveType($property.className))
 #if ($utils.isPrimitiveClass($className))##               4
 #if ($utils.isPrimitiveClass($property.className))##        5
@@ -133,7 +132,7 @@
 #end##                                                      5
 #else##                                                   4
             comp.getAttributes().put("$property.name", $field);
-#end#                                                     4
+#end##                                                    4
 #else##                                                 3
             if (isValueReference($field))
             {