Author: rwhitcomb
Date: Tue Feb 6 22:18:15 2018
New Revision: 1823403
URL: http://svn.apache.org/viewvc?rev=1823403&view=rev
Log:
PIVOT-999: Remove the really unnecessary "putInt" and "putBoolean" methods
from Dictionary and Component.StyleDictionary, because the default "put"
method (with autoboxing) is perfectly able to handle those values.
Add a default "copy" method to the Dictionary interface to copy a key/value
pair from another dictionary. Also add the "Style" overload of this method
to Component.StyleDictionary for completeness.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java?rev=1823403&r1=1823402&r2=1823403&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java
Tue Feb 6 22:18:15 2018
@@ -393,7 +393,7 @@ public class TerraColorChooserSkin exten
public void setSpacing(int spacing) {
Utils.checkNonNegative(spacing, "spacing");
- tablePane.getStyles().putInt("horizontalSpacing", spacing);
+ tablePane.getStyles().put("horizontalSpacing", spacing);
}
public final void setSpacing(Number spacing) {
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=1823403&r1=1823402&r2=1823403&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
Tue Feb 6 22:18:15 2018
@@ -594,7 +594,7 @@ public class TerraMenuButtonSkin extends
}
public void setCloseTransitionDuration(int closeTransitionDuration) {
- menuPopup.getStyles().putInt("closeTransitionDuration",
closeTransitionDuration);
+ menuPopup.getStyles().put("closeTransitionDuration",
closeTransitionDuration);
MenuButton menuButton = (MenuButton) getComponent();
menuButton.setQueuedActionDelay(closeTransitionDuration + 50);
}
@@ -604,7 +604,7 @@ public class TerraMenuButtonSkin extends
}
public void setCloseTransitionRate(int closeTransitionRate) {
- menuPopup.getStyles().putInt("closeTransitionRate",
closeTransitionRate);
+ menuPopup.getStyles().put("closeTransitionRate", closeTransitionRate);
}
@Override
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=1823403&r1=1823402&r2=1823403&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
Tue Feb 6 22:18:15 2018
@@ -182,14 +182,14 @@ public class TerraSuggestionPopupSkin ex
private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraSuggestionPopupSkin() {
- listView.getStyles().putBoolean("variableItemHeight", true);
+ listView.getStyles().put("variableItemHeight", true);
listView.getListViewSelectionListeners().add(listViewSelectionListener);
listView.getComponentKeyListeners().add(listViewKeyListener);
listViewPanorama = new Panorama(listView);
listViewPanorama.getStyles().put("buttonBackgroundColor",
listView.getStyles().getColor("backgroundColor"));
- listViewPanorama.getStyles().putBoolean("alwaysShowScrollButtons",
true);
+ listViewPanorama.getStyles().put("alwaysShowScrollButtons", true);
listViewBorder = new Border(listViewPanorama);
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1823403&r1=1823402&r2=1823403&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Tue Feb 6 22:18:15 2018
@@ -47,6 +47,7 @@ import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Panorama;
import org.apache.pivot.wtk.Platform;
import org.apache.pivot.wtk.Point;
+import org.apache.pivot.wtk.Style;
import org.apache.pivot.wtk.TabPane;
import org.apache.pivot.wtk.TabPaneAttributeListener;
import org.apache.pivot.wtk.TabPaneListener;
@@ -601,10 +602,10 @@ public class TerraTabPaneSkin extends Ta
activeButtonBevelColor = TerraTheme.brighten(activeTabColor);
inactiveButtonBevelColor = TerraTheme.brighten(inactiveTabColor);
- tabButtonBoxPane.getStyles().put("fill", new Boolean(true));
+ tabButtonBoxPane.getStyles().put(Style.fill, new Boolean(true));
tabButtonPanorama.getStyles().put("buttonBackgroundColor",
borderColor);
- tabButtonPanorama.getStyles().putInt("buttonPadding", 6);
+ tabButtonPanorama.getStyles().put("buttonPadding", 6);
tabButtonPanorama.setView(tabButtonBoxPane);
tabButtonGroup.getButtonGroupListeners().add(new ButtonGroupListener()
{
@@ -1340,7 +1341,7 @@ public class TerraTabPaneSkin extends Ta
}
public void setButtonSpacing(int buttonSpacing) {
- tabButtonBoxPane.getStyles().putInt("spacing", buttonSpacing);
+ tabButtonBoxPane.getStyles().put("spacing", buttonSpacing);
}
public final void setButtonCornerRadius(int buttonCornerRadius) {
@@ -1377,11 +1378,11 @@ public class TerraTabPaneSkin extends Ta
switch (tabOrientation) {
case HORIZONTAL: {
- tabButtonBoxPane.getStyles().put("horizontalAlignment",
HorizontalAlignment.LEFT);
+ tabButtonBoxPane.getStyles().put(Style.horizontalAlignment,
HorizontalAlignment.LEFT);
break;
}
case VERTICAL: {
- tabButtonBoxPane.getStyles().put("verticalAlignment",
VerticalAlignment.TOP);
+ tabButtonBoxPane.getStyles().put(Style.verticalAlignment,
VerticalAlignment.TOP);
break;
}
default: {
