myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1031300 - in /myfaces/commons/trunk/myfaces-commons-validators/src/main: java/org/apache/myfaces/commons/validator/ resources/META-INF/
Date Thu, 04 Nov 2010 22:26:22 GMT
Author: lu4242
Date: Thu Nov  4 22:26:22 2010
New Revision: 1031300

URL: http://svn.apache.org/viewvc?rev=1031300&view=rev
Log:
MFCOMMONS-12 Add ConverterBase class to allow create converters that evaluate EL expressions
at render time

Added:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
Modified:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java?rev=1031300&r1=1031299&r2=1031300&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
(original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
Thu Nov  4 22:26:22 2010
@@ -42,7 +42,9 @@ import org.apache.myfaces.commons.util.M
  */
 @JSFValidator(
    configExcluded = true,
-   tagClass = "org.apache.myfaces.commons.validator.ValidatorBaseTag")
+   evaluateELOnExecution = true,
+   tagClass = "org.apache.myfaces.commons.validator.ValidatorBaseTag",
+   tagHandler = "org.apache.myfaces.commons.validator.ValidatorBaseTagHandler")
 public abstract class ValidatorBase implements StateHolder, Validator {
 
     private String _summaryMessage = null;

Added: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java?rev=1031300&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
(added)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
Thu Nov  4 22:26:22 2010
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.commons.validator;
+
+import com.sun.facelets.tag.MetaRuleset;
+import com.sun.facelets.tag.jsf.ValidateHandler;
+import com.sun.facelets.tag.jsf.ValidatorConfig;
+
+public class ValidatorBaseTagHandler extends ValidateHandler
+{
+
+    public ValidatorBaseTagHandler(ValidatorConfig config)
+    {
+        super(config);
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    protected MetaRuleset createMetaRuleset(Class type)
+    {
+        MetaRuleset ruleSet = super.createMetaRuleset(type);
+        
+        //Add rule to handle EL expressions
+        ruleSet.addRule(_ValidatorRule.Instance);
+        
+        return ruleSet;
+    }
+}

Added: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java?rev=1031300&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
(added)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
Thu Nov  4 22:26:22 2010
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.commons.validator;
+
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.tag.MetaRule;
+import com.sun.facelets.tag.Metadata;
+import com.sun.facelets.tag.MetadataTarget;
+import com.sun.facelets.tag.TagAttribute;
+
+final class _ValidatorRule extends MetaRule {
+
+    final static class ValueExpressionMetadata extends Metadata {
+
+        private final String name;
+
+        private final TagAttribute attr;
+
+        private final Class type;
+
+        public ValueExpressionMetadata(String name, Class type,
+                TagAttribute attr) {
+            this.name = name;
+            this.attr = attr;
+            this.type = type;
+        }
+
+        public void applyMetadata(FaceletContext ctx, Object instance) {
+            ((ValidatorBase) instance).setValueExpression(this.name, this.attr
+                    .getValueExpression(ctx, this.type));
+        }
+
+    }
+
+    /*
+    final static class ValueBindingMetadata extends Metadata {
+
+        private final String name;
+
+        private final TagAttribute attr;
+
+        private final Class type;
+
+        public ValueBindingMetadata(String name, Class type, TagAttribute attr) {
+            this.name = name;
+            this.attr = attr;
+            this.type = type;
+        }
+
+        public void applyMetadata(FaceletContext ctx, Object instance) {
+            ((ValidatorBase) instance).setValueBinding(this.name,
+                    new LegacyValueBinding(this.attr.getValueExpression(ctx,
+                            this.type)));
+        }
+
+    }*/
+
+    public final static _ValidatorRule Instance = new _ValidatorRule();
+
+    public _ValidatorRule() {
+        super();
+    }
+
+    public Metadata applyRule(String name, TagAttribute attribute,
+            MetadataTarget meta) {
+        if (meta.isTargetInstanceOf(ValidatorBase.class)) {
+
+            // if component and dynamic, then must set expression
+            if (!attribute.isLiteral()) {
+                Class type = meta.getPropertyType(name);
+                if (type == null) {
+                    type = Object.class;
+                }
+                //if (FacesAPI.getComponentVersion(meta.getTargetClass()) >= 12) {
+                    return new ValueExpressionMetadata(name, type, attribute);
+                //} else {
+                //    return new ValueBindingMetadata(name, type, attribute);
+                //}
+            }
+        }
+        return null;
+    }
+}

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm?rev=1031300&r1=1031299&r2=1031300&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm
(original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm
Thu Nov  4 22:26:22 2010
@@ -102,7 +102,7 @@ public class ${utils.getClassFromFullCla
 #end
     public $type $utils.getMethodReaderFromProperty($property.name, $type)()
     {
-#if ($property.isTagExcluded() || $property.isLiteralOnly())
+#if ($property.isTagExcluded() || $property.isLiteralOnly() || !($validator.isEvaluateELOnExecution()))
         return $field;
 #else
 #if ($utils.isPrimitiveClass($type))



Mime
View raw message