You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2009/03/09 21:07:03 UTC

svn commit: r751818 - in /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle: AbstractTogglePanel.java ToggleLinkRenderer.java

Author: cagatay
Date: Mon Mar  9 20:07:03 2009
New Revision: 751818

URL: http://svn.apache.org/viewvc?rev=751818&view=rev
Log:
TOMAHAWK-1399, disabled feature for togglePanel

Modified:
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/AbstractTogglePanel.java
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/AbstractTogglePanel.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/AbstractTogglePanel.java?rev=751818&r1=751817&r2=751818&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/AbstractTogglePanel.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/AbstractTogglePanel.java Mon Mar  9 20:07:03 2009
@@ -44,6 +44,8 @@
 
     public static final boolean DEFAULT_TOGGLED = false;
 
+    public static final boolean DEFAULT_DISABLED = false;
+
     /**
      * You can set toggled to true to force the toggleGroup to always be in toggle 
      * mode. Default is false.
@@ -56,6 +58,13 @@
     
     public abstract void setToggled(boolean toggleMode);
     
+    /**
+     * @JSFProperty
+     *   defaultValue="false"
+     * @return
+     */
+    public abstract boolean isDisabled();
+    
     public void processDecodes(FacesContext context)
     {
         super.processDecodes(context);

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java?rev=751818&r1=751817&r2=751818&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java Mon Mar  9 20:07:03 2009
@@ -117,7 +117,8 @@
     public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
         RendererUtils.checkParamValidity(context, component, ToggleLink.class);
 
-        if(((ToggleLink) component).isDisabled())
+        ToggleLink toggleLink = (ToggleLink) component;
+        if(isDisabled(context, toggleLink))
             return;
 
         super.encodeEnd(context, component);
@@ -127,7 +128,7 @@
         RendererUtils.checkParamValidity(context, component, ToggleLink.class);
 
         ToggleLink toggleLink = (ToggleLink) component;
-        if(toggleLink.isDisabled())
+        if(isDisabled(context, toggleLink))
             return;
 
 
@@ -173,4 +174,10 @@
     private String getHiddenFieldId(FacesContext context, TogglePanel togglePanel){
         return togglePanel.getClientId(context) + "_hidden";
     }
+    
+    private boolean isDisabled(FacesContext facesContext, ToggleLink link) {
+        TogglePanel panel = getParentTogglePanel(facesContext, link);
+
+        return panel.isDisabled() || link.isDisabled();
+    }
 }