svn commit: r895427 - in /myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad: ./ interceptor/

[gp...@apache.org]

Author: gpetracek
Date: Sun Jan  3 15:58:09 2010
New Revision: 895427

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

Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadValidationPhaseListener.java
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadValidationPhaseListener.java?rev=895427&r1=895426&r2=895427&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadValidationPhaseListener.java Sun Jan  3 15:58:09 2010
@@ -18,11 +18,9 @@
  */
 package org.apache.myfaces.extensions.validator.trinidad;
 
-import org.apache.myfaces.extensions.validator.trinidad.renderkit.ExtValTrinidadRenderKit;
-import org.apache.myfaces.extensions.validator.trinidad.storage.TrinidadClientValidatorStorage;
-import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.trinidad.renderkit.ExtValTrinidadRenderKit;
 
 import javax.faces.FactoryFinder;
 import javax.faces.context.FacesContext;
@@ -45,8 +43,6 @@
 
     public void afterPhase(PhaseEvent event)
     {
-        ExtValUtils.getStorage(TrinidadClientValidatorStorage.class, TrinidadClientValidatorStorage.class.getName())
-                .rollback();
     }
 
     public void beforePhase(PhaseEvent event)
@@ -57,7 +53,7 @@
 
         String renderKitId = getRenderKitId(facesContext);
 
-        if(isIncompatibleRenderKit(renderKitId))
+        if (isIncompatibleRenderKit(renderKitId))
         {
             changeRenderKit(facesContext, renderKitFactory, renderKitId);
         }
@@ -70,8 +66,7 @@
 
     private RenderKitFactory getRenderKitFactory()
     {
-        return (RenderKitFactory)
-            FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+        return (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
     }
 
     private boolean isIncompatibleRenderKit(String renderKitId)

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java?rev=895427&r1=895426&r2=895427&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java Sun Jan  3 15:58:09 2010
@@ -19,14 +19,17 @@
 package org.apache.myfaces.extensions.validator.trinidad.interceptor;
 
 import org.apache.myfaces.extensions.validator.core.interceptor.AbstractRendererInterceptor;
+import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipAfterInterceptorsException;
+import org.apache.myfaces.extensions.validator.trinidad.storage.TrinidadClientValidatorStorage;
+import org.apache.myfaces.extensions.validator.trinidad.util.TrinidadUtils;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
-import org.apache.myfaces.extensions.validator.trinidad.util.TrinidadUtils;
+import org.apache.myfaces.trinidad.component.core.CoreForm;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputLabel;
 
-import javax.faces.render.Renderer;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
 import java.io.IOException;
 import java.util.Map;
 
@@ -39,12 +42,28 @@
     public void beforeEncodeBegin(FacesContext facesContext, UIComponent uiComponent, Renderer wrapped)
             throws IOException
     {
-        if(filterCoreOutputLabel(uiComponent))
+        if (filterCoreOutputLabel(uiComponent))
+        {
+            initCoreOutputLabel(facesContext, (CoreOutputLabel) uiComponent);
+        }
+    }
+
+    @Override
+    public void afterEncodeEnd(FacesContext facesContext, UIComponent uiComponent, Renderer wrapped)
+            throws IOException, SkipAfterInterceptorsException
+    {
+        if (uiComponent instanceof CoreForm)
         {
-            initCoreOutputLabel(facesContext, (CoreOutputLabel)uiComponent);
+            cleanupExtValClientValidators();
         }
     }
 
+    private void cleanupExtValClientValidators()
+    {
+        ExtValUtils.getStorage(TrinidadClientValidatorStorage.class, TrinidadClientValidatorStorage.class.getName())
+                .rollback();
+    }
+
     private boolean filterCoreOutputLabel(UIComponent uiComponent)
     {
         return (uiComponent instanceof CoreOutputLabel);
@@ -54,7 +73,7 @@
     {
         UIComponent targetComponent = TrinidadUtils.findLabeledEditableComponent(coreOutputLabel);
 
-        if(targetComponent == null || !isComponentEditable(targetComponent))
+        if (targetComponent == null || !isComponentEditable(targetComponent))
         {
             return;
         }
@@ -63,7 +82,7 @@
 
         //get component initializer for the current component and configure it
         //also in case of skipped validation to reset e.g. the required attribute
-        if(!metaDataResult.isEmpty())
+        if (!metaDataResult.isEmpty())
         {
             ExtValUtils.configureComponentWithMetaData(facesContext, coreOutputLabel, metaDataResult);
         }