Author: rwhitcomb Date: Fri Mar 12 23:46:34 2021 New Revision: 1887556 URL: http://svn.apache.org/viewvc?rev=1887556&view=rev Log: PIVOT-1053: Convert the "wtk-terra" code to using new "putStyle", "getStyle", and "copyStyle" methods in Component.
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.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/TerraMenuItemSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.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 pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Fri Mar 12 23:46:34 2021 @@ -209,7 +209,7 @@ public class TerraAlertSkin extends Terr this.borderBackgroundColor = borderBackgroundColor; if (messageBorder != null) { - messageBorder.getStyles().put(Style.backgroundColor, borderBackgroundColor); + messageBorder.putStyle(Style.backgroundColor, borderBackgroundColor); } } @@ -233,7 +233,7 @@ public class TerraAlertSkin extends Terr this.borderColor = borderColor; if (messageBorder != null) { - messageBorder.getStyles().put(Style.color, borderColor); + messageBorder.putStyle(Style.color, borderColor); } } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Fri Mar 12 23:46:34 2021 @@ -169,8 +169,8 @@ public class TerraCalendarButtonSkin ext // Create the border calendarBorder = new Border(calendar); - calendarBorder.getStyles().put(Style.padding, Insets.NONE); - calendarBorder.getStyles().put(Style.color, borderColor); + calendarBorder.putStyle(Style.padding, Insets.NONE); + calendarBorder.putStyle(Style.color, borderColor); // Set the popup content calendarPopup.setContent(calendarBorder); @@ -458,7 +458,7 @@ public class TerraCalendarButtonSkin ext Utils.checkNull(borderColor, "borderColor"); this.borderColor = borderColor; - calendarBorder.getStyles().put(Style.color, borderColor); + calendarBorder.putStyle(Style.color, borderColor); repaintComponent(); } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Fri Mar 12 23:46:34 2021 @@ -370,7 +370,7 @@ public class TerraCalendarSkin extends C super.render(Integer.valueOf(date.day + 1), button, highlighted); if (button.isSelected()) { - label.getStyles().put(Style.color, button.getStyles().get(Style.selectionColor)); + label.putStyle(Style.color, button.getStyle(Style.selectionColor)); } } } @@ -425,7 +425,7 @@ public class TerraCalendarSkin extends C monthSpinner.setSpinnerData(new NumericSpinnerData(0, 11)); monthSpinner.setItemRenderer(new MonthSpinnerItemRenderer()); monthSpinner.setCircular(true); - monthSpinner.getStyles().put(Style.sizeToContent, true); + monthSpinner.putStyle(Style.sizeToContent, true); monthSpinner.getSpinnerSelectionListeners().add(new SpinnerSelectionListener() { @Override @@ -462,8 +462,8 @@ public class TerraCalendarSkin extends C // Add the month/year table pane TablePane monthYearTablePane = new TablePane(); - monthYearTablePane.getStyles().put(Style.padding, 3); - monthYearTablePane.getStyles().put(Style.horizontalSpacing, 4); + monthYearTablePane.putStyle(Style.padding, 3); + monthYearTablePane.putStyle(Style.horizontalSpacing, 4); new TablePane.Column(monthYearTablePane, 1, true); new TablePane.Column(monthYearTablePane, -1); @@ -485,9 +485,9 @@ public class TerraCalendarSkin extends C for (int i = 0; i < 7; i++) { Label label = new Label(); - label.getStyles().put(Style.font, labelFont); - label.getStyles().put(Style.padding, new Insets(2, 2, 4, 2)); - label.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.CENTER); + label.putStyle(Style.font, labelFont); + label.putStyle(Style.padding, new Insets(2, 2, 4, 2)); + label.putStyle(Style.horizontalAlignment, HorizontalAlignment.CENTER); calendarRow.add(label); } @@ -738,13 +738,13 @@ public class TerraCalendarSkin extends C this.font = font; - monthSpinner.getStyles().put(Style.font, font); - yearSpinner.getStyles().put(Style.font, font); + monthSpinner.putStyle(Style.font, font); + yearSpinner.putStyle(Style.font, font); TablePane.Row row = calendarTablePane.getRows().get(1); for (int i = 0; i < 7; i++) { Label label = (Label) row.get(i); - label.getStyles().put(Style.font, font); + label.putStyle(Style.font, font); } invalidateComponent(); Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Fri Mar 12 23:46:34 2021 @@ -169,8 +169,8 @@ public class TerraColorChooserButtonSkin // Create the border colorChooserBorder = new Border(colorChooser); - colorChooserBorder.getStyles().put(Style.color, borderColor); - colorChooserBorder.getStyles().put(Style.padding, 2); + colorChooserBorder.putStyle(Style.color, borderColor); + colorChooserBorder.putStyle(Style.padding, 2); // Set the popup content colorChooserPopup.setContent(colorChooserBorder); @@ -439,7 +439,7 @@ public class TerraColorChooserButtonSkin Utils.checkNull(borderColor, "borderColor"); this.borderColor = borderColor; - colorChooserBorder.getStyles().put(Style.color, borderColor); + colorChooserBorder.putStyle(Style.color, borderColor); repaintComponent(); } 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=1887556&r1=1887555&r2=1887556&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 Fri Mar 12 23:46:34 2021 @@ -388,19 +388,19 @@ public class TerraColorChooserSkin exten } public int getSpacing() { - return tablePane.getStyles().getInt(Style.horizontalSpacing); + return tablePane.getStyleInt(Style.horizontalSpacing); } public void setSpacing(int spacing) { Utils.checkNonNegative(spacing, "spacing"); - tablePane.getStyles().put(Style.horizontalSpacing, spacing); + tablePane.putStyle(Style.horizontalSpacing, spacing); } public final void setSpacing(Number spacing) { Utils.checkNull(spacing, "spacing"); - tablePane.getStyles().put(Style.horizontalSpacing, spacing); + tablePane.putStyle(Style.horizontalSpacing, spacing); } @Override Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Fri Mar 12 23:46:34 2021 @@ -240,23 +240,23 @@ public class TerraExpanderSkin extends E new TablePane.Column(titleBarTablePane, 1, true); new TablePane.Column(titleBarTablePane, -1); - titleBarTablePane.getStyles().put(Style.padding, new Insets(3)); - titleBarTablePane.getStyles().put(Style.horizontalSpacing, 3); + titleBarTablePane.putStyle(Style.padding, new Insets(3)); + titleBarTablePane.putStyle(Style.horizontalSpacing, 3); TablePane.Row titleRow = new TablePane.Row(titleBarTablePane, -1); titleBoxPane = new BoxPane(Orientation.HORIZONTAL); - titleBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.LEFT); + titleBoxPane.putStyle(Style.horizontalAlignment, HorizontalAlignment.LEFT); buttonBoxPane = new BoxPane(Orientation.HORIZONTAL); - buttonBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.RIGHT); - buttonBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.CENTER); + buttonBoxPane.putStyle(Style.horizontalAlignment, HorizontalAlignment.RIGHT); + buttonBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.CENTER); titleRow.add(titleBoxPane); titleRow.add(buttonBoxPane); Font titleFont = getThemeFont().deriveFont(Font.BOLD); - titleLabel.getStyles().put(Style.font, titleFont); + titleLabel.putStyle(Style.font, titleFont); titleBoxPane.add(titleLabel); // Listen for click events on the title bar @@ -459,11 +459,11 @@ public class TerraExpanderSkin extends E } public Font getTitleBarFont() { - return titleLabel.getStyles().getFont(Style.font); + return titleLabel.getStyleFont(Style.font); } public void setTitleBarFont(Font titleBarFont) { - titleLabel.getStyles().put(Style.font, titleBarFont); + titleLabel.putStyle(Style.font, titleBarFont); } public final void setTitleBarFont(String titleBarFont) { @@ -480,7 +480,7 @@ public class TerraExpanderSkin extends E public void setTitleBarColor(Color titleBarColor) { this.titleBarColor = titleBarColor; - titleLabel.getStyles().put(Style.color, titleBarColor); + titleLabel.putStyle(Style.color, titleBarColor); } public final void setTitleBarColor(String titleBarColor) { @@ -650,9 +650,9 @@ public class TerraExpanderSkin extends E @Override public void enabledChanged(Component component) { if (component.isEnabled()) { - titleLabel.getStyles().put(Style.color, titleBarColor); + titleLabel.putStyle(Style.color, titleBarColor); } else { - titleLabel.getStyles().put(Style.color, disabledShadeButtonColor); + titleLabel.putStyle(Style.color, disabledShadeButtonColor); } } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Fri Mar 12 23:46:34 2021 @@ -227,19 +227,19 @@ public class TerraFileBrowserSheetSkin e } public boolean isHideDisabledFiles() { - return fileBrowser.getStyles().getBoolean(Style.hideDisabledFiles); + return fileBrowser.getStyleBoolean(Style.hideDisabledFiles); } public void setHideDisabledFiles(boolean hideDisabledFiles) { - fileBrowser.getStyles().put(Style.hideDisabledFiles, hideDisabledFiles); + fileBrowser.putStyle(Style.hideDisabledFiles, hideDisabledFiles); } public boolean isShowHiddenFiles() { - return fileBrowser.getStyles().getBoolean(Style.showHiddenFiles); + return fileBrowser.getStyleBoolean(Style.showHiddenFiles); } public void setShowHiddenFiles(boolean showHiddenFiles) { - fileBrowser.getStyles().put(Style.showHiddenFiles, showHiddenFiles); + fileBrowser.putStyle(Style.showHiddenFiles, showHiddenFiles); } public boolean getShowOKButtonFirst() { @@ -357,7 +357,7 @@ public class TerraFileBrowserSheetSkin e public void modeChanged(FileBrowserSheet fileBrowserSheet, FileBrowserSheet.Mode previousMode) { FileBrowserSheet.Mode mode = fileBrowserSheet.getMode(); - fileBrowser.getStyles().put(Style.keyboardFolderTraversalEnabled, + fileBrowser.putStyle(Style.keyboardFolderTraversalEnabled, (mode != FileBrowserSheet.Mode.SAVE_TO)); switch (mode) { Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Fri Mar 12 23:46:34 2021 @@ -81,7 +81,7 @@ public class TerraFormSkin extends Conta GraphicsUtilities.setAntialiasingOn(graphics); graphics.setStroke(new BasicStroke(0)); - graphics.setColor(flagMessageWindow.getStyles().getColor(Style.backgroundColor)); + graphics.setColor(flagMessageWindow.getStyleColor(Style.backgroundColor)); graphics.draw(arrow); graphics.fill(arrow); @@ -164,8 +164,8 @@ public class TerraFormSkin extends Conta flagMessageLabel.setText(message); flagMessageLabel.setSize(flagMessageLabel.getPreferredSize()); flagMessageLabel.validate(); - flagMessageLabel.getStyles().put(Style.color, messageColor); - flagMessageLabel.getStyles().put(Style.backgroundColor, + flagMessageLabel.putStyle(Style.color, messageColor); + flagMessageLabel.putStyle(Style.backgroundColor, messageBackgroundColor); int flagMessageX = field.getX() + field.getWidth() @@ -290,8 +290,8 @@ public class TerraFormSkin extends Conta break; } - flagMessageLabel.getStyles().put(Style.color, color); - flagMessageWindow.getStyles().put(Style.backgroundColor, backgroundColor); + flagMessageLabel.putStyle(Style.color, color); + flagMessageWindow.putStyle(Style.backgroundColor, backgroundColor); // Open the window Point location = component.mapPointToAncestor(component.getDisplay(), 0, @@ -343,7 +343,7 @@ public class TerraFormSkin extends Conta Font themeFont = theme.getFont(); labelFont = themeFont; - flagMessageLabel.getStyles().put(Style.font, themeFont); + flagMessageLabel.putStyle(Style.font, themeFont); errorIcon = theme.getSmallMessageIcon(MessageType.ERROR); errorMessageColor = theme.getColor(4); @@ -375,7 +375,7 @@ public class TerraFormSkin extends Conta maximumFlagImageWidth = Math.max(maximumFlagImageWidth, infoIcon.getWidth()); // Create the flag message popup - flagMessageLabel.getStyles().put(Style.padding, new Insets(3, 4, 3, 4)); + flagMessageLabel.putStyle(Style.padding, new Insets(3, 4, 3, 4)); if (!themeIsFlat()) { flagMessageWindow.getDecorators().add(new DropShadowDecorator()); @@ -1057,7 +1057,7 @@ public class TerraFormSkin extends Conta this.separatorColor = separatorColor; for (Separator separator : separators) { - separator.getStyles().put(Style.color, separatorColor); + separator.putStyle(Style.color, separatorColor); } } @@ -1073,7 +1073,7 @@ public class TerraFormSkin extends Conta this.separatorHeadingColor = separatorHeadingColor; for (Separator separator : separators) { - separator.getStyles().put(Style.headingColor, separatorHeadingColor); + separator.putStyle(Style.headingColor, separatorHeadingColor); } } @@ -1098,7 +1098,7 @@ public class TerraFormSkin extends Conta for (int fieldIndex = 0, fieldCount = section.getLength(); fieldIndex < fieldCount; fieldIndex++) { Label label = labels.get(sectionIndex).get(fieldIndex); - label.getStyles().put(Style.font, labelFont); + label.putStyle(Style.font, labelFont); } } @@ -1118,13 +1118,13 @@ public class TerraFormSkin extends Conta } public final Font getMessageFont() { - return flagMessageLabel.getStyles().getFont(Style.font); + return flagMessageLabel.getStyleFont(Style.font); } public final void setMessageFont(final Font font) { Utils.checkNull(font, "messageFont"); - flagMessageLabel.getStyles().put(Style.font, font); + flagMessageLabel.putStyle(Style.font, font); } public final void setMessageFont(final String fontString) { @@ -1192,8 +1192,8 @@ public class TerraFormSkin extends Conta // Insert separator Separator separator = new Separator(section.getHeading()); - separator.getStyles().put(Style.color, separatorColor); - separator.getStyles().put(Style.headingColor, separatorHeadingColor); + separator.putStyle(Style.color, separatorColor); + separator.putStyle(Style.headingColor, separatorHeadingColor); separators.insert(separator, index); form.add(separator); @@ -1237,7 +1237,7 @@ public class TerraFormSkin extends Conta // Create the label Label label = new Label(); - label.getStyles().put(Style.font, labelFont); + label.putStyle(Style.font, labelFont); labels.get(sectionIndex).insert(label, index); form.add(label); Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Fri Mar 12 23:46:34 2021 @@ -272,24 +272,24 @@ public class TerraFrameSkin extends Wind titleRow.add(titleBoxPane); titleRow.add(buttonBoxPane); - titleBarTablePane.getStyles().put(Style.padding, new Insets(2)); + titleBarTablePane.putStyle(Style.padding, new Insets(2)); // Initialize the title box pane titleBoxPane.add(iconImageView); titleBoxPane.add(titleLabel); - titleBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.CENTER); - titleBoxPane.getStyles().put(Style.padding, new Insets(0, 0, 0, 2)); + titleBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.CENTER); + titleBoxPane.putStyle(Style.padding, new Insets(0, 0, 0, 2)); Font titleFont = theme.getFont().deriveFont(Font.BOLD); - titleLabel.getStyles().put(Style.font, titleFont); + titleLabel.putStyle(Style.font, titleFont); iconImageView.setPreferredSize(16, 16); - iconImageView.getStyles().put(Style.fill, true); - iconImageView.getStyles().put(Style.backgroundColor, null); + iconImageView.putStyle(Style.fill, true); + iconImageView.putStyle(Style.backgroundColor, null); // Initialize the button box pane - buttonBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.RIGHT); - buttonBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.CENTER); + buttonBoxPane.putStyle(Style.horizontalAlignment, HorizontalAlignment.RIGHT); + buttonBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.CENTER); } @Override @@ -851,8 +851,8 @@ public class TerraFrameSkin extends Wind public void activeChanged(Window window, Window obverseWindow) { boolean active = window.isActive(); - titleLabel.getStyles().put(Style.color, active ? titleBarColor : inactiveTitleBarColor); - iconImageView.getStyles().put(Style.opacity, Float.valueOf(active ? 1.0f : INACTIVE_ICON_OPACITY)); + titleLabel.putStyle(Style.color, active ? titleBarColor : inactiveTitleBarColor); + iconImageView.putStyle(Style.opacity, Float.valueOf(active ? 1.0f : INACTIVE_ICON_OPACITY)); updateButtonStyles(minimizeButton, active); updateButtonStyles(maximizeButton, active); @@ -873,10 +873,10 @@ public class TerraFrameSkin extends Wind } private void updateButtonStyles(FrameButton frameButton, boolean active) { - frameButton.getStyles().put(Style.color, active ? titleBarColor : inactiveTitleBarColor); - frameButton.getStyles().put(Style.backgroundColor, + frameButton.putStyle(Style.color, active ? titleBarColor : inactiveTitleBarColor); + frameButton.putStyle(Style.backgroundColor, active ? titleBarBackgroundColor : inactiveTitleBarBackgroundColor); - frameButton.getStyles().put(Style.borderColor, + frameButton.putStyle(Style.borderColor, active ? titleBarBorderColor : inactiveTitleBarBorderColor); } } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Fri Mar 12 23:46:34 2021 @@ -205,13 +205,13 @@ public class TerraListButtonSkin extends // Create the panorama and border listViewPanorama = new Panorama(listView); - listViewPanorama.getStyles().put(Style.buttonBackgroundColor, - listView.getStyles().get(Style.backgroundColor)); - listViewPanorama.getStyles().put(Style.alwaysShowScrollButtons, true); + listViewPanorama.putStyle(Style.buttonBackgroundColor, + listView.getStyle(Style.backgroundColor)); + listViewPanorama.putStyle(Style.alwaysShowScrollButtons, true); listViewBorder = new Border(listViewPanorama); - listViewBorder.getStyles().put(Style.padding, 0); - listViewBorder.getStyles().put(Style.color, borderColor); + listViewBorder.putStyle(Style.padding, 0); + listViewBorder.putStyle(Style.color, borderColor); // Set the popup content listViewPopup.setContent(listViewBorder); @@ -553,7 +553,7 @@ public class TerraListButtonSkin extends Utils.checkNull(borderColor, "borderColor"); this.borderColor = borderColor; - listViewBorder.getStyles().put(Style.color, borderColor); + listViewBorder.putStyle(Style.color, borderColor); repaintComponent(); } @@ -635,85 +635,85 @@ public class TerraListButtonSkin extends } public Object getListFont() { - return listView.getStyles().get(Style.font); + return listView.getStyle(Style.font); } public void setListFont(Object listFont) { - listView.getStyles().put(Style.font, listFont); + listView.putStyle(Style.font, listFont); } public Object getListColor() { - return listView.getStyles().get(Style.color); + return listView.getStyle(Style.color); } public void setListColor(Object listColor) { - listView.getStyles().put(Style.color, listColor); + listView.putStyle(Style.color, listColor); } public Object getListDisabledColor() { - return listView.getStyles().get(Style.disabledColor); + return listView.getStyle(Style.disabledColor); } public void setListDisabledColor(Object listDisabledColor) { - listView.getStyles().put(Style.disabledColor, listDisabledColor); + listView.putStyle(Style.disabledColor, listDisabledColor); } public Object getListBackgroundColor() { - return listView.getStyles().get(Style.backgroundColor); + return listView.getStyle(Style.backgroundColor); } public void setListBackgroundColor(Object listBackgroundColor) { - listView.getStyles().put(Style.backgroundColor, listBackgroundColor); - listViewPanorama.getStyles().put(Style.buttonBackgroundColor, listBackgroundColor); + listView.putStyle(Style.backgroundColor, listBackgroundColor); + listViewPanorama.putStyle(Style.buttonBackgroundColor, listBackgroundColor); } public Object getListSelectionColor() { - return listView.getStyles().get(Style.selectionColor); + return listView.getStyle(Style.selectionColor); } public void setListSelectionColor(Object listSelectionColor) { - listView.getStyles().put(Style.selectionColor, listSelectionColor); + listView.putStyle(Style.selectionColor, listSelectionColor); } public Object getListSelectionBackgroundColor() { - return listView.getStyles().get(Style.selectionBackgroundColor); + return listView.getStyle(Style.selectionBackgroundColor); } public void setListSelectionBackgroundColor(Object listSelectionBackgroundColor) { - listView.getStyles().put(Style.selectionBackgroundColor, listSelectionBackgroundColor); + listView.putStyle(Style.selectionBackgroundColor, listSelectionBackgroundColor); } public Object getListInactiveSelectionColor() { - return listView.getStyles().get(Style.inactiveSelectionColor); + return listView.getStyle(Style.inactiveSelectionColor); } public void setListInactiveSelectionColor(Object listInactiveSelectionColor) { - listView.getStyles().put(Style.inactiveSelectionColor, listInactiveSelectionColor); + listView.putStyle(Style.inactiveSelectionColor, listInactiveSelectionColor); } public Object getListInactiveSelectionBackgroundColor() { - return listView.getStyles().get(Style.inactiveSelectionBackgroundColor); + return listView.getStyle(Style.inactiveSelectionBackgroundColor); } public void setListInactiveSelectionBackgroundColor(Object listInactiveSelectionBackgroundColor) { - listView.getStyles().put(Style.inactiveSelectionBackgroundColor, + listView.putStyle(Style.inactiveSelectionBackgroundColor, listInactiveSelectionBackgroundColor); } public Object getListHighlightColor() { - return listView.getStyles().get(Style.highlightColor); + return listView.getStyle(Style.highlightColor); } public void setListHighlightColor(Object listHighlightColor) { - listView.getStyles().put(Style.highlightColor, listHighlightColor); + listView.putStyle(Style.highlightColor, listHighlightColor); } public Object getListHighlightBackgroundColor() { - return listView.getStyles().get(Style.highlightBackgroundColor); + return listView.getStyle(Style.highlightBackgroundColor); } public void setListHighlightBackgroundColor(Object listHighlightBackgroundColor) { - listView.getStyles().put(Style.highlightBackgroundColor, listHighlightBackgroundColor); + listView.putStyle(Style.highlightBackgroundColor, listHighlightBackgroundColor); } @Override Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java Fri Mar 12 23:46:34 2021 @@ -87,7 +87,7 @@ public class TerraMenuBarItemSkin extend // Paint highlight state if (highlight) { MenuBar menuBar = (MenuBar) menuBarItem.getParent(); - Color activeBackgroundColor = menuBar.getStyles().getColor(Style.activeBackgroundColor); + Color activeBackgroundColor = menuBar.getStyleColor(Style.activeBackgroundColor); graphics.setColor(activeBackgroundColor); graphics.fillRect(0, 0, width, height); } @@ -108,7 +108,7 @@ public class TerraMenuBarItemSkin extend if (menuBarItem.isActive()) { MenuBar menuBar = (MenuBar) menuBarItem.getParent(); - Color activeBackgroundColor = menuBar.getStyles().getColor(Style.activeBackgroundColor); + Color activeBackgroundColor = menuBar.getStyleColor(Style.activeBackgroundColor); opaque = (activeBackgroundColor.getTransparency() == Transparency.OPAQUE); } @@ -116,14 +116,14 @@ public class TerraMenuBarItemSkin extend } public Color getPopupBorderColor() { - return menuPopup.getStyles().getColor(Style.borderColor); + return menuPopup.getStyleColor(Style.borderColor); } public void setPopupBorderColor(Color popupBorderColor) { - menuPopup.getStyles().put(Style.borderColor, popupBorderColor); + menuPopup.putStyle(Style.borderColor, popupBorderColor); } public void setPopupBorderColor(String popupBorderColor) { - menuPopup.getStyles().put(Style.borderColor, popupBorderColor); + menuPopup.putStyle(Style.borderColor, popupBorderColor); } } 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=1887556&r1=1887555&r2=1887556&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 Fri Mar 12 23:46:34 2021 @@ -453,7 +453,7 @@ public class TerraMenuButtonSkin extends Utils.checkNull(borderColor, "borderColor"); this.borderColor = borderColor; - menuPopup.getStyles().put(Style.borderColor, borderColor); + menuPopup.putStyle(Style.borderColor, borderColor); repaintComponent(); } @@ -589,21 +589,21 @@ public class TerraMenuButtonSkin extends } public int getCloseTransitionDuration() { - return menuPopup.getStyles().getInt(Style.closeTransitionDuration); + return menuPopup.getStyleInt(Style.closeTransitionDuration); } public void setCloseTransitionDuration(int closeTransitionDuration) { - menuPopup.getStyles().put(Style.closeTransitionDuration, closeTransitionDuration); + menuPopup.putStyle(Style.closeTransitionDuration, closeTransitionDuration); MenuButton menuButton = (MenuButton) getComponent(); menuButton.setQueuedActionDelay(closeTransitionDuration + 50); } public int getCloseTransitionRate() { - return menuPopup.getStyles().getInt(Style.closeTransitionRate); + return menuPopup.getStyleInt(Style.closeTransitionRate); } public void setCloseTransitionRate(int closeTransitionRate) { - menuPopup.getStyles().put(Style.closeTransitionRate, closeTransitionRate); + menuPopup.putStyle(Style.closeTransitionRate, closeTransitionRate); } @Override Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java Fri Mar 12 23:46:34 2021 @@ -55,7 +55,7 @@ public class TerraMenuItemSkin extends M Menu.Item menuItem = (Menu.Item) getComponent(); Menu menu = (Menu) menuItem.getParent(); - Color color = menu.getStyles().getColor(Style.color); + Color color = menu.getStyleColor(Style.color); graphics.setColor(color); graphics.setStroke(new BasicStroke(2.5f)); @@ -137,7 +137,7 @@ public class TerraMenuItemSkin extends M // Paint highlight state if (highlight) { - Color activeBackgroundColor = menu.getStyles().getColor(Style.activeBackgroundColor); + Color activeBackgroundColor = menu.getStyleColor(Style.activeBackgroundColor); graphics.setPaint(new GradientPaint(width / 2f, 0, TerraTheme.brighten(activeBackgroundColor), width / 2f, height, activeBackgroundColor)); @@ -152,7 +152,7 @@ public class TerraMenuItemSkin extends M // Paint the expander if (menuItem.getMenu() != null) { - Color color = menu.getStyles().getColor(highlight ? Style.activeColor : Style.color); + Color color = menu.getStyleColor(highlight ? Style.activeColor : Style.color); graphics.setColor(color); graphics.setStroke(new BasicStroke(0)); @@ -176,7 +176,7 @@ public class TerraMenuItemSkin extends M if (menuItem.isActive()) { Menu menu = (Menu) menuItem.getParent(); - Color activeBackgroundColor = menu.getStyles().getColor(Style.activeBackgroundColor); + Color activeBackgroundColor = menu.getStyleColor(Style.activeBackgroundColor); opaque = (activeBackgroundColor.getTransparency() == Transparency.OPAQUE); } @@ -188,11 +188,11 @@ public class TerraMenuItemSkin extends M } public Color getPopupBorderColor() { - return menuPopup.getStyles().getColor(Style.borderColor); + return menuPopup.getStyleColor(Style.borderColor); } public void setPopupBorderColor(Color popupBorderColor) { - menuPopup.getStyles().put(Style.borderColor, popupBorderColor); + menuPopup.putStyle(Style.borderColor, popupBorderColor); } public void setPopupBorderColor(String popupBorderColor) { Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Fri Mar 12 23:46:34 2021 @@ -141,12 +141,12 @@ public class TerraMenuPopupSkin extends setBackgroundColor((Color) null); panorama = new Panorama(); - panorama.getStyles().put(Style.buttonBackgroundColor, defaultBackgroundColor()); + panorama.putStyle(Style.buttonBackgroundColor, defaultBackgroundColor()); border = new Border(panorama); - border.getStyles().put(Style.color, theme.getColor(7)); - border.getStyles().put(Style.backgroundColor, null); - border.getStyles().put(Style.padding, 0); + border.putStyle(Style.color, theme.getColor(7)); + border.putStyle(Style.backgroundColor, null); + border.putStyle(Style.padding, 0); } @Override @@ -173,15 +173,15 @@ public class TerraMenuPopupSkin extends } public Color getBorderColor() { - return border.getStyles().getColor(Style.color); + return border.getStyleColor(Style.color); } public void setBorderColor(Color borderColor) { - border.getStyles().put(Style.color, borderColor); + border.putStyle(Style.color, borderColor); } public void setBorderColor(String borderColor) { - border.getStyles().put(Style.color, borderColor); + border.putStyle(Style.color, borderColor); } public int getCloseTransitionDuration() { Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Fri Mar 12 23:46:34 2021 @@ -186,22 +186,22 @@ public class TerraPaletteSkin extends Wi titleRow.add(titleBoxPane); titleRow.add(buttonBoxPane); - titleBarTablePane.getStyles().put(Style.padding, new Insets(2, 3, 2, 3)); + titleBarTablePane.putStyle(Style.padding, new Insets(2, 3, 2, 3)); // Initialize the title box pane - titleBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.CENTER); + titleBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.CENTER); titleBoxPane.add(titleLabel); - titleBoxPane.getStyles().put(Style.padding, new Insets(0, 0, 0, 3)); + titleBoxPane.putStyle(Style.padding, new Insets(0, 0, 0, 3)); Font titleFont = theme.getFont(); titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * titleFontScale)); - titleLabel.getStyles().put(Style.font, titleFont); - titleLabel.getStyles().put(Style.color, titleBarColor); + titleLabel.putStyle(Style.font, titleFont); + titleLabel.putStyle(Style.color, titleBarColor); // Initialize the button box pane - buttonBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.RIGHT); - buttonBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.CENTER); + buttonBoxPane.putStyle(Style.horizontalAlignment, HorizontalAlignment.RIGHT); + buttonBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.CENTER); buttonBoxPane.add(closeButton); closeButton.getComponentMouseButtonListeners().add( @@ -454,7 +454,7 @@ public class TerraPaletteSkin extends Wi * specification} */ public final void setTitleFont(String font) { - titleLabel.getStyles().put(Style.font, decodeFont(font)); + titleLabel.putStyle(Style.font, decodeFont(font)); } /** @@ -463,7 +463,7 @@ public class TerraPaletteSkin extends Wi * @param font A dictionary {@link Theme#deriveFont describing a font} */ public final void setTitleFont(Dictionary<String, ?> font) { - titleLabel.getStyles().put(Style.font, Theme.deriveFont(font)); + titleLabel.putStyle(Style.font, Theme.deriveFont(font)); } public final float getTitleFontScale() { @@ -476,7 +476,7 @@ public class TerraPaletteSkin extends Wi Theme theme = currentTheme(); Font titleFont = theme.getFont(); titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * scale)); - titleLabel.getStyles().put(Style.font, titleFont); + titleLabel.putStyle(Style.font, titleFont); invalidateComponent(); } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Fri Mar 12 23:46:34 2021 @@ -213,7 +213,7 @@ public class TerraPromptSkin extends Ter * @return The font used to render the message label's text. */ public final Font getMessageFont() { - return messageLabel.getStyles().getFont(Style.font); + return messageLabel.getStyleFont(Style.font); } /** @@ -222,7 +222,7 @@ public class TerraPromptSkin extends Ter * @param font The new font used to render the message label text. */ public final void setMessageFont(final Font font) { - messageLabel.getStyles().put(Style.font, font); + messageLabel.putStyle(Style.font, font); } /** @@ -231,7 +231,7 @@ public class TerraPromptSkin extends Ter * @param font A font specification. */ public final void setMessageFont(final String font) { - messageLabel.getStyles().put(Style.font, font); + messageLabel.putStyle(Style.font, font); } /** @@ -240,14 +240,14 @@ public class TerraPromptSkin extends Ter * @param font A dictionary describing a font. */ public final void setMessageFont(final Dictionary<String, ?> font) { - messageLabel.getStyles().put(Style.font, font); + messageLabel.putStyle(Style.font, font); } /** * @return The foreground color of the text of the message label. */ public final Color getMessageColor() { - return messageLabel.getStyles().getColor(Style.color); + return messageLabel.getStyleColor(Style.color); } /** @@ -256,7 +256,7 @@ public class TerraPromptSkin extends Ter * @param color The new foreground color for the label text. */ public final void setMessageColor(final Color color) { - messageLabel.getStyles().put(Style.color, color); + messageLabel.putStyle(Style.color, color); } /** @@ -265,14 +265,14 @@ public class TerraPromptSkin extends Ter * @param color Any of the recognized color values. */ public final void setMessageColor(final String color) { - messageLabel.getStyles().put(Style.color, color); + messageLabel.putStyle(Style.color, color); } /** * @return The background color of the message label. */ public final Color getMessageBackgroundColor() { - return messageLabel.getStyles().getColor(Style.backgroundColor); + return messageLabel.getStyleColor(Style.backgroundColor); } /** @@ -282,7 +282,7 @@ public class TerraPromptSkin extends Ter * (can be {@code null} to let the parent background show through). */ public final void setMessageBackgroundColor(final Color backgroundColor) { - messageLabel.getStyles().put(Style.backgroundColor, backgroundColor); + messageLabel.putStyle(Style.backgroundColor, backgroundColor); } /** @@ -291,14 +291,14 @@ public class TerraPromptSkin extends Ter * @param backgroundColor Any of the recognized color values. */ public final void setMessageBackgroundColor(final String backgroundColor) { - messageLabel.getStyles().put(Style.backgroundColor, backgroundColor); + messageLabel.putStyle(Style.backgroundColor, backgroundColor); } /** * @return The text decoration of the message label. */ public final TextDecoration getMessageTextDecoration() { - return (TextDecoration) messageLabel.getStyles().get(Style.textDecoration); + return (TextDecoration) messageLabel.getStyle(Style.textDecoration); } /** @@ -307,7 +307,7 @@ public class TerraPromptSkin extends Ter * @param textDecoration The text decoration for the message label. */ public final void setMessageTextDecoration(final TextDecoration textDecoration) { - messageLabel.getStyles().put(Style.textDecoration, textDecoration); + messageLabel.putStyle(Style.textDecoration, textDecoration); } } 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=1887556&r1=1887555&r2=1887556&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 Fri Mar 12 23:46:34 2021 @@ -182,14 +182,14 @@ public class TerraSuggestionPopupSkin ex private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30; public TerraSuggestionPopupSkin() { - listView.getStyles().put(Style.variableItemHeight, variableItemHeight); + listView.putStyle(Style.variableItemHeight, variableItemHeight); listView.getListViewSelectionListeners().add(listViewSelectionListener); listView.getComponentKeyListeners().add(listViewKeyListener); listViewPanorama = new Panorama(listView); - listViewPanorama.getStyles().put(Style.buttonBackgroundColor, - listView.getStyles().getColor(Style.backgroundColor)); - listViewPanorama.getStyles().put(Style.alwaysShowScrollButtons, true); + listViewPanorama.putStyle(Style.buttonBackgroundColor, + listView.getStyleColor(Style.backgroundColor)); + listViewPanorama.putStyle(Style.alwaysShowScrollButtons, true); listViewBorder = new Border(listViewPanorama); } @@ -216,11 +216,11 @@ public class TerraSuggestionPopupSkin ex } public Font getFont() { - return listView.getStyles().getFont(Style.font); + return listView.getStyleFont(Style.font); } public void setFont(Font font) { - listView.getStyles().put(Style.font, font); + listView.putStyle(Style.font, font); } public final void setFont(String font) { @@ -232,11 +232,11 @@ public class TerraSuggestionPopupSkin ex } public Color getColor() { - return listView.getStyles().getColor(Style.color); + return listView.getStyleColor(Style.color); } public void setColor(Color color) { - listView.getStyles().put(Style.color, color); + listView.putStyle(Style.color, color); } public final void setColor(String color) { @@ -244,11 +244,11 @@ public class TerraSuggestionPopupSkin ex } public Color getBorderColor() { - return listViewBorder.getStyles().getColor(Style.color); + return listViewBorder.getStyleColor(Style.color); } public void setBorderColor(Color borderColor) { - listViewBorder.getStyles().put(Style.color, borderColor); + listViewBorder.putStyle(Style.color, borderColor); } public final void setBorderColor(String borderColor) { @@ -277,7 +277,7 @@ public class TerraSuggestionPopupSkin ex public void setVariableItemHeight(boolean variableItemHeight) { this.variableItemHeight = variableItemHeight; - listView.getStyles().put(Style.variableItemHeight, variableItemHeight); + listView.putStyle(Style.variableItemHeight, variableItemHeight); } @Override 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=1887556&r1=1887555&r2=1887556&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 Fri Mar 12 23:46:34 2021 @@ -583,10 +583,10 @@ public class TerraTabPaneSkin extends Ta activeButtonBevelColor = TerraTheme.brighten(activeTabColor); inactiveButtonBevelColor = TerraTheme.brighten(inactiveTabColor); - tabButtonBoxPane.getStyles().put(Style.fill, true); + tabButtonBoxPane.putStyle(Style.fill, true); - tabButtonPanorama.getStyles().put(Style.buttonBackgroundColor, borderColor); - tabButtonPanorama.getStyles().put(Style.buttonPadding, 6); + tabButtonPanorama.putStyle(Style.buttonBackgroundColor, borderColor); + tabButtonPanorama.putStyle(Style.buttonPadding, 6); tabButtonPanorama.setView(tabButtonBoxPane); tabButtonGroup.getButtonGroupListeners().add(new ButtonGroupListener() { @@ -1162,7 +1162,7 @@ public class TerraTabPaneSkin extends Ta Utils.checkNull(borderColor, "borderColor"); this.borderColor = borderColor; - tabButtonPanorama.getStyles().put(Style.buttonBackgroundColor, borderColor); + tabButtonPanorama.putStyle(Style.buttonBackgroundColor, borderColor); repaintComponent(); } @@ -1300,11 +1300,11 @@ public class TerraTabPaneSkin extends Ta } public int getButtonSpacing() { - return tabButtonBoxPane.getStyles().getInt(Style.spacing); + return tabButtonBoxPane.getStyleInt(Style.spacing); } public void setButtonSpacing(int buttonSpacing) { - tabButtonBoxPane.getStyles().put(Style.spacing, buttonSpacing); + tabButtonBoxPane.putStyle(Style.spacing, buttonSpacing); } public final void setButtonCornerRadius(int buttonCornerRadius) { @@ -1341,10 +1341,10 @@ public class TerraTabPaneSkin extends Ta switch (tabOrientation) { case HORIZONTAL: - tabButtonBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.LEFT); + tabButtonBoxPane.putStyle(Style.horizontalAlignment, HorizontalAlignment.LEFT); break; case VERTICAL: - tabButtonBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.TOP); + tabButtonBoxPane.putStyle(Style.verticalAlignment, VerticalAlignment.TOP); break; default: break; Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java?rev=1887556&r1=1887555&r2=1887556&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java Fri Mar 12 23:46:34 2021 @@ -300,19 +300,19 @@ public class TerraVFSBrowserSheetSkin ex } public boolean isHideDisabledFiles() { - return fileBrowser.getStyles().getBoolean(Style.hideDisabledFiles); + return fileBrowser.getStyleBoolean(Style.hideDisabledFiles); } public void setHideDisabledFiles(boolean hideDisabledFiles) { - fileBrowser.getStyles().put(Style.hideDisabledFiles, hideDisabledFiles); + fileBrowser.putStyle(Style.hideDisabledFiles, hideDisabledFiles); } public boolean isShowHiddenFiles() { - return fileBrowser.getStyles().getBoolean(Style.showHiddenFiles); + return fileBrowser.getStyleBoolean(Style.showHiddenFiles); } public void setShowHiddenFiles(boolean showHiddenFiles) { - fileBrowser.getStyles().put(Style.showHiddenFiles, showHiddenFiles); + fileBrowser.putStyle(Style.showHiddenFiles, showHiddenFiles); } public boolean getShowOKButtonFirst() { @@ -450,7 +450,7 @@ public class TerraVFSBrowserSheetSkin ex public void modeChanged(VFSBrowserSheet fileBrowserSheet, VFSBrowserSheet.Mode previousMode) { VFSBrowserSheet.Mode mode = fileBrowserSheet.getMode(); - fileBrowser.getStyles().put(Style.keyboardFolderTraversalEnabled, + fileBrowser.putStyle(Style.keyboardFolderTraversalEnabled, (mode != VFSBrowserSheet.Mode.SAVE_TO)); switch (mode) {