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/07/31 20:27:52 UTC
svn commit: r681431 [1/3] - in
/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules:
./ property-validation/
property-validation/src/main/java/org/apache/myfaces/extensions/validator/
property-validation/src/main/java/org/apac...
Author: lu4242
Date: Thu Jul 31 11:27:50 2008
New Revision: 681431
URL: http://svn.apache.org/viewvc?rev=681431&view=rev
Log:
apply checkstyle rules
Modified:
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/ (props changed)
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/ (props changed)
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/Equals.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/NotEquals.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIf.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIfType.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/TargetAlias.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/EqualsStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/NotEqualsStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/RequiredIfStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/TargetAliasStrategy.java
myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
Propchange: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 31 11:27:50 2008
@@ -7,4 +7,4 @@
*.iws
.settings
maven-eclipse.xml
-.externalToolsBuilder
+.externalToolBuilders
Propchange: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 31 11:27:50 2008
@@ -7,4 +7,4 @@
*.iws
.settings
maven-eclipse.xml
-.externalToolsBuilder
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/InitStaticStrategyMappingsPhaseListener.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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;
@@ -25,12 +25,21 @@
/**
* @author Gerhard Petracek
*/
-public class InitStaticStrategyMappingsPhaseListener extends AbstractStartupConfigListener {
+public class InitStaticStrategyMappingsPhaseListener extends
+ AbstractStartupConfigListener
+{
- protected void init() {
+ protected void init()
+ {
String jpaBasedValidation = WebXmlParameter.DEACTIVATE_JPA_BASED_VALIDATION;
- if (jpaBasedValidation == null || !jpaBasedValidation.equalsIgnoreCase("true")) {
- ExtValUtils.getInformationProviderBean().addStaticStrategyMappingSource(ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".jpa_strategy_mappings");
+ if (jpaBasedValidation == null
+ || !jpaBasedValidation.equalsIgnoreCase("true"))
+ {
+ ExtValUtils
+ .getInformationProviderBean()
+ .addStaticStrategyMappingSource(
+ ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME
+ + ".jpa_strategy_mappings");
}
}
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval;
@@ -25,8 +25,11 @@
*
* @author Gerhard Petracek
*/
-public interface WebXmlParameter {
+public interface WebXmlParameter
+{
//TODO docu
- static final String VALIDATION_MESSAGES_JPA = WebXmlUtils.getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
- static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils.getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
+ static final String VALIDATION_MESSAGES_JPA = WebXmlUtils
+ .getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
+ static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils
+ .getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/DoubleRange.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface DoubleRange {
+public @interface DoubleRange
+{
double minimum() default 0;
double maximum() default Double.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/JoinValidation.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface JoinValidation {
+public @interface JoinValidation
+{
String[] value();
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Length.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Length {
+public @interface Length
+{
int minimum() default 0;
int maximum() default Integer.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/LongRange.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface LongRange {
+public @interface LongRange
+{
long minimum() default 0;
long maximum() default Long.MAX_VALUE;
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Regex.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,9 +27,10 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Regex {
+public @interface Regex
+{
String[] value();
String validationErrorMsgKey() default "no_match";
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Required {
+public @interface Required
+{
String validationErrorMsgKey() default "field_required";
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Validator.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation;
@@ -27,8 +27,9 @@
/**
* @author Gerhard Petracek
*/
-@Target({METHOD, FIELD})
+@Target( { METHOD, FIELD })
@Retention(RUNTIME)
-public @interface Validator {
+public @interface Validator
+{
Class[] value();
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningAnnotationExtractor.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.annotation.extractor;
@@ -29,25 +29,35 @@
/**
* @author Gerhard Petracek
*/
-public class DefaultPropertyScanningAnnotationExtractor extends DefaultComponentAnnotationExtractor {
+public class DefaultPropertyScanningAnnotationExtractor extends
+ DefaultComponentAnnotationExtractor
+{
@Override
- public List<AnnotationEntry> extractAnnotations(FacesContext facesContext, Object object) {
+ public List<AnnotationEntry> extractAnnotations(FacesContext facesContext,
+ Object object)
+ {
//should never occur
- if (!(object instanceof String)) {
+ if (!(object instanceof String))
+ {
return new ArrayList<AnnotationEntry>();
}
String valueBindingExpression = ((String) object).trim();
int beanPropertyBorder = valueBindingExpression.lastIndexOf(".");
- String property = valueBindingExpression.substring(beanPropertyBorder + 1, valueBindingExpression.lastIndexOf("}"));
-
- valueBindingExpression = valueBindingExpression.substring(0, beanPropertyBorder) + "}";
+ String property = valueBindingExpression
+ .substring(beanPropertyBorder + 1, valueBindingExpression
+ .lastIndexOf("}"));
+
+ valueBindingExpression = valueBindingExpression.substring(0,
+ beanPropertyBorder)
+ + "}";
List<AnnotationEntry> annotationEntries = new ArrayList<AnnotationEntry>();
- Class entityClass = ELUtils.getTypeOfValueBindingForExpression(facesContext, valueBindingExpression);
+ Class entityClass = ELUtils.getTypeOfValueBindingForExpression(
+ facesContext, valueBindingExpression);
//create template entry
AnnotationEntry templateEntry = new AnnotationEntry();
@@ -59,9 +69,12 @@
/*
* find and add annotations
*/
- if (entityClass != null) {
- addPropertyAccessAnnotations(entityClass, property, annotationEntries, templateEntry);
- addFieldAccessAnnotations(entityClass, property, annotationEntries, templateEntry);
+ if (entityClass != null)
+ {
+ addPropertyAccessAnnotations(entityClass, property,
+ annotationEntries, templateEntry);
+ addFieldAccessAnnotations(entityClass, property, annotationEntries,
+ templateEntry);
}
return annotationEntries;
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/DefaultValidationErrorMessageResolver.java Thu Jul 31 11:27:50 2008
@@ -1,35 +1,40 @@
/*
- * 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.
+ * 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.baseval.message.resolver;
/**
* @author Gerhard Petracek
*/
-public class DefaultValidationErrorMessageResolver extends org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver {
- private static String BASE_NAME = null;
+public class DefaultValidationErrorMessageResolver
+ extends
+ org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver
+{
+ private static String baseName = null;
@Override
- protected String getBaseName() {
- if (BASE_NAME == null) {
- BASE_NAME = super.getBaseName();
+ protected String getBaseName()
+ {
+ if (baseName == null)
+ {
+ baseName = super.getBaseName();
}
- return BASE_NAME;
+ return baseName;
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.message.resolver;
@@ -24,16 +24,23 @@
/**
* @author Gerhard Petracek
*/
-public class JpaValidationErrorMessageResolver extends AbstractValidationErrorMessageResolver {
+public class JpaValidationErrorMessageResolver extends
+ AbstractValidationErrorMessageResolver
+{
private static final String CUSTOM_BASE_NAME = WebXmlParameter.VALIDATION_MESSAGES_JPA;
- private static final String BASE_NAME = JpaValidationErrorMessageResolver.class.getPackage().getName().replace(".message.resolver", ".message.bundle") + ".jpa_messages";
+ private static final String BASE_NAME = JpaValidationErrorMessageResolver.class
+ .getPackage().getName().replace(".message.resolver",
+ ".message.bundle")
+ + ".jpa_messages";
- protected String getCustomBaseName() {
+ protected String getCustomBaseName()
+ {
return CUSTOM_BASE_NAME;
}
- protected String getBaseName() {
+ protected String getBaseName()
+ {
return BASE_NAME;
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/DoubleRangeStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -30,16 +30,22 @@
/**
* @author Gerhard Petracek
*/
-public class DoubleRangeStrategy extends AbstractValidatorAdapter {
+public class DoubleRangeStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
- DoubleRange annotation = annotationEntry.getAnnotation(DoubleRange.class);
+ DoubleRange annotation = annotationEntry
+ .getAnnotation(DoubleRange.class);
DoubleRangeValidator doubleRangeValidator = new DoubleRangeValidator();
doubleRangeValidator.setMinimum(annotation.minimum());
doubleRangeValidator.setMaximum(annotation.maximum());
- doubleRangeValidator.validate(facesContext, uiComponent, convertedObject);
+ doubleRangeValidator.validate(facesContext, uiComponent,
+ convertedObject);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -33,22 +33,37 @@
/**
* @author Gerhard Petracek
*/
-public class JoinValidationStrategy extends AbstractValidatorAdapter {
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+public class JoinValidationStrategy extends AbstractValidatorAdapter
+{
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
AnnotationExtractor extractor = new DefaultPropertyScanningAnnotationExtractor();
- String[] targetExpressions = annotationEntry.getAnnotation(JoinValidation.class).value();
+ String[] targetExpressions = annotationEntry.getAnnotation(
+ JoinValidation.class).value();
ValidationStrategy validationStrategy;
- for (String targetExpression : targetExpressions) {
- for (AnnotationEntry entry : extractor.extractAnnotations(facesContext, targetExpression)) {
- validationStrategy = FactoryUtils.getValidationStrategyFactory().create(entry.getAnnotation());
-
- if (validationStrategy != null) {
- validationStrategy.validate(facesContext, uiComponent, entry, convertedObject);
- } else {
- logger.trace("no validation strategy found for " + entry.getAnnotation().annotationType().getName());
+ for (String targetExpression : targetExpressions)
+ {
+ for (AnnotationEntry entry : extractor.extractAnnotations(
+ facesContext, targetExpression))
+ {
+ validationStrategy = FactoryUtils
+ .getValidationStrategyFactory().create(
+ entry.getAnnotation());
+
+ if (validationStrategy != null)
+ {
+ validationStrategy.validate(facesContext, uiComponent,
+ entry, convertedObject);
+ }
+ else
+ {
+ logger.trace("no validation strategy found for "
+ + entry.getAnnotation().annotationType().getName());
}
}
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/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/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -33,7 +33,8 @@
/**
* @author Gerhard Petracek
*/
-public class JpaValidationStrategy extends AbstractValidationStrategy {
+public class JpaValidationStrategy extends AbstractValidationStrategy
+{
private static final String VALIDATE_REQUIRED = "required";
private static final String VALIDATE_LENGTH = "length";
@@ -41,76 +42,112 @@
private String violation;
private int maxLength;
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Annotation annotation = annotationEntry.getAnnotation();
- if (annotation instanceof Column) {
+ if (annotation instanceof Column)
+ {
validateColumnAnnotation((Column) annotation, convertedObject);
- } else if (annotation instanceof Basic) {
+ }
+ else if (annotation instanceof Basic)
+ {
validateBasicAnnotation((Basic) annotation, convertedObject);
- } else if (annotation instanceof OneToOne) {
+ }
+ else if (annotation instanceof OneToOne)
+ {
validateOneToOneAnnotation((OneToOne) annotation, convertedObject);
- } else if (annotation instanceof ManyToOne) {
+ }
+ else if (annotation instanceof ManyToOne)
+ {
validateManyToOneAnnotation((ManyToOne) annotation, convertedObject);
}
}
- private void validateColumnAnnotation(Column column, Object convertedObject) throws ValidatorException {
- if (!column.nullable()) {
+ private void validateColumnAnnotation(Column column, Object convertedObject)
+ throws ValidatorException
+ {
+ if (!column.nullable())
+ {
checkRequiredConvertedObject(convertedObject);
}
- if (convertedObject == null) {
+ if (convertedObject == null)
+ {
return;
}
- if (convertedObject instanceof String && column.length() < ((String) convertedObject).length()) {
+ if (convertedObject instanceof String
+ && column.length() < ((String) convertedObject).length())
+ {
this.violation = VALIDATE_LENGTH;
this.maxLength = column.length();
throw new ValidatorException(getValidationErrorFacesMassage(null));
}
}
- private void validateBasicAnnotation(Basic basic, Object convertedObject) throws ValidatorException {
- if (!basic.optional()) {
+ private void validateBasicAnnotation(Basic basic, Object convertedObject)
+ throws ValidatorException
+ {
+ if (!basic.optional())
+ {
checkRequiredConvertedObject(convertedObject);
}
}
- private void validateOneToOneAnnotation(OneToOne oneToOne, Object convertedObject) {
- if (!oneToOne.optional()) {
+ private void validateOneToOneAnnotation(OneToOne oneToOne,
+ Object convertedObject)
+ {
+ if (!oneToOne.optional())
+ {
//TODO
checkRequiredConvertedObject(convertedObject);
}
}
- private void validateManyToOneAnnotation(ManyToOne manyToOne, Object convertedObject) {
- if (!manyToOne.optional()) {
+ private void validateManyToOneAnnotation(ManyToOne manyToOne,
+ Object convertedObject)
+ {
+ if (!manyToOne.optional())
+ {
//TODO
checkRequiredConvertedObject(convertedObject);
}
}
- private void checkRequiredConvertedObject(Object convertedObject) throws ValidatorException {
- if (convertedObject == null || convertedObject.equals("")) {
+ private void checkRequiredConvertedObject(Object convertedObject)
+ throws ValidatorException
+ {
+ if (convertedObject == null || convertedObject.equals(""))
+ {
this.violation = VALIDATE_REQUIRED;
throw new ValidatorException(getValidationErrorFacesMassage(null));
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
- if (VALIDATE_LENGTH.equals(this.violation)) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
+ if (VALIDATE_LENGTH.equals(this.violation))
+ {
return "field_too_long";
- } else {
+ }
+ else
+ {
return "field_required";
}
}
- protected String getErrorMessageDetails(Annotation annotation) {
+ protected String getErrorMessageDetails(Annotation annotation)
+ {
String message = super.getErrorMessageDetails(annotation);
- if (VALIDATE_LENGTH.equals(this.violation)) {
+ if (VALIDATE_LENGTH.equals(this.violation))
+ {
return message.replace("{0}", "" + this.maxLength);
- } else {
+ }
+ else
+ {
return message;
}
}
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/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/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LengthStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -30,9 +30,13 @@
/**
* @author Gerhard Petracek
*/
-public class LengthStrategy extends AbstractValidatorAdapter {
+public class LengthStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Length annotation = annotationEntry.getAnnotation(Length.class);
LengthValidator lengthValidator = new LengthValidator();
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/LongRangeStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -30,9 +30,13 @@
/**
* @author Gerhard Petracek
*/
-public class LongRangeStrategy extends AbstractValidatorAdapter {
+public class LongRangeStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
LongRange annotation = annotationEntry.getAnnotation(LongRange.class);
LongRangeValidator longRangeValidator = new LongRangeValidator();
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RegexStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -32,28 +32,33 @@
/**
* @author Gerhard Petracek
*/
-public class RegexStrategy extends AbstractValidationStrategy {
+public class RegexStrategy extends AbstractValidationStrategy
+{
protected void processValidation(FacesContext facesContext,
- UIComponent uiComponent,
- AnnotationEntry annotationEntry,
- Object convertedObject) throws ValidatorException {
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
Regex annotation = annotationEntry.getAnnotation(Regex.class);
- for (String expression : annotation.value()) {
- if (convertedObject == null || !Pattern.compile(expression).matcher(convertedObject.toString()).matches()) {
- throw new ValidatorException(
- new FacesMessage(
- FacesMessage.SEVERITY_ERROR,
- getErrorMessageSummary(annotation),
- getErrorMessageDetails(annotation)
- .replace("{0}", expression)));
+ for (String expression : annotation.value())
+ {
+ if (convertedObject == null
+ || !Pattern.compile(expression).matcher(
+ convertedObject.toString()).matches())
+ {
+ throw new ValidatorException(new FacesMessage(
+ FacesMessage.SEVERITY_ERROR,
+ getErrorMessageSummary(annotation),
+ getErrorMessageDetails(annotation).replace("{0}",
+ expression)));
}
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
return ((Regex) annotation).validationErrorMsgKey();
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/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/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -30,15 +30,23 @@
/**
* @author Gerhard Petracek
*/
-public class RequiredStrategy extends AbstractValidationStrategy {
+public class RequiredStrategy extends AbstractValidationStrategy
+{
- public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
- if (convertedObject == null || convertedObject.equals("")) {
- throw new ValidatorException(getValidationErrorFacesMassage(annotationEntry.getAnnotation()));
+ public void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
+ if (convertedObject == null || convertedObject.equals(""))
+ {
+ throw new ValidatorException(
+ getValidationErrorFacesMassage(annotationEntry
+ .getAnnotation()));
}
}
- protected String getValidationErrorMsgKey(Annotation annotation) {
+ protected String getValidationErrorMsgKey(Annotation annotation)
+ {
return ((Required) annotation).validationErrorMsgKey();
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java?rev=681431&r1=681430&r2=681431&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java (original)
+++ myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java Thu Jul 31 11:27:50 2008
@@ -1,20 +1,20 @@
/*
- * 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.
+ * 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.baseval.strategy;
@@ -30,17 +30,25 @@
/**
* @author Gerhard Petracek
*/
-public class ValidatorStrategy extends AbstractValidatorAdapter {
+public class ValidatorStrategy extends AbstractValidatorAdapter
+{
- protected void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ protected void processValidation(FacesContext facesContext,
+ UIComponent uiComponent, AnnotationEntry annotationEntry,
+ Object convertedObject) throws ValidatorException
+ {
- Class[] validatorClasses = annotationEntry.getAnnotation(Validator.class).value();
+ Class[] validatorClasses = annotationEntry.getAnnotation(
+ Validator.class).value();
javax.faces.validator.Validator validator;
- for (Class validatorClassName : validatorClasses) {
- validator = (javax.faces.validator.Validator) ClassUtils.tryToInstantiateClass(validatorClassName);
+ for (Class validatorClassName : validatorClasses)
+ {
+ validator = (javax.faces.validator.Validator) ClassUtils
+ .tryToInstantiateClass(validatorClassName);
- if (validator == null) {
+ if (validator == null)
+ {
logger.warn(validatorClassName.getName() + " not found");
continue;
}
Re: svn commit: r681431 [1/3] - in
/myfaces/extensions/validator/branches/trunk_layout_myfaces/validation-modules:
./ property-validation/
property-validation/src/main/java/org/apache/myfaces/extensions/validator/
property-validation/src/main/java/org/apac...
Posted by simon <si...@chello.at>.
Hi Leonardo,
On Thu, 2008-07-31 at 18:27 +0000, lu4242@apache.org wrote:
> Author: lu4242
> Date: Thu Jul 31 11:27:50 2008
> New Revision: 681431
>
> URL: http://svn.apache.org/viewvc?rev=681431&view=rev
> Log:
> apply checkstyle rules
Just about these license changes:
As I noted in an earlier email (you might have been on holiday), there
are for historical reasons two different copyright header layouts
currently in use in myfaces code.
One has " * some text" and the other has " * some text" (one more
space).
The approach I have taken is to publish two possible templates to check
against in the checkstyle-rules module, so that each project can use the
template that matches the majority of the existing code. That minimises
the number of files that need to be changed; a project has to be
internally consistent but can choose either layout.
The two templates are named "myfaces-header.txt" and
"myfaces-header-spaces.txt". Personally, I prefer the one-space version
(myfaces-header.txt) as that matches what all the commons.apache.org
projects use. But I can't see any official version anywhere, so I guess
both are valid.
Just thought I would point that out in case you weren't aware of it...
Regards,
Simon