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 2010/05/14 05:59:30 UTC
svn commit: r944100 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory:
ExtValApplicationFactory.java ExtValApplicationWrapper.java
Author: gpetracek
Date: Fri May 14 03:59:30 2010
New Revision: 944100
URL: http://svn.apache.org/viewvc?rev=944100&view=rev
Log:
EXTVAL-95
Added:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationWrapper.java
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationFactory.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationFactory.java?rev=944100&r1=944099&r2=944100&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationFactory.java Fri May 14 03:59:30 2010
@@ -25,7 +25,6 @@ import org.apache.myfaces.extensions.val
import javax.faces.application.ApplicationFactory;
import javax.faces.application.Application;
-import javax.faces.application.ApplicationWrapper;
/**
* @author Gerhard Petracek
@@ -43,32 +42,17 @@ public class ExtValApplicationFactory ex
public ApplicationFactory getWrapped()
{
- return wrapped.getWrapped();
+ return this.wrapped.getWrapped();
}
@ToDo(value = Priority.HIGH, description = "context param. to deactivate this wrapper")
public Application getApplication()
{
- return new ApplicationWrapper() {
-
- public Application getWrapped()
- {
- return wrapped.getApplication();
- }
-
- @Override
- public void addDefaultValidatorId(String s)
- {
- if(!"javax.faces.Bean".equals(s))
- {
- super.addDefaultValidatorId(s);
- }
- }
- };
+ return new ExtValApplicationWrapper(this.wrapped.getApplication());
}
public void setApplication(Application application)
{
- wrapped.setApplication(application);
+ this.wrapped.setApplication(application);
}
}
Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationWrapper.java?rev=944100&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationWrapper.java (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/factory/ExtValApplicationWrapper.java Fri May 14 03:59:30 2010
@@ -0,0 +1,50 @@
+/*
+ * 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.beanval.factory;
+
+import javax.faces.application.ApplicationWrapper;
+import javax.faces.application.Application;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+class ExtValApplicationWrapper extends ApplicationWrapper
+{
+ private Application wrapped;
+
+ public ExtValApplicationWrapper(Application wrapped)
+ {
+ this.wrapped = wrapped;
+ }
+
+ public Application getWrapped()
+ {
+ return this.wrapped;
+ }
+
+ @Override
+ public void addDefaultValidatorId(String s)
+ {
+ if(!"javax.faces.Bean".equals(s))
+ {
+ super.addDefaultValidatorId(s);
+ }
+ }
+}