myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1073522 - in /myfaces/extensions/cdi/trunk: core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ jee-modules/jsf-module/impl/src/main/ja...
Date Tue, 22 Feb 2011 21:47:39 GMT
Author: gpetracek
Date: Tue Feb 22 21:47:38 2011
New Revision: 1073522

URL: http://svn.apache.org/viewvc?rev=1073522&view=rev
Log:
cleanup

Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java?rev=1073522&r1=1073521&r2=1073522&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
(original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
Tue Feb 22 21:47:38 2011
@@ -85,15 +85,7 @@ public class ProjectStageProducer implem
     {
         if(projectStage == null)
         {
-            synchronized (ProjectStageProducer.class)
-            {
-                projectStage = resolveProjectStage();
-            }
-
-            if(projectStage == null)
-            {
-                projectStage = ProjectStage.Production;
-            }
+            initProjectStage();
         }
         return projectStage;
     }
@@ -133,7 +125,7 @@ public class ProjectStageProducer implem
                 // then we take the default one.
                 projectStageProducer = new ProjectStageProducer();
             }
-            projectStageProducer.init();
+            projectStageProducer.initProjectStage();
         }
 
         return projectStageProducer;
@@ -149,21 +141,6 @@ public class ProjectStageProducer implem
         projectStage = ps;
     }
 
-    private void init()
-    {
-        if (projectStage == null)
-        {
-            projectStage = resolveProjectStage();
-        }
-
-        // the last resort is setting it to Production
-        if (projectStage == null)
-        {
-            projectStage = ProjectStage.Production;
-        }
-    }
-
-
     /**
      * We need to lookup a few environment variables in a specific order
      * <ol>
@@ -205,4 +182,20 @@ public class ProjectStageProducer implem
 
         return null;
     }
+
+    protected void initProjectStage()
+    {
+        synchronized (ProjectStageProducer.class)
+        {
+            if(projectStage == null)
+            {
+                projectStage = resolveProjectStage();
+
+                if(projectStage == null)
+                {
+                    projectStage = ProjectStage.Production;
+                }
+            }
+        }
+    }
 }

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1073522&r1=1073521&r2=1073522&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
(original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
Tue Feb 22 21:47:38 2011
@@ -145,11 +145,6 @@ public class CodiUtils
         return  (T) beanManager.getReference(bean, t, cc);
     }
 
-    private static <T> CreationalContext<T> getCreationalContextFor(BeanManager
beanManager, Bean<T> bean)
-    {
-        return beanManager.createCreationalContext(bean);
-    }
-
     /**
      * Load Properties from a configuration file with the given resourceName.
      *

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java?rev=1073522&r1=1073521&r2=1073522&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
Tue Feb 22 21:47:38 2011
@@ -116,11 +116,6 @@ public class InvalidValueAwareMessageInt
         return attributes;
     }
 
-    private Serializable extractInvalidValue(String messageTemplate)
-    {
-        return messageTemplate;
-    }
-
     private void logWarning(Context context)
     {
         String constraintName = context.getConstraintDescriptor().getAnnotation().annotationType().getName();



Mime
View raw message