You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/09/23 04:01:54 UTC
svn commit: r698062 - in
/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator:
./ baseval/strategy/
Author: gpetracek
Date: Mon Sep 22 19:01:54 2008
New Revision: 698062
URL: http://svn.apache.org/viewvc?rev=698062&view=rev
Log:
centralized meta-data keys
Added:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/MetaDataKeys.java
Modified:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/DefaultMyFacesComponentInitializer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/DefaultMyFacesComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/DefaultMyFacesComponentInitializer.java?rev=698062&r1=698061&r2=698062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/DefaultMyFacesComponentInitializer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/DefaultMyFacesComponentInitializer.java Mon Sep 22 19:01:54 2008
@@ -46,9 +46,9 @@
UIComponent uiComponent,
Map<String, Object> metaData)
{
- if(metaData.containsKey("required"))
+ if(metaData.containsKey(MetaDataKeys.REQUIRED))
{
- if((Boolean)metaData.get("required") && isComponentRequired( uiComponent ))
+ if((Boolean)metaData.get(MetaDataKeys.REQUIRED) && isComponentRequired( uiComponent ))
{
((EditableValueHolder)uiComponent).setRequired(true);
}
@@ -82,9 +82,9 @@
UIComponent uiComponent,
Map<String, Object> metaData)
{
- if(metaData.containsKey("max_length"))
+ if(metaData.containsKey(MetaDataKeys.MAX_LENGTH))
{
- int maxLength = (Integer)metaData.get("max_length");
+ int maxLength = (Integer)metaData.get(MetaDataKeys.MAX_LENGTH);
if(uiComponent instanceof HtmlInputText)
{
Added: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/MetaDataKeys.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/MetaDataKeys.java?rev=698062&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/MetaDataKeys.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/MetaDataKeys.java Mon Sep 22 19:01:54 2008
@@ -0,0 +1,31 @@
+/*
+ * 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.extensions.validator;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+public interface MetaDataKeys
+{
+ static final String REQUIRED = "required";
+
+ static final String MIM_LENGTH = "min_length";
+ static final String MAX_LENGTH = "max_length";
+}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java?rev=698062&r1=698061&r2=698062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java Mon Sep 22 19:01:54 2008
@@ -23,6 +23,7 @@
import org.apache.myfaces.extensions.validator.core.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.MetaDataKeys;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -41,7 +42,6 @@
public class JpaValidationStrategy extends AbstractValidationStrategy implements MetaDataExtractor
{
- private static final String VALIDATE_REQUIRED = "required";
private static final String VALIDATE_LENGTH = "length";
private String violation;
@@ -79,16 +79,16 @@
{
if(!((Column) annotation).nullable())
{
- results.put("required", true);
+ results.put(MetaDataKeys.REQUIRED, true);
}
- results.put("max_length", ((Column) annotation).length());
+ results.put(MetaDataKeys.MAX_LENGTH, ((Column) annotation).length());
}
else if(annotation instanceof Basic)
{
if(!((Basic)annotation).optional())
{
- results.put("required", true);
+ results.put(MetaDataKeys.REQUIRED, true);
}
}
//TODO impl. the rest!!!
@@ -150,7 +150,7 @@
{
if (convertedObject == null || convertedObject.equals(""))
{
- this.violation = VALIDATE_REQUIRED;
+ this.violation = MetaDataKeys.REQUIRED;
throw new ValidatorException(getValidationErrorFacesMassage(null));
}
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java?rev=698062&r1=698061&r2=698062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java Mon Sep 22 19:01:54 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidatorAdapter;
import org.apache.myfaces.extensions.validator.core.MetaDataExtractor;
+import org.apache.myfaces.extensions.validator.MetaDataKeys;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -54,12 +55,13 @@
{
Map<String, Object> results = new HashMap<String, Object>();
int minimum = ((Length)annotation).minimum();
- results.put("min_length", minimum);
- results.put("max_length", ((Length)annotation).maximum());
+
+ results.put(MetaDataKeys.MIM_LENGTH, minimum);
+ results.put(MetaDataKeys.MAX_LENGTH, ((Length)annotation).maximum());
if(minimum > 0)
{
- results.put("required", true);
+ results.put(MetaDataKeys.REQUIRED, true);
}
return results;
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java?rev=698062&r1=698061&r2=698062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java Mon Sep 22 19:01:54 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidationStrategy;
import org.apache.myfaces.extensions.validator.core.MetaDataExtractor;
+import org.apache.myfaces.extensions.validator.MetaDataKeys;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -50,7 +51,7 @@
public Map<String, Object> extractMetaData(Annotation annotation)
{
Map<String, Object> results = new HashMap<String, Object>();
- results.put("required", true);
+ results.put(MetaDataKeys.REQUIRED, true);
return results;
}