myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r427657 [30/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...
Date Tue, 01 Aug 2006 17:44:01 GMT
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java Tue Aug  1 10:43:28 2006
@@ -1,197 +1,197 @@
-/**
- * Copyright 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.autoupdatedatatable;
-
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
-import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
-import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.ext.HtmlTableRenderer;
-
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-
-/**
- * @author Jörg Artaker
- * @author Thomas Huber
- * @version $Revision: $ $Date: $
- *          <p/>
- *          $Log: $
- */
-public class AutoUpdateDataTableRenderer extends HtmlTableRenderer implements AjaxRenderer{
-
-    /**
-     * @see org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
-     */
-    public void encodeBegin(FacesContext context, UIComponent uiComponent) throws IOException
-    {
-        // output div around here so it can work in IE, IE will not allow updating of innerHTML within a table
-        ResponseWriter out = context.getResponseWriter();
-        out.write("\n");
-        out.startElement(HTML.DIV_ELEM, uiComponent);
-        out.writeAttribute(HTML.ID_ATTR, "div" + uiComponent.getClientId(context),null);
-        // todo: output some table attributes to the div such as width and maybe alignment
-
-        encodeBeginOnly(context, uiComponent);
-    }
-
-    /**
-     * 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
-     */
-    private void encodeJavascript(FacesContext context, UIComponent component)
-    {
-        // AddResource takes care to add only one reference to the same script
-        
-        // render javascript function for client-side toggle (it won't be used if user has opted for server-side toggle)
-        String javascriptLocation = (String) component.getAttributes().get(
-                JSFAttr.JAVASCRIPT_LOCATION);
-
-        AddResource addResource = AddResourceFactory.getInstance(context);
-        if(javascriptLocation != null)
-        {
-            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/prototype.js");
-        }
-        else
-        {
-            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, 
-                    PrototypeResourceLoader.class, "prototype.js");
-        }
-    }
-
-    /**
-     * @param context FacesContext
-     * @param component UIComponent
-     * @throws java.io.IOException
-     */
-    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
-    {
-        RendererUtils.checkParamValidity(context, component, AutoUpdateDataTable.class);
-        AutoUpdateDataTable autoUpdateDataTable = (AutoUpdateDataTable) component;
-
-        encodeEndOnly(context, component);
-        ResponseWriter out = context.getResponseWriter();
-        out.endElement(HTML.DIV_ELEM);
-        out.write("\n");
-
-        this.encodeJavascript(context,component);
-
-
-
-
-        String viewId = context.getViewRoot().getViewId();
-        ViewHandler viewHandler = context.getApplication().getViewHandler();
-        String actionURL = viewHandler.getActionURL(context, viewId);
-        String clientId = component.getClientId(context);
-
-        out.startElement(HTML.SCRIPT_ELEM, component);
-        out.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
-        StringBuffer script = new StringBuffer();
-        script.append("function initAutoUpdateDataTable_");
-        script.append(component.getId());
-        script.append("()\n{");
-        script.append("\n");
-        script.append(component.getId()).append("_updater").append(" = new Ajax.PeriodicalUpdater('");
-        script.append("div").append(component.getClientId(context)); //.append(":tbody_element");
-        script.append("','");
-        script.append(context.getExternalContext().encodeActionURL(actionURL+"?affectedAjaxComponent="+clientId));
-        script.append("', {\n frequency: ").append(autoUpdateDataTable.getFrequency());
-        if (context.getApplication().getStateManager().isSavingStateInClient(context)){
-            script.append(" , parameters: '&jsf_tree_64='+encodeURIComponent(document.getElementById('jsf_tree_64').value)+'&jsf_state_64='+encodeURIComponent(document.getElementById('jsf_state_64').value)+'&jsf_viewid='+encodeURIComponent(document.getElementById('jsf_viewid').value)");
-        }
-        String onSuccess = autoUpdateDataTable.getOnSuccess();
-        if(onSuccess != null){
-            script.append(" , onSuccess: ").append(onSuccess);
-        }
-        script.append("    });");
-        script.append("\n}\n");
-        script.append("setTimeout(\"initAutoUpdateDataTable_");
-        script.append(component.getId());
-        script.append("()\", 0);\n");
-
-        out.writeText(script.toString(),null);
-
-        out.endElement(HTML.SCRIPT_ELEM);
-    }
-
-    /**
-     * Pulled this out here so when getting a table update, it won't return the script
-     * @param context
-     * @param component
-     * @throws IOException
-     */
-    private void encodeEndOnly(FacesContext context, UIComponent component)
-            throws IOException
-    {
-        super.encodeEnd(context, component);
-    }
-
-    /**
-     * Pulled this out here so when getting a table update, it won't do the containing div again
-     * @param context
-     * @param component
-     */
-    private void encodeBeginOnly(FacesContext context, UIComponent component) throws IOException
-    {
-        super.encodeBegin(context, component);
-    }
-
-    /**
-     * @param facesContext FacesContext
-     * @param component UIComponent
-     */
-    public void decode(FacesContext facesContext, UIComponent component)
-    {
-        super.decode(facesContext, component);
-    }
-
-    /**
-     * @param context FacesContext
-     * @param component UIComponent
-     * @throws java.io.IOException
-     */
-    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
-    {
-        encodeBeginOnly(context, component);
-        encodeChildren(context, component);
-        encodeEndOnly(context, component);
-        /*if (context.getApplication().getStateManager().isSavingStateInClient(context)){
-            StateManager stateManager = context.getApplication().getStateManager();
-            StateManager.SerializedView serializedView = stateManager.saveSerializedView(context);
-            Object compStates =  serializedView.getState();
-
-            StringBuffer buf = new StringBuffer();
-
-            buf.append("jsf_state=");
-            buf.append(StateUtils.encode64(compStates));
-            buf.append("jsf_state_end");
-
-            context.getResponseWriter().write(buf.toString());
-        }*/
-    }
-
-
-}
+/**
+ * Copyright 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.autoupdatedatatable;
+
+import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
+import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
+import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
+import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
+import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
+import org.apache.myfaces.renderkit.html.ext.HtmlTableRenderer;
+
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+
+/**
+ * @author J&ouml;rg Artaker
+ * @author Thomas Huber
+ * @version $Revision: $ $Date: $
+ *          <p/>
+ *          $Log: $
+ */
+public class AutoUpdateDataTableRenderer extends HtmlTableRenderer implements AjaxRenderer{
+
+    /**
+     * @see org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     */
+    public void encodeBegin(FacesContext context, UIComponent uiComponent) throws IOException
+    {
+        // output div around here so it can work in IE, IE will not allow updating of innerHTML within a table
+        ResponseWriter out = context.getResponseWriter();
+        out.write("\n");
+        out.startElement(HTML.DIV_ELEM, uiComponent);
+        out.writeAttribute(HTML.ID_ATTR, "div" + uiComponent.getClientId(context),null);
+        // todo: output some table attributes to the div such as width and maybe alignment
+
+        encodeBeginOnly(context, uiComponent);
+    }
+
+    /**
+     * 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
+     */
+    private void encodeJavascript(FacesContext context, UIComponent component)
+    {
+        // AddResource takes care to add only one reference to the same script
+        
+        // render javascript function for client-side toggle (it won't be used if user has opted for server-side toggle)
+        String javascriptLocation = (String) component.getAttributes().get(
+                JSFAttr.JAVASCRIPT_LOCATION);
+
+        AddResource addResource = AddResourceFactory.getInstance(context);
+        if(javascriptLocation != null)
+        {
+            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/prototype.js");
+        }
+        else
+        {
+            addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, 
+                    PrototypeResourceLoader.class, "prototype.js");
+        }
+    }
+
+    /**
+     * @param context FacesContext
+     * @param component UIComponent
+     * @throws java.io.IOException
+     */
+    public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+    {
+        RendererUtils.checkParamValidity(context, component, AutoUpdateDataTable.class);
+        AutoUpdateDataTable autoUpdateDataTable = (AutoUpdateDataTable) component;
+
+        encodeEndOnly(context, component);
+        ResponseWriter out = context.getResponseWriter();
+        out.endElement(HTML.DIV_ELEM);
+        out.write("\n");
+
+        this.encodeJavascript(context,component);
+
+
+
+
+        String viewId = context.getViewRoot().getViewId();
+        ViewHandler viewHandler = context.getApplication().getViewHandler();
+        String actionURL = viewHandler.getActionURL(context, viewId);
+        String clientId = component.getClientId(context);
+
+        out.startElement(HTML.SCRIPT_ELEM, component);
+        out.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
+
+        StringBuffer script = new StringBuffer();
+        script.append("function initAutoUpdateDataTable_");
+        script.append(component.getId());
+        script.append("()\n{");
+        script.append("\n");
+        script.append(component.getId()).append("_updater").append(" = new Ajax.PeriodicalUpdater('");
+        script.append("div").append(component.getClientId(context)); //.append(":tbody_element");
+        script.append("','");
+        script.append(context.getExternalContext().encodeActionURL(actionURL+"?affectedAjaxComponent="+clientId));
+        script.append("', {\n frequency: ").append(autoUpdateDataTable.getFrequency());
+        if (context.getApplication().getStateManager().isSavingStateInClient(context)){
+            script.append(" , parameters: '&jsf_tree_64='+encodeURIComponent(document.getElementById('jsf_tree_64').value)+'&jsf_state_64='+encodeURIComponent(document.getElementById('jsf_state_64').value)+'&jsf_viewid='+encodeURIComponent(document.getElementById('jsf_viewid').value)");
+        }
+        String onSuccess = autoUpdateDataTable.getOnSuccess();
+        if(onSuccess != null){
+            script.append(" , onSuccess: ").append(onSuccess);
+        }
+        script.append("    });");
+        script.append("\n}\n");
+        script.append("setTimeout(\"initAutoUpdateDataTable_");
+        script.append(component.getId());
+        script.append("()\", 0);\n");
+
+        out.writeText(script.toString(),null);
+
+        out.endElement(HTML.SCRIPT_ELEM);
+    }
+
+    /**
+     * Pulled this out here so when getting a table update, it won't return the script
+     * @param context
+     * @param component
+     * @throws IOException
+     */
+    private void encodeEndOnly(FacesContext context, UIComponent component)
+            throws IOException
+    {
+        super.encodeEnd(context, component);
+    }
+
+    /**
+     * Pulled this out here so when getting a table update, it won't do the containing div again
+     * @param context
+     * @param component
+     */
+    private void encodeBeginOnly(FacesContext context, UIComponent component) throws IOException
+    {
+        super.encodeBegin(context, component);
+    }
+
+    /**
+     * @param facesContext FacesContext
+     * @param component UIComponent
+     */
+    public void decode(FacesContext facesContext, UIComponent component)
+    {
+        super.decode(facesContext, component);
+    }
+
+    /**
+     * @param context FacesContext
+     * @param component UIComponent
+     * @throws java.io.IOException
+     */
+    public void encodeAjax(FacesContext context, UIComponent component) throws IOException
+    {
+        encodeBeginOnly(context, component);
+        encodeChildren(context, component);
+        encodeEndOnly(context, component);
+        /*if (context.getApplication().getStateManager().isSavingStateInClient(context)){
+            StateManager stateManager = context.getApplication().getStateManager();
+            StateManager.SerializedView serializedView = stateManager.saveSerializedView(context);
+            Object compStates =  serializedView.getState();
+
+            StringBuffer buf = new StringBuffer();
+
+            buf.append("jsf_state=");
+            buf.append(StateUtils.encode64(compStates));
+            buf.append("jsf_state_end");
+
+            context.getResponseWriter().write(buf.toString());
+        }*/
+    }
+
+
+}

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableTag.java Tue Aug  1 10:43:28 2006
@@ -1,79 +1,79 @@
-/**
- * Copyright 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.autoupdatedatatable;
-
-import javax.faces.component.UIComponent;
-
-import org.apache.myfaces.taglib.html.ext.HtmlDataTableTag;
-
-/**
- * @author J&ouml;rg Artaker
- * @author Thomas Huber
- * @version $Revision: $ $Date: $
- *          <p/>
- *          $Log: $
- */
-public class AutoUpdateDataTableTag extends HtmlDataTableTag{
-
-    private String _frequency;
-    private String _onSuccess;
-
-
-    /**
-     * @param frequency String
-     */
-    public void setFrequency(String frequency) {
-        _frequency = frequency;
-    }
-
-    public String getOnSuccess() {
-        return _onSuccess;
-    }
-
-    public void setOnSuccess(String _onSuccess) {
-        this._onSuccess = _onSuccess;
-    }
-
-    /**
-     * @return the ComponentType String
-     */
-    public String getComponentType() {
-        return AutoUpdateDataTable.COMPONENT_TYPE;
-    }
-
-    /**
-     * @return the RendererType String
-     */
-    public String getRendererType() {
-        return AutoUpdateDataTable.DEFAULT_RENDERER_TYPE;
-    }
-
-    public void release() {
-        super.release();
-        _frequency = null;
-        _onSuccess = null;
-    }
-
-    /**
-     * @param component UIComponent
-     */
-    protected void setProperties(UIComponent component) {
-        super.setProperties(component);
-
-        setStringProperty(component, "frequency", _frequency);
-        setStringProperty(component, "onSuccess", _onSuccess);
-    }
-}
+/**
+ * Copyright 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.autoupdatedatatable;
+
+import javax.faces.component.UIComponent;
+
+import org.apache.myfaces.taglib.html.ext.HtmlDataTableTag;
+
+/**
+ * @author J&ouml;rg Artaker
+ * @author Thomas Huber
+ * @version $Revision: $ $Date: $
+ *          <p/>
+ *          $Log: $
+ */
+public class AutoUpdateDataTableTag extends HtmlDataTableTag{
+
+    private String _frequency;
+    private String _onSuccess;
+
+
+    /**
+     * @param frequency String
+     */
+    public void setFrequency(String frequency) {
+        _frequency = frequency;
+    }
+
+    public String getOnSuccess() {
+        return _onSuccess;
+    }
+
+    public void setOnSuccess(String _onSuccess) {
+        this._onSuccess = _onSuccess;
+    }
+
+    /**
+     * @return the ComponentType String
+     */
+    public String getComponentType() {
+        return AutoUpdateDataTable.COMPONENT_TYPE;
+    }
+
+    /**
+     * @return the RendererType String
+     */
+    public String getRendererType() {
+        return AutoUpdateDataTable.DEFAULT_RENDERER_TYPE;
+    }
+
+    public void release() {
+        super.release();
+        _frequency = null;
+        _onSuccess = null;
+    }
+
+    /**
+     * @param component UIComponent
+     */
+    protected void setProperties(UIComponent component) {
+        super.setProperties(component);
+
+        setStringProperty(component, "frequency", _frequency);
+        setStringProperty(component, "onSuccess", _onSuccess);
+    }
+}

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

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

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/convertString/TrimConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/convertString/TrimConverter.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/convertString/TrimConverter.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/convertString/TrimConverter.java Tue Aug  1 10:43:28 2006
@@ -1,29 +1,29 @@
-package org.apache.myfaces.custom.convertString;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-
-/**
- * Useful when a char(5) field ends up rendered as "abc  " .
- * 
- * @author Dennis Byrne
- */
-
-public class TrimConverter implements Converter
-{
-    
-    public Object getAsObject(FacesContext context, UIComponent component,
-            String value) throws ConverterException
-    {
-        return value == null ? null : value;
-    }
-
-    public String getAsString(FacesContext context, UIComponent component,
-            Object value) throws ConverterException
-    {
-        return value == null ? "" : value.toString().trim();
-    }
-
-}
+package org.apache.myfaces.custom.convertString;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+
+/**
+ * Useful when a char(5) field ends up rendered as "abc  " .
+ * 
+ * @author Dennis Byrne
+ */
+
+public class TrimConverter implements Converter
+{
+    
+    public Object getAsObject(FacesContext context, UIComponent component,
+            String value) throws ConverterException
+    {
+        return value == null ? null : value;
+    }
+
+    public String getAsString(FacesContext context, UIComponent component,
+            Object value) throws ConverterException
+    {
+        return value == null ? "" : value.toString().trim();
+    }
+
+}

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

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

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojoextensions/ResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojoextensions/ResourceLoader.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojoextensions/ResourceLoader.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojoextensions/ResourceLoader.java Tue Aug  1 10:43:28 2006
@@ -1,6 +1,6 @@
-package org.apache.myfaces.custom.dojoextensions;
-
-public interface ResourceLoader
-{
-
+package org.apache.myfaces.custom.dojoextensions;
+
+public interface ResourceLoader
+{
+
 }

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java Tue Aug  1 10:43:28 2006
@@ -1,254 +1,254 @@
-/*
- * Copyright 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.fisheye;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-import org.apache.myfaces.custom.div.Div;
-
-/**
- * A Mac OSX-style toolbar, using the DOJO toolkit.
- * 
- * @see <a href="http://dojotoolkit.org/">http://dojotoolkit.org/</a>
- * 
- * @author Jurgen Lust (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class HtmlFishEyeNavigationMenu extends Div
-{
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.FishEyeList";
-    private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.FishEyeList";
-
-    public static final String EDGE_BOTTOM = "bottom";
-    public static final String EDGE_CENTER = "center";
-    public static final String EDGE_LEFT = "left";
-    public static final String EDGE_RIGHT = "right";
-    public static final String EDGE_TOP = "top";
-    public static final String HORIZONTAL_ORIENTATION = "horizontal";
-    public static final String VERTICAL_ORIENTATION = "vertical";
-
-    private String _attachEdge;
-    private Boolean _conservativeTrigger;
-    private Integer _effectUnits;
-    private Integer _itemHeight;
-    private Integer _itemMaxHeight;
-    private Integer _itemMaxWidth;
-    private Integer _itemPadding;
-    private Integer _itemWidth;
-    private String _labelEdge;
-    private String _orientation;
-
-    public HtmlFishEyeNavigationMenu()
-    {
-        setRendererType(DEFAULT_RENDERER_TYPE);
-    }
-
-    public String getAttachEdge()
-    {
-        if (_attachEdge != null)
-        {
-            return _attachEdge;
-        }
-        ValueBinding vb = getValueBinding("attachEdge");
-        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
-
-    }
-
-    public Boolean getConservativeTrigger()
-    {
-        if (_conservativeTrigger != null)
-        {
-            return _conservativeTrigger;
-        }
-        ValueBinding vb = getValueBinding("conservativeTrigger");
-        return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getEffectUnits()
-    {
-        if (_effectUnits != null)
-        {
-            return _effectUnits;
-        }
-        ValueBinding vb = getValueBinding("effectUnits");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getItemHeight()
-    {
-        if (_itemHeight != null)
-        {
-            return _itemHeight;
-        }
-        ValueBinding vb = getValueBinding("itemHeight");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getItemMaxHeight()
-    {
-        if (_itemMaxHeight != null)
-        {
-            return _itemMaxHeight;
-        }
-        ValueBinding vb = getValueBinding("itemMaxHeight");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getItemMaxWidth()
-    {
-        if (_itemMaxWidth != null)
-        {
-            return _itemMaxWidth;
-        }
-        ValueBinding vb = getValueBinding("itemMaxWidth");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getItemPadding()
-    {
-        if (_itemPadding != null)
-        {
-            return _itemPadding;
-        }
-        ValueBinding vb = getValueBinding("itemPadding");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public Integer getItemWidth()
-    {
-        if (_itemWidth != null)
-        {
-            return _itemWidth;
-        }
-        ValueBinding vb = getValueBinding("itemWidth");
-        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
-    }
-
-    public String getLabelEdge()
-    {
-        if (_labelEdge != null)
-        {
-            return _labelEdge;
-        }
-        ValueBinding vb = getValueBinding("labelEdge");
-        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
-    }
-
-    public String getOrientation()
-    {
-        if (_orientation != null)
-        {
-            return _orientation;
-        }
-        ValueBinding vb = getValueBinding("orientation");
-        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
-    }
-
-    public boolean getRendersChildren()
-    {
-        return true;
-    }
-
-    /**
-     * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
-     */
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[]) state;
-        super.restoreState(context, values[0]);
-        _itemWidth = (Integer) values[1];
-        _itemHeight = (Integer) values[2];
-        _itemMaxWidth = (Integer) values[3];
-        _itemMaxHeight = (Integer) values[4];
-        _orientation = (String) values[5];
-        _effectUnits = (Integer) values[6];
-        _itemPadding = (Integer) values[7];
-        _attachEdge = (String) values[8];
-        _labelEdge = (String) values[9];
-        _conservativeTrigger = (Boolean) values[10];
-    }
-
-    /**
-     * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
-     */
-    public Object saveState(FacesContext context)
-    {
-        Object[] values = new Object[11];
-        values[0] = super.saveState(context);
-        values[1] = _itemWidth;
-        values[2] = _itemHeight;
-        values[3] = _itemMaxWidth;
-        values[4] = _itemMaxHeight;
-        values[5] = _orientation;
-        values[6] = _effectUnits;
-        values[7] = _itemPadding;
-        values[8] = _attachEdge;
-        values[9] = _labelEdge;
-        values[10] = _conservativeTrigger;
-        return values;
-    }
-
-    public void setAttachEdge(String attachEdge)
-    {
-        this._attachEdge = attachEdge;
-    }
-
-    public void setConservativeTrigger(Boolean conservativeTrigger)
-    {
-        this._conservativeTrigger = conservativeTrigger;
-    }
-
-    public void setEffectUnits(Integer effectUnits)
-    {
-        this._effectUnits = effectUnits;
-    }
-
-    public void setItemHeight(Integer itemHeight)
-    {
-        this._itemHeight = itemHeight;
-    }
-
-    public void setItemMaxHeight(Integer itemMaxHeight)
-    {
-        this._itemMaxHeight = itemMaxHeight;
-    }
-
-    public void setItemMaxWidth(Integer itemMaxWidth)
-    {
-        this._itemMaxWidth = itemMaxWidth;
-    }
-
-    public void setItemPadding(Integer itemPadding)
-    {
-        this._itemPadding = itemPadding;
-    }
-
-    public void setItemWidth(Integer itemWidth)
-    {
-        this._itemWidth = itemWidth;
-    }
-
-    public void setLabelEdge(String labelEdge)
-    {
-        this._labelEdge = labelEdge;
-    }
-
-    public void setOrientation(String orientation)
-    {
-        this._orientation = orientation;
-    }
-}
+/*
+ * Copyright 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.fisheye;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.apache.myfaces.custom.div.Div;
+
+/**
+ * A Mac OSX-style toolbar, using the DOJO toolkit.
+ * 
+ * @see <a href="http://dojotoolkit.org/">http://dojotoolkit.org/</a>
+ * 
+ * @author Jurgen Lust (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class HtmlFishEyeNavigationMenu extends Div
+{
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.FishEyeList";
+    private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.FishEyeList";
+
+    public static final String EDGE_BOTTOM = "bottom";
+    public static final String EDGE_CENTER = "center";
+    public static final String EDGE_LEFT = "left";
+    public static final String EDGE_RIGHT = "right";
+    public static final String EDGE_TOP = "top";
+    public static final String HORIZONTAL_ORIENTATION = "horizontal";
+    public static final String VERTICAL_ORIENTATION = "vertical";
+
+    private String _attachEdge;
+    private Boolean _conservativeTrigger;
+    private Integer _effectUnits;
+    private Integer _itemHeight;
+    private Integer _itemMaxHeight;
+    private Integer _itemMaxWidth;
+    private Integer _itemPadding;
+    private Integer _itemWidth;
+    private String _labelEdge;
+    private String _orientation;
+
+    public HtmlFishEyeNavigationMenu()
+    {
+        setRendererType(DEFAULT_RENDERER_TYPE);
+    }
+
+    public String getAttachEdge()
+    {
+        if (_attachEdge != null)
+        {
+            return _attachEdge;
+        }
+        ValueBinding vb = getValueBinding("attachEdge");
+        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+
+    }
+
+    public Boolean getConservativeTrigger()
+    {
+        if (_conservativeTrigger != null)
+        {
+            return _conservativeTrigger;
+        }
+        ValueBinding vb = getValueBinding("conservativeTrigger");
+        return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getEffectUnits()
+    {
+        if (_effectUnits != null)
+        {
+            return _effectUnits;
+        }
+        ValueBinding vb = getValueBinding("effectUnits");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getItemHeight()
+    {
+        if (_itemHeight != null)
+        {
+            return _itemHeight;
+        }
+        ValueBinding vb = getValueBinding("itemHeight");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getItemMaxHeight()
+    {
+        if (_itemMaxHeight != null)
+        {
+            return _itemMaxHeight;
+        }
+        ValueBinding vb = getValueBinding("itemMaxHeight");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getItemMaxWidth()
+    {
+        if (_itemMaxWidth != null)
+        {
+            return _itemMaxWidth;
+        }
+        ValueBinding vb = getValueBinding("itemMaxWidth");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getItemPadding()
+    {
+        if (_itemPadding != null)
+        {
+            return _itemPadding;
+        }
+        ValueBinding vb = getValueBinding("itemPadding");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public Integer getItemWidth()
+    {
+        if (_itemWidth != null)
+        {
+            return _itemWidth;
+        }
+        ValueBinding vb = getValueBinding("itemWidth");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
+    }
+
+    public String getLabelEdge()
+    {
+        if (_labelEdge != null)
+        {
+            return _labelEdge;
+        }
+        ValueBinding vb = getValueBinding("labelEdge");
+        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+    }
+
+    public String getOrientation()
+    {
+        if (_orientation != null)
+        {
+            return _orientation;
+        }
+        ValueBinding vb = getValueBinding("orientation");
+        return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+    }
+
+    public boolean getRendersChildren()
+    {
+        return true;
+    }
+
+    /**
+     * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+     */
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[]) state;
+        super.restoreState(context, values[0]);
+        _itemWidth = (Integer) values[1];
+        _itemHeight = (Integer) values[2];
+        _itemMaxWidth = (Integer) values[3];
+        _itemMaxHeight = (Integer) values[4];
+        _orientation = (String) values[5];
+        _effectUnits = (Integer) values[6];
+        _itemPadding = (Integer) values[7];
+        _attachEdge = (String) values[8];
+        _labelEdge = (String) values[9];
+        _conservativeTrigger = (Boolean) values[10];
+    }
+
+    /**
+     * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+     */
+    public Object saveState(FacesContext context)
+    {
+        Object[] values = new Object[11];
+        values[0] = super.saveState(context);
+        values[1] = _itemWidth;
+        values[2] = _itemHeight;
+        values[3] = _itemMaxWidth;
+        values[4] = _itemMaxHeight;
+        values[5] = _orientation;
+        values[6] = _effectUnits;
+        values[7] = _itemPadding;
+        values[8] = _attachEdge;
+        values[9] = _labelEdge;
+        values[10] = _conservativeTrigger;
+        return values;
+    }
+
+    public void setAttachEdge(String attachEdge)
+    {
+        this._attachEdge = attachEdge;
+    }
+
+    public void setConservativeTrigger(Boolean conservativeTrigger)
+    {
+        this._conservativeTrigger = conservativeTrigger;
+    }
+
+    public void setEffectUnits(Integer effectUnits)
+    {
+        this._effectUnits = effectUnits;
+    }
+
+    public void setItemHeight(Integer itemHeight)
+    {
+        this._itemHeight = itemHeight;
+    }
+
+    public void setItemMaxHeight(Integer itemMaxHeight)
+    {
+        this._itemMaxHeight = itemMaxHeight;
+    }
+
+    public void setItemMaxWidth(Integer itemMaxWidth)
+    {
+        this._itemMaxWidth = itemMaxWidth;
+    }
+
+    public void setItemPadding(Integer itemPadding)
+    {
+        this._itemPadding = itemPadding;
+    }
+
+    public void setItemWidth(Integer itemWidth)
+    {
+        this._itemWidth = itemWidth;
+    }
+
+    public void setLabelEdge(String labelEdge)
+    {
+        this._labelEdge = labelEdge;
+    }
+
+    public void setOrientation(String orientation)
+    {
+        this._orientation = orientation;
+    }
+}

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java Tue Aug  1 10:43:28 2006
@@ -1,243 +1,243 @@
-/*
- * Copyright 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.fisheye;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.ActionEvent;
-
-import org.apache.myfaces.custom.dojo.DojoUtils;
-import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
-import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
-import org.apache.myfaces.shared_tomahawk.config.MyfacesConfig;
-import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_tomahawk.renderkit.html.util.FormInfo;
-
-/**
- * Renderer for the FishEyeList component
- * 
- * @author Jurgen Lust (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class HtmlFishEyeNavigationMenuRenderer extends HtmlLinkRenderer
-{
-    public static final String ATTACH_EDGE_ATTR = "dojo:attachEdge";
-
-    public static final String CAPTION_ATTR = "caption";
-    public static final String DOJO_ITEM_STYLE_CLASS = "dojo-FisheyeListItem";
-    public static final String DOJO_STYLE_CLASS = "dojo-FisheyeList";
-    public static final String EFFECT_UNITS_ATTR = "dojo:effectUnits";
-    public static final String ICON_SRC_ATTR = "dojo:iconsrc";
-    public static final String ITEM_HEIGHT_ATTR = "dojo:itemHeight";
-    public static final String ITEM_MAX_HEIGHT_ATTR = "dojo:itemMaxHeight";
-    public static final String ITEM_MAX_WIDTH_ATTR = "dojo:itemMaxWidth";
-    public static final String ITEM_PADDING_ATTR = "dojo:itemPadding";
-    public static final String ITEM_WIDTH_ATTR = "dojo:itemWidth";
-    public static final String LABEL_EDGE_ATTR = "dojo:labelEdge";
-    public static final String ORIENTATION_ATTR = "dojo:orientation";
-    public static final String CONSERVATIVE_TRIGGER_ATTR = "dojo:conservativeTrigger";
-    public static final String RENDERER_TYPE = "org.apache.myfaces.FishEyeList";
-
-    /**
-     * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
-     */
-    public void decode(FacesContext context, UIComponent component)
-    {
-        FormInfo nestingForm = findNestingForm(component, context);
-        if (nestingForm != null)
-        {
-            String fieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(nestingForm.getFormName());
-            String reqValue = (String) context.getExternalContext()
-            .getRequestParameterMap().get(fieldName);
-            UIComponent source = context.getViewRoot().findComponent(reqValue);
-            if (source instanceof UINavigationMenuItem)
-            {
-                UINavigationMenuItem item = (UINavigationMenuItem) source;
-                item.queueEvent(new ActionEvent(item));
-            }
-        }
-        
-    }
-
-    /**
-     * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
-     */
-    public void encodeBegin(FacesContext context, UIComponent component)
-            throws IOException
-    {
-        if (component.isRendered())
-        {
-            HtmlFishEyeNavigationMenu fisheye = (HtmlFishEyeNavigationMenu) component;
-            ResponseWriter writer = context.getResponseWriter();
-            //initialize DOJO
-            String javascriptLocation = (String) component.getAttributes().get(
-                    JSFAttr.JAVASCRIPT_LOCATION);
-            DojoUtils.addMainInclude(context, component, javascriptLocation,
-                    DojoUtils.getDjConfigInstance(context));
-            DojoUtils.addRequire(context, component, "dojo.widget.FisheyeList");
-
-            writer.startElement(HTML.DIV_ELEM, fisheye);
-            writer.writeAttribute(HTML.CLASS_ATTR, DOJO_STYLE_CLASS, null);
-            writeAttribute(writer, fisheye, ITEM_WIDTH_ATTR, fisheye
-                    .getItemWidth());
-            writeAttribute(writer, fisheye, ITEM_HEIGHT_ATTR, fisheye
-                    .getItemHeight());
-            writeAttribute(writer, fisheye, ITEM_MAX_WIDTH_ATTR, fisheye
-                    .getItemMaxWidth());
-            writeAttribute(writer, fisheye, ITEM_MAX_HEIGHT_ATTR, fisheye
-                    .getItemMaxHeight());
-            writeAttribute(writer, fisheye, ORIENTATION_ATTR, fisheye
-                    .getOrientation());
-            writeAttribute(writer, fisheye, EFFECT_UNITS_ATTR, fisheye
-                    .getEffectUnits());
-            writeAttribute(writer, fisheye, ITEM_PADDING_ATTR, fisheye
-                    .getItemPadding());
-            writeAttribute(writer, fisheye, ATTACH_EDGE_ATTR, fisheye
-                    .getAttachEdge());
-            writeAttribute(writer, fisheye, LABEL_EDGE_ATTR, fisheye
-                    .getLabelEdge());
-            writeAttribute(writer, fisheye, CONSERVATIVE_TRIGGER_ATTR, fisheye
-                    .getConservativeTrigger());
-        }
-    }
-
-    /**
-     * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
-     */
-    public void encodeChildren(FacesContext context, UIComponent component)
-            throws IOException
-    {
-        ResponseWriter writer = context.getResponseWriter();
-        List children = component.getChildren();
-        for (Iterator cit = children.iterator(); cit.hasNext();)
-        {
-            UIComponent child = (UIComponent) cit.next();
-            if (!child.isRendered())
-                continue;
-            if (child instanceof UINavigationMenuItem)
-            {
-                renderMenuItem(context, writer, (UINavigationMenuItem) child);
-            }
-        }
-    }
-
-    /**
-     * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
-     */
-    public void encodeEnd(FacesContext context, UIComponent component)
-            throws IOException
-    {
-        if (component.isRendered())
-        {
-            ResponseWriter writer = context.getResponseWriter();
-            writer.endElement(HTML.DIV_ELEM);
-        }
-    }
-
-    /**
-     * @see javax.faces.render.Renderer#getRendersChildren()
-     */
-    public boolean getRendersChildren()
-    {
-        //always render the menu items
-        return true;
-    }
-
-    protected void renderMenuItem(FacesContext context, ResponseWriter writer,
-            UINavigationMenuItem item) throws IOException
-    {
-        //find the enclosing form
-        FormInfo formInfo = findNestingForm(item, context);
-        String clientId = item.getClientId(context);
-        if (formInfo == null)
-        {
-            throw new IllegalArgumentException("Component " + clientId
-                    + " must be embedded in an form");
-        }
-        UIComponent nestingForm = formInfo.getForm();
-        String formName = formInfo.getFormName();
-
-        StringBuffer onClick = new StringBuffer();
-
-        //call the clear_<formName> method
-        onClick.append(
-                HtmlRendererUtils
-                        .getClearHiddenCommandFormParamsFunctionName(formName))
-                .append("();");
-        String jsForm = "document.forms['" + formName + "']";
-
-        if (MyfacesConfig.getCurrentInstance(context.getExternalContext())
-                .isAutoScroll())
-        {
-            org.apache.myfaces.shared_tomahawk.renderkit.html.util.JavascriptUtils
-                    .appendAutoScrollAssignment(onClick, formName);
-        }
-
-        //add id parameter for decode
-        String hiddenFieldName = HtmlRendererUtils
-                .getHiddenCommandLinkFieldName(formName);
-        onClick.append(jsForm);
-        onClick.append(".elements['").append(hiddenFieldName).append("']");
-        onClick.append(".value='").append(clientId).append("';");
-        addHiddenCommandParameter(context, nestingForm, hiddenFieldName);
-
-        //add the target window
-        String target = item.getTarget();
-        if (target != null && target.trim().length() > 0)
-        {
-            onClick.append(jsForm);
-            onClick.append(".target='");
-            onClick.append(target);
-            onClick.append("';");
-        }
-
-        // onSubmit
-        onClick.append("if(").append(jsForm).append(".onsubmit){var result=")
-                .append(jsForm).append(
-                        ".onsubmit();  if( (typeof result == 'undefined') || result ) {"
-                                + jsForm + ".submit();}}else{");
-
-        //submit
-        onClick.append(jsForm);
-        onClick.append(".submit();}return false;"); //return false, so that browser does not handle the click
-
-        writer.startElement(HTML.DIV_ELEM, item);
-        writer.writeAttribute(HTML.CLASS_ATTR, DOJO_ITEM_STYLE_CLASS, null);
-        writer.writeAttribute(HTML.ONCLICK_ATTR, onClick.toString(), null);
-        writer.writeAttribute(CAPTION_ATTR, item.getItemLabel(), null);
-        writer.writeAttribute(ICON_SRC_ATTR, item.getIcon(), null);
-        writer.writeAttribute(HTML.ID_ATTR, clientId, null);
-        writer.endElement(HTML.DIV_ELEM);
-    }
-
-    protected void writeAttribute(ResponseWriter writer,
-            HtmlFishEyeNavigationMenu fisheye, String name, Object value)
-            throws IOException
-    {
-        if (name != null && value != null)
-        {
-            writer.writeAttribute(name, value, null);
-        }
-    }
-
-}
+/*
+ * Copyright 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.fisheye;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+
+import org.apache.myfaces.custom.dojo.DojoUtils;
+import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
+import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
+import org.apache.myfaces.shared_tomahawk.config.MyfacesConfig;
+import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.util.FormInfo;
+
+/**
+ * Renderer for the FishEyeList component
+ * 
+ * @author Jurgen Lust (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class HtmlFishEyeNavigationMenuRenderer extends HtmlLinkRenderer
+{
+    public static final String ATTACH_EDGE_ATTR = "dojo:attachEdge";
+
+    public static final String CAPTION_ATTR = "caption";
+    public static final String DOJO_ITEM_STYLE_CLASS = "dojo-FisheyeListItem";
+    public static final String DOJO_STYLE_CLASS = "dojo-FisheyeList";
+    public static final String EFFECT_UNITS_ATTR = "dojo:effectUnits";
+    public static final String ICON_SRC_ATTR = "dojo:iconsrc";
+    public static final String ITEM_HEIGHT_ATTR = "dojo:itemHeight";
+    public static final String ITEM_MAX_HEIGHT_ATTR = "dojo:itemMaxHeight";
+    public static final String ITEM_MAX_WIDTH_ATTR = "dojo:itemMaxWidth";
+    public static final String ITEM_PADDING_ATTR = "dojo:itemPadding";
+    public static final String ITEM_WIDTH_ATTR = "dojo:itemWidth";
+    public static final String LABEL_EDGE_ATTR = "dojo:labelEdge";
+    public static final String ORIENTATION_ATTR = "dojo:orientation";
+    public static final String CONSERVATIVE_TRIGGER_ATTR = "dojo:conservativeTrigger";
+    public static final String RENDERER_TYPE = "org.apache.myfaces.FishEyeList";
+
+    /**
+     * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     */
+    public void decode(FacesContext context, UIComponent component)
+    {
+        FormInfo nestingForm = findNestingForm(component, context);
+        if (nestingForm != null)
+        {
+            String fieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(nestingForm.getFormName());
+            String reqValue = (String) context.getExternalContext()
+            .getRequestParameterMap().get(fieldName);
+            UIComponent source = context.getViewRoot().findComponent(reqValue);
+            if (source instanceof UINavigationMenuItem)
+            {
+                UINavigationMenuItem item = (UINavigationMenuItem) source;
+                item.queueEvent(new ActionEvent(item));
+            }
+        }
+        
+    }
+
+    /**
+     * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     */
+    public void encodeBegin(FacesContext context, UIComponent component)
+            throws IOException
+    {
+        if (component.isRendered())
+        {
+            HtmlFishEyeNavigationMenu fisheye = (HtmlFishEyeNavigationMenu) component;
+            ResponseWriter writer = context.getResponseWriter();
+            //initialize DOJO
+            String javascriptLocation = (String) component.getAttributes().get(
+                    JSFAttr.JAVASCRIPT_LOCATION);
+            DojoUtils.addMainInclude(context, component, javascriptLocation,
+                    DojoUtils.getDjConfigInstance(context));
+            DojoUtils.addRequire(context, component, "dojo.widget.FisheyeList");
+
+            writer.startElement(HTML.DIV_ELEM, fisheye);
+            writer.writeAttribute(HTML.CLASS_ATTR, DOJO_STYLE_CLASS, null);
+            writeAttribute(writer, fisheye, ITEM_WIDTH_ATTR, fisheye
+                    .getItemWidth());
+            writeAttribute(writer, fisheye, ITEM_HEIGHT_ATTR, fisheye
+                    .getItemHeight());
+            writeAttribute(writer, fisheye, ITEM_MAX_WIDTH_ATTR, fisheye
+                    .getItemMaxWidth());
+            writeAttribute(writer, fisheye, ITEM_MAX_HEIGHT_ATTR, fisheye
+                    .getItemMaxHeight());
+            writeAttribute(writer, fisheye, ORIENTATION_ATTR, fisheye
+                    .getOrientation());
+            writeAttribute(writer, fisheye, EFFECT_UNITS_ATTR, fisheye
+                    .getEffectUnits());
+            writeAttribute(writer, fisheye, ITEM_PADDING_ATTR, fisheye
+                    .getItemPadding());
+            writeAttribute(writer, fisheye, ATTACH_EDGE_ATTR, fisheye
+                    .getAttachEdge());
+            writeAttribute(writer, fisheye, LABEL_EDGE_ATTR, fisheye
+                    .getLabelEdge());
+            writeAttribute(writer, fisheye, CONSERVATIVE_TRIGGER_ATTR, fisheye
+                    .getConservativeTrigger());
+        }
+    }
+
+    /**
+     * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     */
+    public void encodeChildren(FacesContext context, UIComponent component)
+            throws IOException
+    {
+        ResponseWriter writer = context.getResponseWriter();
+        List children = component.getChildren();
+        for (Iterator cit = children.iterator(); cit.hasNext();)
+        {
+            UIComponent child = (UIComponent) cit.next();
+            if (!child.isRendered())
+                continue;
+            if (child instanceof UINavigationMenuItem)
+            {
+                renderMenuItem(context, writer, (UINavigationMenuItem) child);
+            }
+        }
+    }
+
+    /**
+     * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     */
+    public void encodeEnd(FacesContext context, UIComponent component)
+            throws IOException
+    {
+        if (component.isRendered())
+        {
+            ResponseWriter writer = context.getResponseWriter();
+            writer.endElement(HTML.DIV_ELEM);
+        }
+    }
+
+    /**
+     * @see javax.faces.render.Renderer#getRendersChildren()
+     */
+    public boolean getRendersChildren()
+    {
+        //always render the menu items
+        return true;
+    }
+
+    protected void renderMenuItem(FacesContext context, ResponseWriter writer,
+            UINavigationMenuItem item) throws IOException
+    {
+        //find the enclosing form
+        FormInfo formInfo = findNestingForm(item, context);
+        String clientId = item.getClientId(context);
+        if (formInfo == null)
+        {
+            throw new IllegalArgumentException("Component " + clientId
+                    + " must be embedded in an form");
+        }
+        UIComponent nestingForm = formInfo.getForm();
+        String formName = formInfo.getFormName();
+
+        StringBuffer onClick = new StringBuffer();
+
+        //call the clear_<formName> method
+        onClick.append(
+                HtmlRendererUtils
+                        .getClearHiddenCommandFormParamsFunctionName(formName))
+                .append("();");
+        String jsForm = "document.forms['" + formName + "']";
+
+        if (MyfacesConfig.getCurrentInstance(context.getExternalContext())
+                .isAutoScroll())
+        {
+            org.apache.myfaces.shared_tomahawk.renderkit.html.util.JavascriptUtils
+                    .appendAutoScrollAssignment(onClick, formName);
+        }
+
+        //add id parameter for decode
+        String hiddenFieldName = HtmlRendererUtils
+                .getHiddenCommandLinkFieldName(formName);
+        onClick.append(jsForm);
+        onClick.append(".elements['").append(hiddenFieldName).append("']");
+        onClick.append(".value='").append(clientId).append("';");
+        addHiddenCommandParameter(context, nestingForm, hiddenFieldName);
+
+        //add the target window
+        String target = item.getTarget();
+        if (target != null && target.trim().length() > 0)
+        {
+            onClick.append(jsForm);
+            onClick.append(".target='");
+            onClick.append(target);
+            onClick.append("';");
+        }
+
+        // onSubmit
+        onClick.append("if(").append(jsForm).append(".onsubmit){var result=")
+                .append(jsForm).append(
+                        ".onsubmit();  if( (typeof result == 'undefined') || result ) {"
+                                + jsForm + ".submit();}}else{");
+
+        //submit
+        onClick.append(jsForm);
+        onClick.append(".submit();}return false;"); //return false, so that browser does not handle the click
+
+        writer.startElement(HTML.DIV_ELEM, item);
+        writer.writeAttribute(HTML.CLASS_ATTR, DOJO_ITEM_STYLE_CLASS, null);
+        writer.writeAttribute(HTML.ONCLICK_ATTR, onClick.toString(), null);
+        writer.writeAttribute(CAPTION_ATTR, item.getItemLabel(), null);
+        writer.writeAttribute(ICON_SRC_ATTR, item.getIcon(), null);
+        writer.writeAttribute(HTML.ID_ATTR, clientId, null);
+        writer.endElement(HTML.DIV_ELEM);
+    }
+
+    protected void writeAttribute(ResponseWriter writer,
+            HtmlFishEyeNavigationMenu fisheye, String name, Object value)
+            throws IOException
+    {
+        if (name != null && value != null)
+        {
+            writer.writeAttribute(name, value, null);
+        }
+    }
+
+}

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

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java Tue Aug  1 10:43:28 2006
@@ -1,296 +1,296 @@
-/*
- * Copyright 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.fisheye;
-
-import javax.faces.application.Application;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.custom.div.DivTag;
-
-/**
- * JSP Tag for the FishEyeList component
- * 
- * @author Jurgen Lust (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class HtmlFishEyeNavigationMenuTag extends DivTag
-{
-    private String _attachEdge;
-    private String _conservativeTrigger;
-    private String _effectUnits;
-    private String _itemHeight;
-    private String _itemMaxHeight;
-    private String _itemMaxWidth;
-    private String _itemPadding;
-    private String _itemWidth;
-    private String _labelEdge;
-    private String _orientation;
-
-    public String getAttachEdge()
-    {
-        return _attachEdge;
-    }
-
-    public String getComponentType()
-    {
-        return HtmlFishEyeNavigationMenu.COMPONENT_TYPE;
-    }
-
-    public String getConservativeTrigger()
-    {
-        return _conservativeTrigger;
-    }
-
-    public String getEffectUnits()
-    {
-        return _effectUnits;
-    }
-
-    public String getItemHeight()
-    {
-        return _itemHeight;
-    }
-
-    public String getItemMaxHeight()
-    {
-        return _itemMaxHeight;
-    }
-
-    public String getItemMaxWidth()
-    {
-        return _itemMaxWidth;
-    }
-
-    public String getItemPadding()
-    {
-        return _itemPadding;
-    }
-
-    public String getItemWidth()
-    {
-        return _itemWidth;
-    }
-
-    public String getLabelEdge()
-    {
-        return _labelEdge;
-    }
-
-    public String getOrientation()
-    {
-        return _orientation;
-    }
-
-    public String getRendererType()
-    {
-        return HtmlFishEyeNavigationMenuRenderer.RENDERER_TYPE;
-    }
-
-    public void release()
-    {
-        super.release();
-        _attachEdge = null;
-        _effectUnits = null;
-        _itemHeight = null;
-        _itemMaxHeight = null;
-        _itemMaxWidth = null;
-        _itemPadding = null;
-        _itemWidth = null;
-        _labelEdge = null;
-        _orientation = null;
-    }
-
-    public void setAttachEdge(String attachEdge)
-    {
-        this._attachEdge = attachEdge;
-    }
-
-    public void setConservativeTrigger(String conservativeTrigger)
-    {
-        this._conservativeTrigger = conservativeTrigger;
-    }
-
-    public void setEffectUnits(String effectUnits)
-    {
-        this._effectUnits = effectUnits;
-    }
-
-    public void setItemHeight(String itemHeight)
-    {
-        this._itemHeight = itemHeight;
-    }
-
-    public void setItemMaxHeight(String itemMaxHeight)
-    {
-        this._itemMaxHeight = itemMaxHeight;
-    }
-
-    public void setItemMaxWidth(String itemMaxWidth)
-    {
-        this._itemMaxWidth = itemMaxWidth;
-    }
-
-    public void setItemPadding(String itemPadding)
-    {
-        this._itemPadding = itemPadding;
-    }
-
-    public void setItemWidth(String itemWidth)
-    {
-        this._itemWidth = itemWidth;
-    }
-
-    public void setLabelEdge(String labelEdge)
-    {
-        this._labelEdge = labelEdge;
-    }
-
-    public void setOrientation(String orientation)
-    {
-        this._orientation = orientation;
-    }
-
-    protected void setProperties(UIComponent component)
-    {
-        super.setProperties(component);
-        HtmlFishEyeNavigationMenu fisheye = (HtmlFishEyeNavigationMenu) component;
-        FacesContext context = FacesContext.getCurrentInstance();
-        Application app = context.getApplication();
-        if (_attachEdge != null)
-        {
-            if (isValueReference(_attachEdge))
-            {
-                fisheye.setValueBinding("attachEdge", app
-                        .createValueBinding(_attachEdge));
-            }
-            else
-            {
-                fisheye.setAttachEdge(_attachEdge);
-            }
-        }
-        if (_effectUnits != null)
-        {
-            if (isValueReference(_effectUnits))
-            {
-                fisheye.setValueBinding("effectUnits", app
-                        .createValueBinding(_effectUnits));
-            }
-            else
-            {
-                fisheye.setEffectUnits(new Integer(_effectUnits));
-            }
-        }
-        if (_itemHeight != null)
-        {
-            if (isValueReference(_itemHeight))
-            {
-                fisheye.setValueBinding("itemHeight", app
-                        .createValueBinding(_itemHeight));
-            }
-            else
-            {
-                fisheye.setItemHeight(new Integer(_itemHeight));
-            }
-        }
-        if (_itemMaxHeight != null)
-        {
-            if (isValueReference(_itemMaxHeight))
-            {
-                fisheye.setValueBinding("itemMaxHeight", app
-                        .createValueBinding(_itemMaxHeight));
-            }
-            else
-            {
-                fisheye.setItemMaxHeight(new Integer(_itemMaxHeight));
-            }
-        }
-        if (_itemMaxWidth != null)
-        {
-            if (isValueReference(_itemMaxWidth))
-            {
-                fisheye.setValueBinding("itemMaxWidth", app
-                        .createValueBinding(_itemMaxWidth));
-            }
-            else
-            {
-                fisheye.setItemMaxWidth(new Integer(_itemMaxWidth));
-            }
-        }
-        if (_itemPadding != null)
-        {
-            if (isValueReference(_itemPadding))
-            {
-                fisheye.setValueBinding("itemPadding", app
-                        .createValueBinding(_itemPadding));
-            }
-            else
-            {
-                fisheye.setItemPadding(new Integer(_itemPadding));
-            }
-        }
-        if (_itemWidth != null)
-        {
-            if (isValueReference(_itemWidth))
-            {
-                fisheye.setValueBinding("itemWidth", app
-                        .createValueBinding(_itemWidth));
-            }
-            else
-            {
-                fisheye.setItemWidth(new Integer(_itemWidth));
-            }
-        }
-        if (_labelEdge != null)
-        {
-            if (isValueReference(_labelEdge))
-            {
-                fisheye.setValueBinding("labelEdge", app
-                        .createValueBinding(_labelEdge));
-            }
-            else
-            {
-                fisheye.setLabelEdge(_labelEdge);
-            }
-        }
-        if (_orientation != null)
-        {
-            if (isValueReference(_orientation))
-            {
-                fisheye.setValueBinding("orientation", app
-                        .createValueBinding(_orientation));
-            }
-            else
-            {
-                fisheye.setOrientation(_orientation);
-            }
-        }
-        if (_conservativeTrigger != null)
-        {
-            if (isValueReference(_conservativeTrigger))
-            {
-                fisheye.setValueBinding("conservativeTrigger", app
-                        .createValueBinding(_conservativeTrigger));
-            }
-            else
-            {
-                fisheye.setConservativeTrigger(Boolean
-                        .valueOf(_conservativeTrigger));
-            }
-        }
-    }
-
-}
+/*
+ * Copyright 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.fisheye;
+
+import javax.faces.application.Application;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.custom.div.DivTag;
+
+/**
+ * JSP Tag for the FishEyeList component
+ * 
+ * @author Jurgen Lust (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class HtmlFishEyeNavigationMenuTag extends DivTag
+{
+    private String _attachEdge;
+    private String _conservativeTrigger;
+    private String _effectUnits;
+    private String _itemHeight;
+    private String _itemMaxHeight;
+    private String _itemMaxWidth;
+    private String _itemPadding;
+    private String _itemWidth;
+    private String _labelEdge;
+    private String _orientation;
+
+    public String getAttachEdge()
+    {
+        return _attachEdge;
+    }
+
+    public String getComponentType()
+    {
+        return HtmlFishEyeNavigationMenu.COMPONENT_TYPE;
+    }
+
+    public String getConservativeTrigger()
+    {
+        return _conservativeTrigger;
+    }
+
+    public String getEffectUnits()
+    {
+        return _effectUnits;
+    }
+
+    public String getItemHeight()
+    {
+        return _itemHeight;
+    }
+
+    public String getItemMaxHeight()
+    {
+        return _itemMaxHeight;
+    }
+
+    public String getItemMaxWidth()
+    {
+        return _itemMaxWidth;
+    }
+
+    public String getItemPadding()
+    {
+        return _itemPadding;
+    }
+
+    public String getItemWidth()
+    {
+        return _itemWidth;
+    }
+
+    public String getLabelEdge()
+    {
+        return _labelEdge;
+    }
+
+    public String getOrientation()
+    {
+        return _orientation;
+    }
+
+    public String getRendererType()
+    {
+        return HtmlFishEyeNavigationMenuRenderer.RENDERER_TYPE;
+    }
+
+    public void release()
+    {
+        super.release();
+        _attachEdge = null;
+        _effectUnits = null;
+        _itemHeight = null;
+        _itemMaxHeight = null;
+        _itemMaxWidth = null;
+        _itemPadding = null;
+        _itemWidth = null;
+        _labelEdge = null;
+        _orientation = null;
+    }
+
+    public void setAttachEdge(String attachEdge)
+    {
+        this._attachEdge = attachEdge;
+    }
+
+    public void setConservativeTrigger(String conservativeTrigger)
+    {
+        this._conservativeTrigger = conservativeTrigger;
+    }
+
+    public void setEffectUnits(String effectUnits)
+    {
+        this._effectUnits = effectUnits;
+    }
+
+    public void setItemHeight(String itemHeight)
+    {
+        this._itemHeight = itemHeight;
+    }
+
+    public void setItemMaxHeight(String itemMaxHeight)
+    {
+        this._itemMaxHeight = itemMaxHeight;
+    }
+
+    public void setItemMaxWidth(String itemMaxWidth)
+    {
+        this._itemMaxWidth = itemMaxWidth;
+    }
+
+    public void setItemPadding(String itemPadding)
+    {
+        this._itemPadding = itemPadding;
+    }
+
+    public void setItemWidth(String itemWidth)
+    {
+        this._itemWidth = itemWidth;
+    }
+
+    public void setLabelEdge(String labelEdge)
+    {
+        this._labelEdge = labelEdge;
+    }
+
+    public void setOrientation(String orientation)
+    {
+        this._orientation = orientation;
+    }
+
+    protected void setProperties(UIComponent component)
+    {
+        super.setProperties(component);
+        HtmlFishEyeNavigationMenu fisheye = (HtmlFishEyeNavigationMenu) component;
+        FacesContext context = FacesContext.getCurrentInstance();
+        Application app = context.getApplication();
+        if (_attachEdge != null)
+        {
+            if (isValueReference(_attachEdge))
+            {
+                fisheye.setValueBinding("attachEdge", app
+                        .createValueBinding(_attachEdge));
+            }
+            else
+            {
+                fisheye.setAttachEdge(_attachEdge);
+            }
+        }
+        if (_effectUnits != null)
+        {
+            if (isValueReference(_effectUnits))
+            {
+                fisheye.setValueBinding("effectUnits", app
+                        .createValueBinding(_effectUnits));
+            }
+            else
+            {
+                fisheye.setEffectUnits(new Integer(_effectUnits));
+            }
+        }
+        if (_itemHeight != null)
+        {
+            if (isValueReference(_itemHeight))
+            {
+                fisheye.setValueBinding("itemHeight", app
+                        .createValueBinding(_itemHeight));
+            }
+            else
+            {
+                fisheye.setItemHeight(new Integer(_itemHeight));
+            }
+        }
+        if (_itemMaxHeight != null)
+        {
+            if (isValueReference(_itemMaxHeight))
+            {
+                fisheye.setValueBinding("itemMaxHeight", app
+                        .createValueBinding(_itemMaxHeight));
+            }
+            else
+            {
+                fisheye.setItemMaxHeight(new Integer(_itemMaxHeight));
+            }
+        }
+        if (_itemMaxWidth != null)
+        {
+            if (isValueReference(_itemMaxWidth))
+            {
+                fisheye.setValueBinding("itemMaxWidth", app
+                        .createValueBinding(_itemMaxWidth));
+            }
+            else
+            {
+                fisheye.setItemMaxWidth(new Integer(_itemMaxWidth));
+            }
+        }
+        if (_itemPadding != null)
+        {
+            if (isValueReference(_itemPadding))
+            {
+                fisheye.setValueBinding("itemPadding", app
+                        .createValueBinding(_itemPadding));
+            }
+            else
+            {
+                fisheye.setItemPadding(new Integer(_itemPadding));
+            }
+        }
+        if (_itemWidth != null)
+        {
+            if (isValueReference(_itemWidth))
+            {
+                fisheye.setValueBinding("itemWidth", app
+                        .createValueBinding(_itemWidth));
+            }
+            else
+            {
+                fisheye.setItemWidth(new Integer(_itemWidth));
+            }
+        }
+        if (_labelEdge != null)
+        {
+            if (isValueReference(_labelEdge))
+            {
+                fisheye.setValueBinding("labelEdge", app
+                        .createValueBinding(_labelEdge));
+            }
+            else
+            {
+                fisheye.setLabelEdge(_labelEdge);
+            }
+        }
+        if (_orientation != null)
+        {
+            if (isValueReference(_orientation))
+            {
+                fisheye.setValueBinding("orientation", app
+                        .createValueBinding(_orientation));
+            }
+            else
+            {
+                fisheye.setOrientation(_orientation);
+            }
+        }
+        if (_conservativeTrigger != null)
+        {
+            if (isValueReference(_conservativeTrigger))
+            {
+                fisheye.setValueBinding("conservativeTrigger", app
+                        .createValueBinding(_conservativeTrigger));
+            }
+            else
+            {
+                fisheye.setConservativeTrigger(Boolean
+                        .valueOf(_conservativeTrigger));
+            }
+        }
+    }
+
+}

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

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

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

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



Mime
View raw message