You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/08/01 19:44:01 UTC

svn commit: r427657 [31/42] - in /myfaces: core/trunk/api/src/main/java/javax/faces/component/ core/trunk/api/src/test/java/javax/faces/ core/trunk/api/src/test/java/javax/faces/application/ core/trunk/api/src/test/java/javax/faces/component/ core/trun...

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjax.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjax.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjax.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjax.java Tue Aug  1 10:43:28 2006
@@ -1,162 +1,162 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import org.apache.myfaces.component.html.ext.HtmlCommandButton;
-import org.apache.myfaces.custom.ajax.api.AjaxComponent;
-import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
-import org.apache.myfaces.custom.ajax.AjaxCallbacks;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
-import java.io.IOException;
-
-/**
- * User: Travis Reeder
- * Date: Mar 22, 2006
- * Time: 4:37:53 PM
- */
-public class HtmlCommandButtonAjax extends HtmlCommandButton implements AjaxComponent, AjaxCallbacks
-{
-    private static final Log log = LogFactory.getLog(HtmlInputTextAjax.class);
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCommandButtonAjax";
-    public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CommandButtonAjax";
-
-    private String onSuccess;
-    private String onFailure;
-    private String onStart;
-    private String errorStyleClass;
-    private String errorStyle;
-
-    public HtmlCommandButtonAjax()
-    {
-        super();
-        setRendererType(DEFAULT_RENDERER_TYPE);
-        setType("button"); // we don't want this to submit
-        setOnclick("");
-    }
-
-    /**
-     * Decode ajax request and apply value changes
-     *
-     * @param context
-     */
-    public void decodeAjax(FacesContext context)
-    {
-        log.debug("entering HtmlCommandButtonAjax.decodeAjax");
-
-        processDecodes(context);
-        processValidators(context);
-        processUpdates(context);
-        //context.getViewRoot().processApplication(context);
-        if (log.isDebugEnabled())
-        {
-            Object valOb = this.getValue();
-            log.debug("value object after decodeAjax: " + valOb);
-        }
-
-    }
-
-    public void encodeAjax(FacesContext context) throws IOException
-    {
-        log.debug("encodeAjax in HtmlCommandButtonAjax");
-        if (context == null) throw new NullPointerException("context");
-        if (!isRendered()) return;
-        Renderer renderer = getRenderer(context);
-
-        if (renderer != null && renderer instanceof AjaxRenderer)
-        {
-            ((AjaxRenderer) renderer).encodeAjax(context, this);
-
-        }
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = onSuccess;
-        values[2] = onFailure;
-        values[3] = onStart;
-        values[4] = errorStyleClass;
-        values[5] = errorStyle;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[]) state;
-        super.restoreState(context, values[0]);
-        onSuccess = (String) values[1];
-        onFailure = (String) values[2];
-        onStart = (String) values[3];
-        errorStyleClass = (String) values[4];
-        errorStyle = (String) values[5];
-    }
-
-    public String getOnSuccess()
-    {
-        return onSuccess;
-    }
-
-    public void setOnSuccess(String onSuccess)
-    {
-        this.onSuccess = onSuccess;
-    }
-
-    public String getOnFailure()
-    {
-        return onFailure;
-    }
-
-    public void setOnFailure(String onFailure)
-    {
-        this.onFailure = onFailure;
-    }
-
-    public String getOnStart()
-    {
-        return onStart;
-    }
-
-    public void setOnStart(String onStart)
-    {
-        this.onStart = onStart;
-    }
-
-
-    public String getErrorStyleClass()
-    {
-        return errorStyleClass;
-    }
-
-    public void setErrorStyleClass(String errorStyleClass)
-    {
-        this.errorStyleClass = errorStyleClass;
-    }
-
-    public String getErrorStyle()
-    {
-        return errorStyle;
-    }
-
-    public void setErrorStyle(String errorStyle)
-    {
-        this.errorStyle = errorStyle;
-    }
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import org.apache.myfaces.component.html.ext.HtmlCommandButton;
+import org.apache.myfaces.custom.ajax.api.AjaxComponent;
+import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
+import org.apache.myfaces.custom.ajax.AjaxCallbacks;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
+import java.io.IOException;
+
+/**
+ * User: Travis Reeder
+ * Date: Mar 22, 2006
+ * Time: 4:37:53 PM
+ */
+public class HtmlCommandButtonAjax extends HtmlCommandButton implements AjaxComponent, AjaxCallbacks
+{
+    private static final Log log = LogFactory.getLog(HtmlInputTextAjax.class);
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCommandButtonAjax";
+    public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CommandButtonAjax";
+
+    private String onSuccess;
+    private String onFailure;
+    private String onStart;
+    private String errorStyleClass;
+    private String errorStyle;
+
+    public HtmlCommandButtonAjax()
+    {
+        super();
+        setRendererType(DEFAULT_RENDERER_TYPE);
+        setType("button"); // we don't want this to submit
+        setOnclick("");
+    }
+
+    /**
+     * Decode ajax request and apply value changes
+     *
+     * @param context
+     */
+    public void decodeAjax(FacesContext context)
+    {
+        log.debug("entering HtmlCommandButtonAjax.decodeAjax");
+
+        processDecodes(context);
+        processValidators(context);
+        processUpdates(context);
+        //context.getViewRoot().processApplication(context);
+        if (log.isDebugEnabled())
+        {
+            Object valOb = this.getValue();
+            log.debug("value object after decodeAjax: " + valOb);
+        }
+
+    }
+
+    public void encodeAjax(FacesContext context) throws IOException
+    {
+        log.debug("encodeAjax in HtmlCommandButtonAjax");
+        if (context == null) throw new NullPointerException("context");
+        if (!isRendered()) return;
+        Renderer renderer = getRenderer(context);
+
+        if (renderer != null && renderer instanceof AjaxRenderer)
+        {
+            ((AjaxRenderer) renderer).encodeAjax(context, this);
+
+        }
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = onSuccess;
+        values[2] = onFailure;
+        values[3] = onStart;
+        values[4] = errorStyleClass;
+        values[5] = errorStyle;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[]) state;
+        super.restoreState(context, values[0]);
+        onSuccess = (String) values[1];
+        onFailure = (String) values[2];
+        onStart = (String) values[3];
+        errorStyleClass = (String) values[4];
+        errorStyle = (String) values[5];
+    }
+
+    public String getOnSuccess()
+    {
+        return onSuccess;
+    }
+
+    public void setOnSuccess(String onSuccess)
+    {
+        this.onSuccess = onSuccess;
+    }
+
+    public String getOnFailure()
+    {
+        return onFailure;
+    }
+
+    public void setOnFailure(String onFailure)
+    {
+        this.onFailure = onFailure;
+    }
+
+    public String getOnStart()
+    {
+        return onStart;
+    }
+
+    public void setOnStart(String onStart)
+    {
+        this.onStart = onStart;
+    }
+
+
+    public String getErrorStyleClass()
+    {
+        return errorStyleClass;
+    }
+
+    public void setErrorStyleClass(String errorStyleClass)
+    {
+        this.errorStyleClass = errorStyleClass;
+    }
+
+    public String getErrorStyle()
+    {
+        return errorStyle;
+    }
+
+    public void setErrorStyle(String errorStyle)
+    {
+        this.errorStyle = errorStyle;
+    }
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxRenderer.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxRenderer.java Tue Aug  1 10:43:28 2006
@@ -1,105 +1,105 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import org.apache.myfaces.renderkit.html.ext.HtmlButtonRenderer;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
-import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.component.UIComponent;
-import java.io.IOException;
-
-/**
- * User: Travis Reeder
- * Date: Mar 22, 2006
- * Time: 4:38:13 PM
- */
-public class HtmlCommandButtonAjaxRenderer extends HtmlButtonRenderer implements AjaxRenderer
-{
-    private static final Log log = LogFactory.getLog(HtmlCommandButtonAjaxRenderer.class);
-    private static final String JAVASCRIPT_ENCODED = "org.apache.myfaces.custom.inputAjax.HtmlCommandButtonAjax.JAVASCRIPT_ENCODED";
-
-
-    /**
-     * Encodes any stand-alone javascript functions that are needed.
-     * Uses either the extension filter, or a
-     * user-supplied location for the javascript files.
-     *
-     * @param context   FacesContext
-     * @param component UIComponent
-     * @throws java.io.IOException
-     */
-    private void encodeJavascript(FacesContext context, UIComponent component) throws IOException
-    {
-        HtmlCommandButtonAjax comp = (HtmlCommandButtonAjax) component;
-
-        AddResource addResource = AddResourceFactory.getInstance(context);
-
-        AjaxRendererUtils.addPrototypeScript(context, component, addResource);
-
-        ResponseWriter out = context.getResponseWriter();
-        AjaxRendererUtils.writeAjaxScript(context, out, comp);
-
-        context.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
-    }
-
-
-
-
-    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
-    {
-        log.debug("encodeEnd in HtmlCommandButtonAjaxRenderer");
-        RendererUtils.checkParamValidity(context, component, HtmlCommandButtonAjax.class);
-
-        if (HtmlRendererUtils.isDisplayValueOnly(component) || isDisabled(context, component))
-        {
-            super.encodeEnd(context, component);
-            return;
-        }
-
-
-
-
-        String clientId = component.getClientId(context);
-        String submitFunctionStart = AjaxRendererUtils.JS_MYFACES_NAMESPACE + "ajaxSubmit3('" + clientId + "');";
-        HtmlCommandButtonAjax comp = (HtmlCommandButtonAjax) component;
-        //comp.setOnclick(comp.getOnclick() == null ? submitFunctionStart : comp.getOnclick() + ";" + submitFunctionStart);
-        comp.setOnclick(submitFunctionStart);
-        String loadingStyleClass = AjaxRendererUtils.STYLECLASS_LOADER;
-        //comp.setStyleClass(comp.getStyleClass() == null ? loadingStyleClass : comp.getStyleClass() + ";" + loadingStyleClass);
-        //comp.setStyleClass(loadingStyleClass);
-
-        this.encodeJavascript(context, component);
-        super.encodeEnd(context, component);
-        // now write loading image
-        AjaxRendererUtils.writeLoadingImage(context, comp);
-    }
-
-    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
-    {
-        log.debug("encodeAjax in HtmlCommandButtonAjaxRenderer");
-        AjaxRendererUtils.encodeAjax(context, component);
-    }
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import org.apache.myfaces.renderkit.html.ext.HtmlButtonRenderer;
+import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
+import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
+import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.component.UIComponent;
+import java.io.IOException;
+
+/**
+ * User: Travis Reeder
+ * Date: Mar 22, 2006
+ * Time: 4:38:13 PM
+ */
+public class HtmlCommandButtonAjaxRenderer extends HtmlButtonRenderer implements AjaxRenderer
+{
+    private static final Log log = LogFactory.getLog(HtmlCommandButtonAjaxRenderer.class);
+    private static final String JAVASCRIPT_ENCODED = "org.apache.myfaces.custom.inputAjax.HtmlCommandButtonAjax.JAVASCRIPT_ENCODED";
+
+
+    /**
+     * Encodes any stand-alone javascript functions that are needed.
+     * Uses either the extension filter, or a
+     * user-supplied location for the javascript files.
+     *
+     * @param context   FacesContext
+     * @param component UIComponent
+     * @throws java.io.IOException
+     */
+    private void encodeJavascript(FacesContext context, UIComponent component) throws IOException
+    {
+        HtmlCommandButtonAjax comp = (HtmlCommandButtonAjax) component;
+
+        AddResource addResource = AddResourceFactory.getInstance(context);
+
+        AjaxRendererUtils.addPrototypeScript(context, component, addResource);
+
+        ResponseWriter out = context.getResponseWriter();
+        AjaxRendererUtils.writeAjaxScript(context, out, comp);
+
+        context.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
+    }
+
+
+
+
+    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+    {
+        log.debug("encodeEnd in HtmlCommandButtonAjaxRenderer");
+        RendererUtils.checkParamValidity(context, component, HtmlCommandButtonAjax.class);
+
+        if (HtmlRendererUtils.isDisplayValueOnly(component) || isDisabled(context, component))
+        {
+            super.encodeEnd(context, component);
+            return;
+        }
+
+
+
+
+        String clientId = component.getClientId(context);
+        String submitFunctionStart = AjaxRendererUtils.JS_MYFACES_NAMESPACE + "ajaxSubmit3('" + clientId + "');";
+        HtmlCommandButtonAjax comp = (HtmlCommandButtonAjax) component;
+        //comp.setOnclick(comp.getOnclick() == null ? submitFunctionStart : comp.getOnclick() + ";" + submitFunctionStart);
+        comp.setOnclick(submitFunctionStart);
+        String loadingStyleClass = AjaxRendererUtils.STYLECLASS_LOADER;
+        //comp.setStyleClass(comp.getStyleClass() == null ? loadingStyleClass : comp.getStyleClass() + ";" + loadingStyleClass);
+        //comp.setStyleClass(loadingStyleClass);
+
+        this.encodeJavascript(context, component);
+        super.encodeEnd(context, component);
+        // now write loading image
+        AjaxRendererUtils.writeLoadingImage(context, comp);
+    }
+
+    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
+    {
+        log.debug("encodeAjax in HtmlCommandButtonAjaxRenderer");
+        AjaxRendererUtils.encodeAjax(context, component);
+    }
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxTag.java Tue Aug  1 10:43:28 2006
@@ -1,53 +1,53 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import org.apache.myfaces.taglib.html.ext.HtmlCommandButtonTag;
-
-import javax.faces.component.UIComponent;
-
-/**
- * User: Travis Reeder
- * Date: Mar 22, 2006
- * Time: 4:37:07 PM
- */
-public class HtmlCommandButtonAjaxTag extends HtmlCommandButtonTag
-{
-    public String getComponentType()
-    {
-        return HtmlCommandButtonAjax.COMPONENT_TYPE;
-    }
-
-    /**
-     * @return the RendererType String
-     */
-    public String getRendererType()
-    {
-        return HtmlCommandButtonAjax.DEFAULT_RENDERER_TYPE;
-    }
-
-    public void release()
-    {
-        super.release();
-    }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-    }
-
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import org.apache.myfaces.taglib.html.ext.HtmlCommandButtonTag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * User: Travis Reeder
+ * Date: Mar 22, 2006
+ * Time: 4:37:07 PM
+ */
+public class HtmlCommandButtonAjaxTag extends HtmlCommandButtonTag
+{
+    public String getComponentType()
+    {
+        return HtmlCommandButtonAjax.COMPONENT_TYPE;
+    }
+
+    /**
+     * @return the RendererType String
+     */
+    public String getRendererType()
+    {
+        return HtmlCommandButtonAjax.DEFAULT_RENDERER_TYPE;
+    }
+
+    public void release()
+    {
+        super.release();
+    }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+    }
+
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlCommandButtonAjaxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlMessageRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlMessageTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjax.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjax.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjax.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjax.java Tue Aug  1 10:43:28 2006
@@ -1,195 +1,195 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.component.html.ext.HtmlSelectManyCheckbox;
-import org.apache.myfaces.custom.ajax.AjaxCallbacks;
-import org.apache.myfaces.custom.ajax.api.AjaxComponent;
-import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
-
-/**
- * Current limitations
- * - Bound value must be a Collection of Strings!
- *
- * @author Travis Reeder (latest modification by $Author: mmarinschek $)
- * @version $Revision: 290397 $ $Date: 2005-09-20 10:35:09 +0200 (Di, 20 Sep 2005) $
- */
-public class HtmlSelectManyCheckboxAjax extends HtmlSelectManyCheckbox implements AjaxComponent, AjaxCallbacks
-{
-    private static final Log log = LogFactory.getLog(HtmlSelectManyCheckboxAjax.class);
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyCheckboxAjax";
-    public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CheckboxAjax";
-
-    private String onSuccess;
-    private String onFailure;
-    private String onStart;
-
-    public HtmlSelectManyCheckboxAjax()
-    {
-        super();
-        setRendererType(DEFAULT_RENDERER_TYPE);
-    }
-
-    /**
-     * Decode ajax request and apply value changes
-     *
-     * @param context
-     */
-    public void decodeAjax(FacesContext context)
-    {
-        log.debug("entering HtmlSelectManyCheckboxAjax.decodeAjax");
-
-        // this requires special handling
-        // should maybe put the end collection, "c" into the EditableValueHolder as request params: ((EditableValueHolder) component).setSubmittedValue(reqValues);
-        Map requestParams = context.getExternalContext().getRequestParameterMap();
-
-        String elname = (String) requestParams.get("elname");
-        String elvalue = (String) requestParams.get("elvalue");
-        String checkedStr = (String) requestParams.get("checked");
-        //System.out.println("checkedStr: " + checkedStr);
-        boolean checked = Boolean.valueOf(checkedStr).booleanValue();
-        //System.out.println("checked: " + checked);
-        // now apply this to the
-        Object valOb = this.getValue();
-        //System.out.println("valOb: " + valOb);
-        if(valOb instanceof Collection){
-            // then all good
-            //System.out.println("valob is collection");
-            log.debug("valOb is collection");
-            Collection c = (Collection) valOb;
-            updateChosenValue(c, elname, elvalue, checked);
-        } else {
-            log.error("Invalid chosen values type in HtmlSelectManyCheckbox");
-        }
-
-        // now the rest of the lifecycle
-        processValidators(context);
-        processUpdates(context);
-        //context.getViewRoot().processApplication(context);
-    }
-    /**
-     * Will find the chosen value in the chosenValues list and update set or unset accordingly.
-     *
-     * @param c
-     * @param elname
-     * @param elvalue
-     * @param checked
-     */
-    public void updateChosenValue(Collection c, String elname, String elvalue, boolean checked) {
-        boolean found = false;
-        if (c != null) {
-            Iterator iter = c.iterator();
-            while (iter.hasNext())
-            {
-                String value = (String) iter.next();
-                if (value.equals(elvalue)) {
-                    found = true;
-                    if (!checked) {
-                        // then remove
-                        log.debug("Removing elvalue: " + elvalue);
-                        iter.remove();
-                    } else {
-                        // would this ever happen?
-                    }
-                    break;
-                }
-            }
-            if (!found && checked) {
-                // then add it
-                log.debug("Adding elvalue: " + elvalue);
-                c.add(elvalue);
-            }
-        } else {
-            log.error("LIST IS NULL!!!");
-        }
-    }
-
-    public void encodeAjax(FacesContext context) throws IOException
-    {
-        //log.debug("encodeAjax in HtmlSelectManyCheckbox");
-        if (context == null) throw new NullPointerException("context");
-        if (!isRendered()) return;
-        Renderer renderer = getRenderer(context);
-
-        if (renderer != null && renderer instanceof AjaxRenderer)
-        {
-            ((AjaxRenderer) renderer).encodeAjax(context, this);
-
-        }
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[4];
-        values[0] = super.saveState(context);
-        values[1] = onSuccess;
-        values[2] = onFailure;
-        values[3] = onStart;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        onSuccess = (String)values[1];
-        onFailure = (String)values[2];
-        onStart = (String)values[3];
-    }
-
-    public String getOnSuccess()
-    {
-        return onSuccess;
-    }
-
-    public void setOnSuccess(String onSuccess)
-    {
-        this.onSuccess = onSuccess;
-    }
-
-    public String getOnFailure()
-    {
-        return onFailure;
-    }
-
-    public void setOnFailure(String onFailure)
-    {
-        this.onFailure = onFailure;
-    }
-
-    public String getOnStart()
-    {
-        return onStart;
-    }
-
-    public void setOnStart(String onStart)
-    {
-        this.onStart = onStart;
-    }
-
-
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.component.html.ext.HtmlSelectManyCheckbox;
+import org.apache.myfaces.custom.ajax.AjaxCallbacks;
+import org.apache.myfaces.custom.ajax.api.AjaxComponent;
+import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
+
+/**
+ * Current limitations
+ * - Bound value must be a Collection of Strings!
+ *
+ * @author Travis Reeder (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 290397 $ $Date: 2005-09-20 10:35:09 +0200 (Di, 20 Sep 2005) $
+ */
+public class HtmlSelectManyCheckboxAjax extends HtmlSelectManyCheckbox implements AjaxComponent, AjaxCallbacks
+{
+    private static final Log log = LogFactory.getLog(HtmlSelectManyCheckboxAjax.class);
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyCheckboxAjax";
+    public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.CheckboxAjax";
+
+    private String onSuccess;
+    private String onFailure;
+    private String onStart;
+
+    public HtmlSelectManyCheckboxAjax()
+    {
+        super();
+        setRendererType(DEFAULT_RENDERER_TYPE);
+    }
+
+    /**
+     * Decode ajax request and apply value changes
+     *
+     * @param context
+     */
+    public void decodeAjax(FacesContext context)
+    {
+        log.debug("entering HtmlSelectManyCheckboxAjax.decodeAjax");
+
+        // this requires special handling
+        // should maybe put the end collection, "c" into the EditableValueHolder as request params: ((EditableValueHolder) component).setSubmittedValue(reqValues);
+        Map requestParams = context.getExternalContext().getRequestParameterMap();
+
+        String elname = (String) requestParams.get("elname");
+        String elvalue = (String) requestParams.get("elvalue");
+        String checkedStr = (String) requestParams.get("checked");
+        //System.out.println("checkedStr: " + checkedStr);
+        boolean checked = Boolean.valueOf(checkedStr).booleanValue();
+        //System.out.println("checked: " + checked);
+        // now apply this to the
+        Object valOb = this.getValue();
+        //System.out.println("valOb: " + valOb);
+        if(valOb instanceof Collection){
+            // then all good
+            //System.out.println("valob is collection");
+            log.debug("valOb is collection");
+            Collection c = (Collection) valOb;
+            updateChosenValue(c, elname, elvalue, checked);
+        } else {
+            log.error("Invalid chosen values type in HtmlSelectManyCheckbox");
+        }
+
+        // now the rest of the lifecycle
+        processValidators(context);
+        processUpdates(context);
+        //context.getViewRoot().processApplication(context);
+    }
+    /**
+     * Will find the chosen value in the chosenValues list and update set or unset accordingly.
+     *
+     * @param c
+     * @param elname
+     * @param elvalue
+     * @param checked
+     */
+    public void updateChosenValue(Collection c, String elname, String elvalue, boolean checked) {
+        boolean found = false;
+        if (c != null) {
+            Iterator iter = c.iterator();
+            while (iter.hasNext())
+            {
+                String value = (String) iter.next();
+                if (value.equals(elvalue)) {
+                    found = true;
+                    if (!checked) {
+                        // then remove
+                        log.debug("Removing elvalue: " + elvalue);
+                        iter.remove();
+                    } else {
+                        // would this ever happen?
+                    }
+                    break;
+                }
+            }
+            if (!found && checked) {
+                // then add it
+                log.debug("Adding elvalue: " + elvalue);
+                c.add(elvalue);
+            }
+        } else {
+            log.error("LIST IS NULL!!!");
+        }
+    }
+
+    public void encodeAjax(FacesContext context) throws IOException
+    {
+        //log.debug("encodeAjax in HtmlSelectManyCheckbox");
+        if (context == null) throw new NullPointerException("context");
+        if (!isRendered()) return;
+        Renderer renderer = getRenderer(context);
+
+        if (renderer != null && renderer instanceof AjaxRenderer)
+        {
+            ((AjaxRenderer) renderer).encodeAjax(context, this);
+
+        }
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[4];
+        values[0] = super.saveState(context);
+        values[1] = onSuccess;
+        values[2] = onFailure;
+        values[3] = onStart;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        onSuccess = (String)values[1];
+        onFailure = (String)values[2];
+        onStart = (String)values[3];
+    }
+
+    public String getOnSuccess()
+    {
+        return onSuccess;
+    }
+
+    public void setOnSuccess(String onSuccess)
+    {
+        this.onSuccess = onSuccess;
+    }
+
+    public String getOnFailure()
+    {
+        return onFailure;
+    }
+
+    public void setOnFailure(String onFailure)
+    {
+        this.onFailure = onFailure;
+    }
+
+    public String getOnStart()
+    {
+        return onStart;
+    }
+
+    public void setOnStart(String onStart)
+    {
+        this.onStart = onStart;
+    }
+
+
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java Tue Aug  1 10:43:28 2006
@@ -1,122 +1,122 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
-import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
-import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.ext.HtmlCheckboxRenderer;
-
-/**
- * For onSuccess, onFailure, onStart functions, they should accept (elname, elvalue) attributes for the specific item
- * <p/>
- * User: treeder
- * Date: Oct 20, 2005
- * Time: 3:28:04 PM
- */
-public class HtmlSelectManyCheckboxAjaxRenderer extends HtmlCheckboxRenderer implements AjaxRenderer
-{
-    private static final Log log = LogFactory.getLog(HtmlSelectManyCheckboxAjaxRenderer.class);
-    private static final String JAVASCRIPT_ENCODED = "org.apache.myfaces.custom.inputAjax.HtmlSelectManyCheckbox.JAVASCRIPT_ENCODED";
-
-
-    /**
-     * Encodes any stand-alone javascript functions that are needed.
-     * Uses either the extension filter, or a
-     * user-supplied location for the javascript files.
-     *
-     * @param context   FacesContext
-     * @param component UIComponent
-     * @throws java.io.IOException
-     */
-    private void encodeJavascript(FacesContext context, UIComponent component) throws IOException
-    {
-
-        HtmlSelectManyCheckboxAjax selectManyCheckbox = (HtmlSelectManyCheckboxAjax) component;
-
-        AddResource addResource = AddResourceFactory.getInstance(context);
-
-        AjaxRendererUtils.addPrototypeScript(context, component, addResource);
-
-        ResponseWriter out = context.getResponseWriter();
-
-        String extraParams =("&checked=\" + el.checked + \"");
-        AjaxRendererUtils.writeAjaxScript(context, out, selectManyCheckbox, extraParams);
-
-        context.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
-    }
-
-
-    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
-    {
-        RendererUtils.checkParamValidity(context, component, HtmlSelectManyCheckboxAjax.class);
-
-        if (HtmlRendererUtils.isDisplayValueOnly(component) || isDisabled(context, component))
-        {
-            super.encodeEnd(context, component);
-            return;
-        }
-
-        String clientId = component.getClientId(context);
-
-        HtmlSelectManyCheckboxAjax selectManyCheckbox = (HtmlSelectManyCheckboxAjax) component;
-
-        // allow for user defined onclick's as well
-        String onClick = selectManyCheckbox.getOnclick();
-        if(onClick == null){
-            onClick = "";
-        }
-        // todo: this was doublling up, so took out the + onclick below, need a way for user onclicks to work still
-        onClick = AjaxRendererUtils.JS_MYFACES_NAMESPACE + "ajaxSubmit2(this, '" + clientId + "'); "; // + onClick;
-        selectManyCheckbox.setOnclick(onClick);
-
-        this.encodeJavascript(context, component);
-
-        super.encodeEnd(context, component);
-        AjaxRendererUtils.writeLoadingImage(context, component);
-
-    }
-
-    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
-    {
-        log.debug("encodeAjax in HtmlSelectManyCheckboxAjaxRenderer");
-        // check for request type (portlet support)
-        HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
-        Map extraReturnAttributes = new HashMap();
-        extraReturnAttributes.put("checked", request.getParameter("checked"));
-        extraReturnAttributes.put("eltype", "checkbox");
-        AjaxRendererUtils.encodeAjax(context, component, extraReturnAttributes);
-
-
-    }
-
-
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
+import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
+import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.ext.HtmlCheckboxRenderer;
+
+/**
+ * For onSuccess, onFailure, onStart functions, they should accept (elname, elvalue) attributes for the specific item
+ * <p/>
+ * User: treeder
+ * Date: Oct 20, 2005
+ * Time: 3:28:04 PM
+ */
+public class HtmlSelectManyCheckboxAjaxRenderer extends HtmlCheckboxRenderer implements AjaxRenderer
+{
+    private static final Log log = LogFactory.getLog(HtmlSelectManyCheckboxAjaxRenderer.class);
+    private static final String JAVASCRIPT_ENCODED = "org.apache.myfaces.custom.inputAjax.HtmlSelectManyCheckbox.JAVASCRIPT_ENCODED";
+
+
+    /**
+     * Encodes any stand-alone javascript functions that are needed.
+     * Uses either the extension filter, or a
+     * user-supplied location for the javascript files.
+     *
+     * @param context   FacesContext
+     * @param component UIComponent
+     * @throws java.io.IOException
+     */
+    private void encodeJavascript(FacesContext context, UIComponent component) throws IOException
+    {
+
+        HtmlSelectManyCheckboxAjax selectManyCheckbox = (HtmlSelectManyCheckboxAjax) component;
+
+        AddResource addResource = AddResourceFactory.getInstance(context);
+
+        AjaxRendererUtils.addPrototypeScript(context, component, addResource);
+
+        ResponseWriter out = context.getResponseWriter();
+
+        String extraParams =("&checked=\" + el.checked + \"");
+        AjaxRendererUtils.writeAjaxScript(context, out, selectManyCheckbox, extraParams);
+
+        context.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
+    }
+
+
+    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+    {
+        RendererUtils.checkParamValidity(context, component, HtmlSelectManyCheckboxAjax.class);
+
+        if (HtmlRendererUtils.isDisplayValueOnly(component) || isDisabled(context, component))
+        {
+            super.encodeEnd(context, component);
+            return;
+        }
+
+        String clientId = component.getClientId(context);
+
+        HtmlSelectManyCheckboxAjax selectManyCheckbox = (HtmlSelectManyCheckboxAjax) component;
+
+        // allow for user defined onclick's as well
+        String onClick = selectManyCheckbox.getOnclick();
+        if(onClick == null){
+            onClick = "";
+        }
+        // todo: this was doublling up, so took out the + onclick below, need a way for user onclicks to work still
+        onClick = AjaxRendererUtils.JS_MYFACES_NAMESPACE + "ajaxSubmit2(this, '" + clientId + "'); "; // + onClick;
+        selectManyCheckbox.setOnclick(onClick);
+
+        this.encodeJavascript(context, component);
+
+        super.encodeEnd(context, component);
+        AjaxRendererUtils.writeLoadingImage(context, component);
+
+    }
+
+    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
+    {
+        log.debug("encodeAjax in HtmlSelectManyCheckboxAjaxRenderer");
+        // check for request type (portlet support)
+        HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
+        Map extraReturnAttributes = new HashMap();
+        extraReturnAttributes.put("checked", request.getParameter("checked"));
+        extraReturnAttributes.put("eltype", "checkbox");
+        AjaxRendererUtils.encodeAjax(context, component, extraReturnAttributes);
+
+
+    }
+
+
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxTag.java Tue Aug  1 10:43:28 2006
@@ -1,91 +1,91 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import javax.faces.component.UIComponent;
-
-import org.apache.myfaces.custom.ajax.AjaxCallbacks;
-import org.apache.myfaces.taglib.html.ext.HtmlSelectManyCheckboxTag;
-
-/**
-* @author Travis Reeder (latest modification by $Author: svieujot $)
-* @version $Revision: 169739 $ $Date: 2005-05-12 02:45:14 +0200 (Thu, 12 May 2005) $
-*/
-public class HtmlSelectManyCheckboxAjaxTag extends HtmlSelectManyCheckboxTag implements AjaxCallbacks
-{
-    private String onSuccess;
-    private String onFailure;
-    private String onStart;
-
-    public void release()
-    {
-        super.release();
-        onSuccess = null;
-        onFailure = null;
-        onStart = null;
-    }
-     protected void setProperties(UIComponent component) {
-        super.setProperties(component);
-
-        setStringProperty(component, "onSuccess", onSuccess);
-        setStringProperty(component, "onFailure", onFailure);
-        setStringProperty(component, "onStart", onStart);
-    }
-
-     public String getComponentType() {
-        return HtmlSelectManyCheckboxAjax.COMPONENT_TYPE;
-    }
-
-    /**
-     * @return the RendererType String
-     */
-    public String getRendererType() {
-        return HtmlSelectManyCheckboxAjax.DEFAULT_RENDERER_TYPE;
-    }
-
-    public String getOnSuccess()
-    {
-        return onSuccess;
-    }
-
-    public void setOnSuccess(String onSuccess)
-    {
-        this.onSuccess = onSuccess;
-    }
-
-    public String getOnFailure()
-    {
-        return onFailure;
-    }
-
-    public void setOnFailure(String onFailure)
-    {
-        this.onFailure = onFailure;
-    }
-
-    public String getOnStart()
-    {
-        return onStart;
-    }
-
-    public void setOnStart(String onStart)
-    {
-        this.onStart = onStart;
-    }
-
-
-
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.custom.ajax.AjaxCallbacks;
+import org.apache.myfaces.taglib.html.ext.HtmlSelectManyCheckboxTag;
+
+/**
+* @author Travis Reeder (latest modification by $Author: svieujot $)
+* @version $Revision: 169739 $ $Date: 2005-05-12 02:45:14 +0200 (Thu, 12 May 2005) $
+*/
+public class HtmlSelectManyCheckboxAjaxTag extends HtmlSelectManyCheckboxTag implements AjaxCallbacks
+{
+    private String onSuccess;
+    private String onFailure;
+    private String onStart;
+
+    public void release()
+    {
+        super.release();
+        onSuccess = null;
+        onFailure = null;
+        onStart = null;
+    }
+     protected void setProperties(UIComponent component) {
+        super.setProperties(component);
+
+        setStringProperty(component, "onSuccess", onSuccess);
+        setStringProperty(component, "onFailure", onFailure);
+        setStringProperty(component, "onStart", onStart);
+    }
+
+     public String getComponentType() {
+        return HtmlSelectManyCheckboxAjax.COMPONENT_TYPE;
+    }
+
+    /**
+     * @return the RendererType String
+     */
+    public String getRendererType() {
+        return HtmlSelectManyCheckboxAjax.DEFAULT_RENDERER_TYPE;
+    }
+
+    public String getOnSuccess()
+    {
+        return onSuccess;
+    }
+
+    public void setOnSuccess(String onSuccess)
+    {
+        this.onSuccess = onSuccess;
+    }
+
+    public String getOnFailure()
+    {
+        return onFailure;
+    }
+
+    public void setOnFailure(String onFailure)
+    {
+        this.onFailure = onFailure;
+    }
+
+    public String getOnStart()
+    {
+        return onStart;
+    }
+
+    public void setOnStart(String onStart)
+    {
+        this.onStart = onStart;
+    }
+
+
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/Listener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/Listener.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/Listener.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/Listener.java Tue Aug  1 10:43:28 2006
@@ -1,104 +1,104 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
-
-/**
- * On is the id of the component you want to listen on.
- * eventType is what happened to the component, for instance "onChange"
- * action is what to do if the event occurs, default is "update".  Will be able to call arbitrary javascript functions too.
- *
- * NOTE: eventType and action are NOT implemented yet
- *
- * User: Travis Reeder
- * Date: Apr 5, 2006
- * Time: 4:33:10 PM
- */
-public class Listener extends UIComponentBase
-{
-    public static final String FAMILY = "org.apache.myfaces.Listener";
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.Listener";
-    public static final String LISTENER_MAP_ENTRY = "org.apache.myfaces.Listener";
-
-    private String _on;
-    private String _eventType = "onChange";
-    private String _action = "update";
-
-    public Listener()
-    {
-    }
-
-    public boolean isRendered()
-    {
-        return super.isRendered();
-    }
-
-    public String getFamily()
-    {
-        return FAMILY;
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[4];
-        values[0] = super.saveState(context);
-        values[1] = _on;
-        values[2] = _eventType;
-        values[3] = _action;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[]) state;
-        super.restoreState(context, values[0]);
-        _on = (String) values[1];
-        _eventType = (String) values[2];
-        _action = (String) values[3];
-    }
-
-    public String getOn()
-    {
-        return _on;
-    }
-
-    public void setOn(String on)
-    {
-        _on = on;
-    }
-
-    public String getEventType()
-    {
-        return _eventType;
-    }
-
-    public void setEventType(String eventType)
-    {
-        _eventType = eventType;
-    }
-
-    public String getAction()
-    {
-        return _action;
-    }
-
-    public void setAction(String action)
-    {
-        _action = action;
-    }
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
+
+/**
+ * On is the id of the component you want to listen on.
+ * eventType is what happened to the component, for instance "onChange"
+ * action is what to do if the event occurs, default is "update".  Will be able to call arbitrary javascript functions too.
+ *
+ * NOTE: eventType and action are NOT implemented yet
+ *
+ * User: Travis Reeder
+ * Date: Apr 5, 2006
+ * Time: 4:33:10 PM
+ */
+public class Listener extends UIComponentBase
+{
+    public static final String FAMILY = "org.apache.myfaces.Listener";
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.Listener";
+    public static final String LISTENER_MAP_ENTRY = "org.apache.myfaces.Listener";
+
+    private String _on;
+    private String _eventType = "onChange";
+    private String _action = "update";
+
+    public Listener()
+    {
+    }
+
+    public boolean isRendered()
+    {
+        return super.isRendered();
+    }
+
+    public String getFamily()
+    {
+        return FAMILY;
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[4];
+        values[0] = super.saveState(context);
+        values[1] = _on;
+        values[2] = _eventType;
+        values[3] = _action;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[]) state;
+        super.restoreState(context, values[0]);
+        _on = (String) values[1];
+        _eventType = (String) values[2];
+        _action = (String) values[3];
+    }
+
+    public String getOn()
+    {
+        return _on;
+    }
+
+    public void setOn(String on)
+    {
+        _on = on;
+    }
+
+    public String getEventType()
+    {
+        return _eventType;
+    }
+
+    public void setEventType(String eventType)
+    {
+        _eventType = eventType;
+    }
+
+    public String getAction()
+    {
+        return _action;
+    }
+
+    public void setAction(String action)
+    {
+        _action = action;
+    }
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/Listener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/ListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/ListenerTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/ListenerTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/ListenerTag.java Tue Aug  1 10:43:28 2006
@@ -1,89 +1,89 @@
-/*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed 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.custom.inputAjax;
-
-import javax.faces.component.UIComponent;
-import javax.faces.webapp.UIComponentTag;
-
-import org.apache.myfaces.shared_tomahawk.taglib.UIComponentTagUtils;
-
-/**
- * User: Travis Reeder
- * Date: Apr 5, 2006
- * Time: 4:14:07 PM
- */
-public class ListenerTag extends UIComponentTag
-{
-    private String _on;
-    private String _eventType;
-    private String _action;
-
-    public void release()
-    {
-        super.release();
-        _on = null;
-        _eventType = null;
-        _action = null;
-    }
-
-    public String getComponentType()
-    {
-        return Listener.COMPONENT_TYPE;
-    }
-
-    public String getRendererType()
-    {
-        return null;
-    }
-
-    protected void setProperties(UIComponent uiComponent)
-    {
-        super.setProperties(uiComponent);
-        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "on", _on);
-        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "eventType", _eventType);
-        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "action", _action);
-    }
-
-    public String getOn()
-    {
-        return _on;
-    }
-
-    public void setOn(String on)
-    {
-        _on = on;
-    }
-
-    public String getEventType()
-    {
-        return _eventType;
-    }
-
-    public void setEventType(String eventType)
-    {
-        _eventType = eventType;
-    }
-
-    public String getAction()
-    {
-        return _action;
-    }
-
-    public void setAction(String action)
-    {
-        _action = action;
-    }
-}
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.inputAjax;
+
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.UIComponentTag;
+
+import org.apache.myfaces.shared_tomahawk.taglib.UIComponentTagUtils;
+
+/**
+ * User: Travis Reeder
+ * Date: Apr 5, 2006
+ * Time: 4:14:07 PM
+ */
+public class ListenerTag extends UIComponentTag
+{
+    private String _on;
+    private String _eventType;
+    private String _action;
+
+    public void release()
+    {
+        super.release();
+        _on = null;
+        _eventType = null;
+        _action = null;
+    }
+
+    public String getComponentType()
+    {
+        return Listener.COMPONENT_TYPE;
+    }
+
+    public String getRendererType()
+    {
+        return null;
+    }
+
+    protected void setProperties(UIComponent uiComponent)
+    {
+        super.setProperties(uiComponent);
+        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "on", _on);
+        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "eventType", _eventType);
+        UIComponentTagUtils.setStringProperty(getFacesContext(), uiComponent, "action", _action);
+    }
+
+    public String getOn()
+    {
+        return _on;
+    }
+
+    public void setOn(String on)
+    {
+        _on = on;
+    }
+
+    public String getEventType()
+    {
+        return _eventType;
+    }
+
+    public void setEventType(String eventType)
+    {
+        _eventType = eventType;
+    }
+
+    public String getAction()
+    {
+        return _action;
+    }
+
+    public void setAction(String action)
+    {
+        _action = action;
+    }
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/ListenerTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/SampleValueChangeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ISBNValidator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/isbnvalidator/ValidateISBNTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlSelectManyPicklist.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlSelectManyPicklistTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/AfterScopePhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/AfterScopePhaseListener.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/AfterScopePhaseListener.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/AfterScopePhaseListener.java Tue Aug  1 10:43:28 2006
@@ -1,59 +1,59 @@
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed 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.custom.scope;
-
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
-/**
- * phase listener class which does
- * the needed scope cleanup operations
- *
- * @author Werner Punz werpu@gmx.at
- * @version $Revision$ $Date$
- */
-public class AfterScopePhaseListener implements PhaseListener {
-
-	/**
-     *
-     */
-    private static final long serialVersionUID = 9137086632177423625L;
-
-    /**
-	 * we have to tackle the scope cleanup
-	 * at the latest stage possible
-	 * thus we intercept it at the last phase
-	 * at the after phase stage
-	 */
-	public void afterPhase(PhaseEvent arg0) {
-		ScopeHolder holder = (ScopeHolder) ScopeUtils.getManagedBean(UIScope.SCOPE_CONTAINER_KEY);
-		if(holder != null)
-		    holder.pageRefresh();
-	}
-
-	public void beforePhase(PhaseEvent arg0) {
-	}
-
-	/**
-	 * last phase possible, the render responce phase
-	 */
-	public PhaseId getPhaseId() {
-		return PhaseId.RENDER_RESPONSE;
-	}
-
-}
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.scope;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+/**
+ * phase listener class which does
+ * the needed scope cleanup operations
+ *
+ * @author Werner Punz werpu@gmx.at
+ * @version $Revision$ $Date$
+ */
+public class AfterScopePhaseListener implements PhaseListener {
+
+	/**
+     *
+     */
+    private static final long serialVersionUID = 9137086632177423625L;
+
+    /**
+	 * we have to tackle the scope cleanup
+	 * at the latest stage possible
+	 * thus we intercept it at the last phase
+	 * at the after phase stage
+	 */
+	public void afterPhase(PhaseEvent arg0) {
+		ScopeHolder holder = (ScopeHolder) ScopeUtils.getManagedBean(UIScope.SCOPE_CONTAINER_KEY);
+		if(holder != null)
+		    holder.pageRefresh();
+	}
+
+	public void beforePhase(PhaseEvent arg0) {
+	}
+
+	/**
+	 * last phase possible, the render responce phase
+	 */
+	public PhaseId getPhaseId() {
+		return PhaseId.RENDER_RESPONSE;
+	}
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/AfterScopePhaseListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeHolder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeHolder.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeHolder.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeHolder.java Tue Aug  1 10:43:28 2006
@@ -1,99 +1,99 @@
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed 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.custom.scope;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * A central sessions holder, which stores
- * the triggered scopes and also does
- * the scope synching at the end
- *
- * @author Werner Punz werpu@gmx.at
- *
- */
-public class ScopeHolder implements Serializable
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 2340601728913516991L;
-    /*dunno of a log(n) map is suitable here, after all we have only a handful of scopes*/
-    Map scopeMap = Collections.synchronizedMap(new TreeMap());
-    Map oldScopes = Collections.synchronizedMap(new TreeMap());
-
-    /**
-     * fetches an old scope from the scope map
-     *
-     * @param key
-     * @return Object old scope
-     */
-    public Object restoreScopeEntry(String key)
-    {
-        Object theentry = oldScopes.get(key);
-        return theentry;
-    }
-
-    /**
-     * note we use the global session internally not the portlet one, if you use
-     * portlets please-keep that in mind with your scope names
-     *
-     * @param parent
-     *            the parent component
-     * @param context
-     *            the current faces context
-     * @param scopeBindingValue
-     *            the scope value binding
-     */
-    public void saveScopeEntry(UIComponent parent, FacesContext context,
-            ValueBinding scopeBindingValue)
-    {
-
-        scopeMap.put(scopeBindingValue.getExpressionString(), scopeBindingValue
-                .getValue(context));
-    }
-
-    /**
-     * the rendering is done we need to dump the unused scopes
-     *
-     */
-    public void pageRefresh()
-    {
-        oldScopes = scopeMap;
-        scopeMap = Collections.synchronizedMap(new TreeMap());
-    }
-
-    public void resetScopes()
-    {
-        oldScopes = Collections.synchronizedMap(new TreeMap());
-        scopeMap = Collections.synchronizedMap(new TreeMap());
-    }
-
-    public void resetScope(String key)
-    {
-        oldScopes.remove(key);
-        scopeMap.remove(key);
-    }
-}
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.scope;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * A central sessions holder, which stores
+ * the triggered scopes and also does
+ * the scope synching at the end
+ *
+ * @author Werner Punz werpu@gmx.at
+ *
+ */
+public class ScopeHolder implements Serializable
+{
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 2340601728913516991L;
+    /*dunno of a log(n) map is suitable here, after all we have only a handful of scopes*/
+    Map scopeMap = Collections.synchronizedMap(new TreeMap());
+    Map oldScopes = Collections.synchronizedMap(new TreeMap());
+
+    /**
+     * fetches an old scope from the scope map
+     *
+     * @param key
+     * @return Object old scope
+     */
+    public Object restoreScopeEntry(String key)
+    {
+        Object theentry = oldScopes.get(key);
+        return theentry;
+    }
+
+    /**
+     * note we use the global session internally not the portlet one, if you use
+     * portlets please-keep that in mind with your scope names
+     *
+     * @param parent
+     *            the parent component
+     * @param context
+     *            the current faces context
+     * @param scopeBindingValue
+     *            the scope value binding
+     */
+    public void saveScopeEntry(UIComponent parent, FacesContext context,
+            ValueBinding scopeBindingValue)
+    {
+
+        scopeMap.put(scopeBindingValue.getExpressionString(), scopeBindingValue
+                .getValue(context));
+    }
+
+    /**
+     * the rendering is done we need to dump the unused scopes
+     *
+     */
+    public void pageRefresh()
+    {
+        oldScopes = scopeMap;
+        scopeMap = Collections.synchronizedMap(new TreeMap());
+    }
+
+    public void resetScopes()
+    {
+        oldScopes = Collections.synchronizedMap(new TreeMap());
+        scopeMap = Collections.synchronizedMap(new TreeMap());
+    }
+
+    public void resetScope(String key)
+    {
+        oldScopes.remove(key);
+        scopeMap.remove(key);
+    }
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeHolder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java Tue Aug  1 10:43:28 2006
@@ -1,72 +1,72 @@
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed 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.custom.scope;
-
-import javax.faces.component.UIComponent;
-
-import org.apache.myfaces.shared_tomahawk.taglib.UIComponentTagBase;
-
-/**
- * A class very similar to savestate it allows to defined scopes for variables
- * between session and request, so that you can traverse parameters over forms
- * within sessions but you do not have the full session lifecycle the main
- * advantage over SaveState for this one is, that you do not have to make the
- * objects serializable, the main disadvantage is, scopes need session ram for the
- * time of existence
- *
- * @author Werner Punz werpu@gmx.at
- *
- * @version $Revision$ $Date$
- */
-
-public class ScopeTag extends UIComponentTagBase
-{
-
-    /**
-     * @return the component type
-     */
-    public String getComponentType()
-    {
-        return UIScope.COMPONENT_TYPE;
-    }
-
-    /**
-     * standard setProperties
-     */
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-    }
-
-    /**
-     * standard release
-     */
-    public void release()
-    {
-        super.release();
-    }
-
-    /**
-     * we do not render anything, hence the renderer type results in a plain
-     * null
-     */
-    public String getRendererType()
-    {
-        return null;
-    }
-
-}
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.scope;
+
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.shared_tomahawk.taglib.UIComponentTagBase;
+
+/**
+ * A class very similar to savestate it allows to defined scopes for variables
+ * between session and request, so that you can traverse parameters over forms
+ * within sessions but you do not have the full session lifecycle the main
+ * advantage over SaveState for this one is, that you do not have to make the
+ * objects serializable, the main disadvantage is, scopes need session ram for the
+ * time of existence
+ *
+ * @author Werner Punz werpu@gmx.at
+ *
+ * @version $Revision$ $Date$
+ */
+
+public class ScopeTag extends UIComponentTagBase
+{
+
+    /**
+     * @return the component type
+     */
+    public String getComponentType()
+    {
+        return UIScope.COMPONENT_TYPE;
+    }
+
+    /**
+     * standard setProperties
+     */
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+    }
+
+    /**
+     * standard release
+     */
+    public void release()
+    {
+        super.release();
+    }
+
+    /**
+     * we do not render anything, hence the renderer type results in a plain
+     * null
+     */
+    public String getRendererType()
+    {
+        return null;
+    }
+
+}

Propchange: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/scope/ScopeTag.java
------------------------------------------------------------------------------
    svn:eol-style = native