You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/08/13 19:19:17 UTC

svn commit: r803950 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: SplitPane.java skin/terra/TerraSplitPaneSkin.java

Author: tvolkert
Date: Thu Aug 13 17:19:16 2009
New Revision: 803950

URL: http://svn.apache.org/viewvc?rev=803950&view=rev
Log:
Minor clean-up in SplitPane and TerraSplitPaneSkin (unrelated to last change - things that have been in there for some time)

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java?rev=803950&r1=803949&r2=803950&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java Thu Aug 13 17:19:16 2009
@@ -85,8 +85,8 @@
         }
     }
 
-    Component topLeft = null;
-    Component bottomRight = null;
+    private Component topLeft = null;
+    private Component bottomRight = null;
     private Orientation orientation = null;
     private Region primaryRegion = Region.TOP_LEFT;
     private float splitRatio = 0.5f;
@@ -116,9 +116,10 @@
     }
 
     public void setTopLeft(Component topLeft) {
-        if (topLeft != this.topLeft) {
+        Component previousTopLeft = this.topLeft;
+
+        if (topLeft != previousTopLeft) {
             // Set the component as the new top/left component
-            Component previousTopLeft = this.topLeft;
             this.topLeft = topLeft;
 
             // Remove any previous content component
@@ -144,9 +145,10 @@
     }
 
     public void setBottomRight(Component bottomRight) {
-        if (bottomRight != this.bottomRight) {
+        Component previousBottomRight = this.bottomRight;
+
+        if (bottomRight != previousBottomRight) {
             // Set the component as the new bottom/right component
-            Component previousBottomRight = this.bottomRight;
             this.bottomRight = bottomRight;
 
             // Remove any previous content component
@@ -210,7 +212,6 @@
 
         if (this.orientation != orientation) {
             this.orientation = orientation;
-
             splitPaneListeners.orientationChanged(this);
         }
     }
@@ -234,7 +235,6 @@
 
         if (this.primaryRegion != primaryRegion) {
             this.primaryRegion = primaryRegion;
-
             splitPaneListeners.primaryRegionChanged(this);
         }
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java?rev=803950&r1=803949&r2=803950&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java Thu Aug 13 17:19:16 2009
@@ -19,6 +19,7 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
+
 import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.Cursor;
 import org.apache.pivot.wtk.Dimensions;