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 08:12:33 UTC
svn commit: r803785 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: Insets.java
skin/BoxPaneSkin.java skin/CardPaneSkin.java skin/LabelSkin.java
skin/StackPaneSkin.java skin/TablePaneSkin.java
Author: tvolkert
Date: Thu Aug 13 06:12:33 2009
New Revision: 803785
URL: http://svn.apache.org/viewvc?rev=803785&view=rev
Log:
Added Insets.NONE; changed skins to use it. This will yield re-use of a common immutable struct as opposed to unnecessary allocations.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Insets.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Insets.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Insets.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Insets.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Insets.java Thu Aug 13 06:12:33 2009
@@ -40,6 +40,11 @@
public static final String BOTTOM_KEY = "bottom";
public static final String RIGHT_KEY = "right";
+ /**
+ * Insets whose top, left, bottom, and right values are all zero.
+ */
+ public static final Insets NONE = new Insets(0);
+
public Insets(int inset) {
top = inset;
left = inset;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java Thu Aug 13 06:12:33 2009
@@ -35,7 +35,7 @@
implements BoxPaneListener {
private HorizontalAlignment horizontalAlignment = HorizontalAlignment.LEFT;
private VerticalAlignment verticalAlignment = VerticalAlignment.TOP;
- private Insets padding = new Insets(0);
+ private Insets padding = Insets.NONE;
private int spacing = 4;
private boolean fill = false;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Thu Aug 13 06:12:33 2009
@@ -295,7 +295,7 @@
}
}
- private Insets padding = new Insets(0);
+ private Insets padding = Insets.NONE;
private boolean sizeToSelection = false;
private SelectionChangeEffect selectionChangeEffect = null;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Thu Aug 13 06:12:33 2009
@@ -75,7 +75,7 @@
textDecoration = null;
horizontalAlignment = HorizontalAlignment.LEFT;
verticalAlignment = VerticalAlignment.TOP;
- padding = new Insets(0);
+ padding = Insets.NONE;
wrapText = false;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java Thu Aug 13 06:12:33 2009
@@ -28,7 +28,7 @@
* @author gbrown
*/
public class StackPaneSkin extends ContainerSkin {
- private Insets padding = new Insets(0);
+ private Insets padding = Insets.NONE;
public int getPreferredWidth(int height) {
int preferredWidth = 0;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=803785&r1=803784&r2=803785&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Thu Aug 13 06:12:33 2009
@@ -43,7 +43,7 @@
*/
public class TablePaneSkin extends ContainerSkin implements TablePane.Skin,
TablePaneListener, TablePaneAttributeListener {
- private Insets padding = DEFAULT_PADDING;
+ private Insets padding = Insets.NONE;
private int horizontalSpacing = 0;
private int verticalSpacing = 0;
private boolean showHorizontalGridLines = false;
@@ -51,8 +51,6 @@
private Color gridColor = Color.BLACK;
private Color highlightBackgroundColor = Color.GRAY;
- private static final Insets DEFAULT_PADDING = new Insets(0);
-
private int[] columnWidths = null;
private int[] rowHeights = null;