You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2012/07/27 23:22:46 UTC

svn commit: r1366540 - /pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java

Author: rwhitcomb
Date: Fri Jul 27 21:22:45 2012
New Revision: 1366540

URL: http://svn.apache.org/viewvc?rev=1366540&view=rev
Log:
Merge revision 1366538 to 2.0.x branch.

Revise previous fix for Pivot-860:  don't need to add the ComponentStateListener (already done by superclass).

Modified:
    pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java

Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=1366540&r1=1366539&r2=1366540&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Fri Jul 27 21:22:45 2012
@@ -285,8 +285,6 @@ public class TerraExpanderSkin extends E
 
         Expander expander = (Expander)component;
         expander.add(titleBarTablePane);
-        expander.getComponentStateListeners().add(this);
-        enabledChanged(expander);
 
         Image buttonData = expander.isExpanded() ? collapseImage : expandImage;
         shadeButton = new ShadeButton(buttonData);
@@ -296,6 +294,7 @@ public class TerraExpanderSkin extends E
 
         titleChanged(expander, null);
         collapsibleChanged(expander);
+        enabledChanged(expander);
     }
 
     @Override