svn commit: r1166419 - /incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java

[mbenson]

Author: mbenson
Date: Wed Sep  7 21:44:21 2011
New Revision: 1166419

URL: http://svn.apache.org/viewvc?rev=1166419&view=rev
Log:
undeprecate constructor wanted by Dynamic BeanValidation provider; remove a 
warning; remove a duplication caused by a merge

Modified:
    
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java

Modified: 
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
URL: 
http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java?rev=1166419&r1=1166418&r2=1166419&view=diff
==============================================================================
--- 
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
 (original)
+++ 
incubator/bval/sandbox/lang3-work/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
 Wed Sep  7 21:44:21 2011
@@ -71,9 +71,6 @@ public class ApacheFactoryContext implem
      * 
      * @param factory
      * @param metaBeanFinder
-     * @deprecated does anyone need this?  If the default {@link 
ApacheFactoryContext}
-     * uses a {@link Jsr303MetaBeanFactory}, which circularly refers to its 
owning {@link ApacheFactoryContext},
-     * it follows that this constructor can't be conveniently used with a 
{@link Jsr303MetaBeanFactory}.
      */
     protected ApacheFactoryContext(ApacheValidatorFactory factory, 
MetaBeanFinder metaBeanFinder) {
         this.factory = factory;
@@ -206,8 +203,10 @@ public class ApacheFactoryContext implem
         if (!jsr303Found) {
             builders.add(new Jsr303MetaBeanFactory(this));
         }
-        if (Boolean.parseBoolean(factory.getProperties().get(
-            ApacheValidatorConfiguration.Properties.ENABLE_METABEANS_XML))) {
+        @SuppressWarnings("deprecation")
+        boolean enableMetaBeansXml = 
Boolean.parseBoolean(factory.getProperties().get(
+            ApacheValidatorConfiguration.Properties.ENABLE_METABEANS_XML));
+        if (enableMetaBeansXml) {
             XMLMetaBeanManagerCreator.addFactory(builders);
         }
         return createMetaBeanManager(builders);
@@ -227,11 +226,6 @@ public class ApacheFactoryContext implem
             ApacheValidatorConfiguration.Properties.ENABLE_METABEANS_XML))) {
             return 
XMLMetaBeanManagerCreator.createXMLMetaBeanManager(builders);
         }
-        // as long as we support both: jsr303 (in the builders list) and 
xstream-xml metabeans:
-        if (Boolean.parseBoolean(factory.getProperties().get(
-            ApacheValidatorConfiguration.Properties.ENABLE_METABEANS_XML))) {
-            return 
XMLMetaBeanManagerCreator.createXMLMetaBeanManager(builders);
-        }
         return new MetaBeanManager(new MetaBeanBuilder(builders.toArray(new 
MetaBeanFactory[builders.size()])));
     }