Author: rwhitcomb
Date: Fri Mar 12 21:04:51 2021
New Revision: 1887553
URL: http://svn.apache.org/viewvc?rev=1887553&view=rev
Log:
Improvements to code that needs to get info from the theme:
- methods in Component to get the theme font and colors
- add some "getxxx" methods in the skins to reduce code to do the casting
- this change involves a bunch of "checkstyle" fixes also
- move more of the initial theme value settings to the JSON file
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_defaults.json
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SliderSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNodeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinParagraphView.java
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=1887553&r1=1887552&r2=1887553&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 21:04:51 2021
@@ -255,8 +255,7 @@ public class TerraExpanderSkin extends E
titleRow.add(titleBoxPane);
titleRow.add(buttonBoxPane);
- Theme theme = currentTheme();
- Font titleFont = theme.getFont().deriveFont(Font.BOLD);
+ Font titleFont = getThemeFont().deriveFont(Font.BOLD);
titleLabel.getStyles().put(Style.font, titleFont);
titleBoxPane.add(titleLabel);
@@ -277,8 +276,7 @@ public class TerraExpanderSkin extends E
shadeButton.getButtonPressListeners().add(this);
- Theme theme = currentTheme();
- theme.setDefaultStyles(this);
+ setDefaultStyles();
titleChanged(expander, null);
collapsibleChanged(expander);
@@ -490,8 +488,7 @@ public class TerraExpanderSkin extends E
}
public final void setTitleBarColor(int titleBarColor) {
- Theme theme = currentTheme();
- setTitleBarColor(theme.getColor(titleBarColor));
+ setTitleBarColor(getColor(titleBarColor));
}
public Color getTitleBarBackgroundColor() {
@@ -509,8 +506,7 @@ public class TerraExpanderSkin extends E
}
public final void setTitleBarBackgroundColor(int titleBarBackgroundColor) {
- Theme theme = currentTheme();
- setTitleBarBackgroundColor(theme.getColor(titleBarBackgroundColor));
+ setTitleBarBackgroundColor(getColor(titleBarBackgroundColor));
}
public Color getTitleBarBorderColor() {
@@ -527,8 +523,7 @@ public class TerraExpanderSkin extends E
}
public final void setTitleBarBorderColor(int titleBarBorderColor) {
- Theme theme = currentTheme();
- setTitleBarBorderColor(theme.getColor(titleBarBorderColor));
+ setTitleBarBorderColor(getColor(titleBarBorderColor));
}
public Color getShadeButtonColor() {
@@ -545,8 +540,7 @@ public class TerraExpanderSkin extends E
}
public final void setShadeButtonColor(int shadeButtonColor) {
- Theme theme = currentTheme();
- setShadeButtonColor(theme.getColor(shadeButtonColor));
+ setShadeButtonColor(getColor(shadeButtonColor));
}
public Color getDisabledShadeButtonColor() {
@@ -564,8 +558,7 @@ public class TerraExpanderSkin extends E
}
public final void setDisabledShadeButtonColor(int
disabledShadeButtonColor) {
- Theme theme = currentTheme();
- setDisabledShadeButtonColor(theme.getColor(disabledShadeButtonColor));
+ setDisabledShadeButtonColor(getColor(disabledShadeButtonColor));
}
public Color getBorderColor() {
@@ -583,8 +576,7 @@ public class TerraExpanderSkin extends E
}
public final void setBorderColor(int borderColor) {
- Theme theme = currentTheme();
- setBorderColor(theme.getColor(borderColor));
+ setBorderColor(getColor(borderColor));
}
public Insets getPadding() {
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
Fri Mar 12 21:04:51 2021
@@ -213,8 +213,7 @@ public class TerraRollupSkin extends Rol
rollupButton = new RollupButton();
rollup.add(rollupButton);
- Theme theme = currentTheme();
- theme.setDefaultStyles(this);
+ setDefaultStyles();
// Initialize state
headingChanged(rollup, null);
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollPaneSkin.java
Fri Mar 12 21:04:51 2021
@@ -29,9 +29,6 @@ public class TerraScrollPaneSkin extends
* from {@link ScrollPaneSkin#install}.
*/
public TerraScrollPaneSkin() {
- super();
-
- setBackgroundPaint(currentTheme().getColor(4));
}
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSeparatorSkin.java
Fri Mar 12 21:04:51 2021
@@ -16,23 +16,35 @@
*/
package org.apache.pivot.wtk.skin.terra;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.SeparatorSkin;
/**
* Terra separator skin.
*/
public class TerraSeparatorSkin extends SeparatorSkin {
+ /**
+ * Specific constructor with nothing to do.
+ * <p> Default colors, etc. set by call to {@link
TerraTheme#setDefaultStyles}
+ * from {@link SeparatorSkin#install}.
+ */
public TerraSeparatorSkin() {
}
- public void setColor(int color) {
- Theme theme = currentTheme();
- setColor(theme.getColor(color));
+ /**
+ * Set the foreground color to the theme index color.
+ *
+ * @param color The theme color index for the new foreground color.
+ */
+ public void setColor(final int color) {
+ setColor(getColor(color));
}
- public void setHeadingColor(int headingColor) {
- Theme theme = currentTheme();
- setHeadingColor(theme.getColor(headingColor));
+ /**
+ * Set the heading color to the theme index color.
+ *
+ * @param headingColor The theme color index for the new heading color.
+ */
+ public void setHeadingColor(final int headingColor) {
+ setHeadingColor(getColor(headingColor));
}
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
Fri Mar 12 21:04:51 2021
@@ -31,7 +31,6 @@ import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Slider;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.ComponentSkin;
import org.apache.pivot.wtk.skin.SliderSkin;
@@ -60,12 +59,12 @@ public class TerraSliderSkin extends Sli
}
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
return 0;
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
return 0;
}
@@ -75,7 +74,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
int width = getWidth();
int height = getHeight();
@@ -99,7 +98,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public void enabledChanged(Component component) {
+ public void enabledChanged(final Component component) {
super.enabledChanged(component);
highlighted = false;
@@ -107,23 +106,24 @@ public class TerraSliderSkin extends Sli
}
@Override
- public void focusedChanged(Component component, Component
obverseComponent) {
+ public void focusedChanged(final Component component, final Component
obverseComponent) {
super.focusedChanged(component, obverseComponent);
TerraSliderSkin.this.repaintComponent();
}
@Override
- public boolean mouseMove(Component component, int x, int y) {
+ public boolean mouseMove(final Component component, final int x, final
int y) {
boolean consumed = super.mouseMove(component, x, y);
if (Mouse.getCapturer() == component) {
- Slider slider = (Slider) TerraSliderSkin.this.getComponent();
+ Slider slider = getSlider();
+ Point sliderLocation = thumb.mapPointToAncestor(slider, x, y);
+ float ratio;
+
if (slider.getOrientation() == Orientation.HORIZONTAL) {
int sliderWidth = slider.getWidth();
int thumbWidthLocal = thumb.getWidth();
-
- Point sliderLocation = thumb.mapPointToAncestor(slider, x,
y);
int sliderX = sliderLocation.x;
int minX = dragOffset.x;
@@ -136,19 +136,10 @@ public class TerraSliderSkin extends Sli
sliderX = maxX;
}
- float ratio = (float) (sliderX - dragOffset.x)
- / (sliderWidth - thumbWidthLocal);
-
- int start = slider.getStart();
- int end = slider.getEnd();
-
- int value = (int) (start + (end - start) * ratio);
- slider.setValue(value);
+ ratio = (float) (sliderX - dragOffset.x) / (sliderWidth -
thumbWidthLocal);
} else {
int sliderHeight = slider.getHeight();
int thumbHeightLocal = thumb.getHeight();
-
- Point sliderLocation = thumb.mapPointToAncestor(slider, x,
y);
int sliderY = sliderLocation.y;
int minY = dragOffset.y;
@@ -161,22 +152,21 @@ public class TerraSliderSkin extends Sli
sliderY = maxY;
}
- float ratio = (float) (sliderY - dragOffset.y)
- / (sliderHeight - thumbHeightLocal);
+ ratio = (float) (sliderY - dragOffset.y) / (sliderHeight -
thumbHeightLocal);
+ }
- int start = slider.getStart();
- int end = slider.getEnd();
+ int start = slider.getStart();
+ int end = slider.getEnd();
- int value = (int) (start + (end - start) * ratio);
- slider.setValue(value);
- }
+ int value = (int) (start + (end - start) * ratio);
+ slider.setValue(value);
}
return consumed;
}
@Override
- public void mouseOver(Component component) {
+ public void mouseOver(final Component component) {
super.mouseOver(component);
highlighted = true;
@@ -184,7 +174,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public void mouseOut(Component component) {
+ public void mouseOut(final Component component) {
super.mouseOut(component);
highlighted = false;
@@ -192,7 +182,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public boolean mouseDown(Component component, Mouse.Button button, int
x, int y) {
+ public boolean mouseDown(final Component component, final Mouse.Button
button, final int x, final int y) {
boolean consumed = super.mouseDown(component, button, x, y);
component.requestFocus();
@@ -209,7 +199,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public boolean mouseUp(Component component, Mouse.Button button, int
x, int y) {
+ public boolean mouseUp(final Component component, final Mouse.Button
button, final int x, final int y) {
boolean consumed = super.mouseUp(component, button, x, y);
if (Mouse.getCapturer() == component) {
@@ -227,10 +217,10 @@ public class TerraSliderSkin extends Sli
* UP} Increment the slider's value.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
+ public boolean keyPressed(final Component component, final int
keyCode, final KeyLocation keyLocation) {
boolean consumed = super.keyPressed(component, keyCode,
keyLocation);
- Slider slider = (Slider) TerraSliderSkin.this.getComponent();
+ Slider slider = getSlider();
int start = slider.getStart();
int end = slider.getEnd();
@@ -252,7 +242,7 @@ public class TerraSliderSkin extends Sli
}
private Thumb thumb = new Thumb();
- Point dragOffset = null;
+ private Point dragOffset = null;
private Color trackColor;
private Color buttonBackgroundColor;
@@ -282,7 +272,7 @@ public class TerraSliderSkin extends Sli
}
@Override
- public void install(Component component) {
+ public void install(final Component component) {
super.install(component);
Slider slider = (Slider) component;
@@ -290,8 +280,8 @@ public class TerraSliderSkin extends Sli
}
@Override
- public int getPreferredWidth(int height) {
- Slider slider = (Slider) getComponent();
+ public int getPreferredWidth(final int height) {
+ Slider slider = getSlider();
int preferredWidth;
if (slider.getOrientation() == Orientation.HORIZONTAL) {
@@ -304,8 +294,8 @@ public class TerraSliderSkin extends Sli
}
@Override
- public int getPreferredHeight(int width) {
- Slider slider = (Slider) getComponent();
+ public int getPreferredHeight(final int width) {
+ Slider slider = getSlider();
int preferredHeight;
if (slider.getOrientation() == Orientation.HORIZONTAL) {
@@ -324,7 +314,7 @@ public class TerraSliderSkin extends Sli
@Override
public void layout() {
- Slider slider = (Slider) getComponent();
+ Slider slider = getSlider();
int width = getWidth();
int height = getHeight();
@@ -340,7 +330,6 @@ public class TerraSliderSkin extends Sli
thumb.setLocation((int) ((width - thumbWidth) * ratio), (height -
thumbHeight) / 2);
} else {
thumb.setSize(thumbHeight, thumbWidth);
-
thumb.setLocation((width - thumbHeight) / 2, (int) ((height -
thumbWidth) * ratio));
}
}
@@ -349,10 +338,10 @@ public class TerraSliderSkin extends Sli
BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
super.paint(graphics);
- Slider slider = (Slider) getComponent();
+ Slider slider = getSlider();
int width = getWidth();
int height = getHeight();
@@ -400,153 +389,158 @@ public class TerraSliderSkin extends Sli
return trackColor;
}
- public void setTrackColor(Color trackColor) {
- Utils.checkNull(trackColor, "trackColor");
+ public void setTrackColor(final Color trackColorValue) {
+ Utils.checkNull(trackColorValue, "trackColor");
- this.trackColor = trackColor;
+ this.trackColor = trackColorValue;
repaintComponent();
}
- public final void setTrackColor(String trackColor) {
- setTrackColor(GraphicsUtilities.decodeColor(trackColor, "trackColor"));
+ public final void setTrackColor(final String trackColorString) {
+ setTrackColor(GraphicsUtilities.decodeColor(trackColorString,
"trackColor"));
}
- public final void setTrackColor(int trackColor) {
- Theme theme = currentTheme();
- setTrackColor(theme.getColor(trackColor));
+ public final void setTrackColor(final int trackColorIndex) {
+ setTrackColor(getColor(trackColorIndex));
}
public Color getButtonBackgroundColor() {
return buttonBackgroundColor;
}
- public void setButtonBackgroundColor(Color buttonBackgroundColor) {
- Utils.checkNull(buttonBackgroundColor, "buttonBackgroundColor");
+ public void setButtonBackgroundColor(final Color
buttonBackgroundColorValue) {
+ Utils.checkNull(buttonBackgroundColorValue, "buttonBackgroundColor");
- this.buttonBackgroundColor = buttonBackgroundColor;
+ this.buttonBackgroundColor = buttonBackgroundColorValue;
buttonBevelColor = TerraTheme.brighten(buttonBackgroundColor);
repaintComponent();
}
- public final void setButtonBackgroundColor(String buttonBackgroundColor) {
-
setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColor,
"buttonBackgroundColor"));
+ public final void setButtonBackgroundColor(final String
buttonBackgroundColorString) {
+
setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColorString,
"buttonBackgroundColor"));
}
- public final void setButtonBackgroundColor(int buttonBackgroundColor) {
- Theme theme = currentTheme();
- setButtonBackgroundColor(theme.getColor(buttonBackgroundColor));
+ public final void setButtonBackgroundColor(final int
buttonBackgroundColorIndex) {
+ setButtonBackgroundColor(getColor(buttonBackgroundColorIndex));
}
public Color getButtonBorderColor() {
return buttonBorderColor;
}
- public void setButtonBorderColor(Color buttonBorderColor) {
- Utils.checkNull(buttonBorderColor, "buttonBorderColor");
+ public void setButtonBorderColor(final Color buttonBorderColorValue) {
+ Utils.checkNull(buttonBorderColorValue, "buttonBorderColor");
- this.buttonBorderColor = buttonBorderColor;
+ this.buttonBorderColor = buttonBorderColorValue;
repaintComponent();
}
- public final void setButtonBorderColor(String buttonBorderColor) {
- setButtonBorderColor(GraphicsUtilities.decodeColor(buttonBorderColor,
"buttonBorderColor"));
+ public final void setButtonBorderColor(final String
buttonBorderColorString) {
+
setButtonBorderColor(GraphicsUtilities.decodeColor(buttonBorderColorString,
"buttonBorderColor"));
}
- public final void setButtonBorderColor(int buttonBorderColor) {
- Theme theme = currentTheme();
- setButtonBorderColor(theme.getColor(buttonBorderColor));
+ public final void setButtonBorderColor(final int buttonBorderColorIndex) {
+ setButtonBorderColor(getColor(buttonBorderColorIndex));
}
public int getTrackWidth() {
return trackWidth;
}
- public void setTrackWidth(int trackWidth) {
- Utils.checkNonNegative(trackWidth, "trackWidth");
+ public void setTrackWidth(final int trackWidthValue) {
+ Utils.checkNonNegative(trackWidthValue, "trackWidth");
- this.trackWidth = trackWidth;
+ this.trackWidth = trackWidthValue;
repaintComponent();
}
- public void setTrackWidth(Number trackWidth) {
- Utils.checkNull(trackWidth, "trackWidth");
+ public void setTrackWidth(final Number trackWidthValue) {
+ Utils.checkNull(trackWidthValue, "trackWidth");
- setTrackWidth(trackWidth.intValue());
+ setTrackWidth(trackWidthValue.intValue());
}
public int getThumbWidth() {
return thumbWidth;
}
- public void setThumbWidth(int thumbWidth) {
- if (thumbWidth < MINIMUM_THUMB_WIDTH) {
+ public void setThumbWidth(final int thumbWidthValue) {
+ if (thumbWidthValue < MINIMUM_THUMB_WIDTH) {
throw new IllegalArgumentException("thumbWidth must be greater
than or equal to "
+ MINIMUM_THUMB_WIDTH);
}
- this.thumbWidth = thumbWidth;
+ this.thumbWidth = thumbWidthValue;
invalidateComponent();
}
- public void setThumbWidth(Number thumbWidth) {
- Utils.checkNull(thumbWidth, "thumbWidth");
+ public void setThumbWidth(final Number thumbWidthValue) {
+ Utils.checkNull(thumbWidthValue, "thumbWidth");
- setThumbWidth(thumbWidth.intValue());
+ setThumbWidth(thumbWidthValue.intValue());
}
public int getThumbHeight() {
return thumbHeight;
}
- public void setThumbHeight(int thumbHeight) {
- if (thumbHeight < MINIMUM_THUMB_HEIGHT) {
+ public void setThumbHeight(final int thumbHeightValue) {
+ if (thumbHeightValue < MINIMUM_THUMB_HEIGHT) {
throw new IllegalArgumentException("thumbHeight must be greater
than or equal to "
+ MINIMUM_THUMB_HEIGHT);
}
- this.thumbHeight = thumbHeight;
+ this.thumbHeight = thumbHeightValue;
invalidateComponent();
}
- public void setThumbHeight(Number thumbHeight) {
- Utils.checkNull(thumbHeight, "thumbHeight");
+ public void setThumbHeight(final Number thumbHeightValue) {
+ Utils.checkNull(thumbHeightValue, "thumbHeight");
- setThumbHeight(thumbHeight.intValue());
+ setThumbHeight(thumbHeightValue.intValue());
}
public int getTickSpacing() {
return tickSpacing;
}
- public void setTickSpacing(int tickSpacing) {
- this.tickSpacing = tickSpacing;
+ /**
+ * Set the tick spacing value along the slider axis.
+ *
+ * @param tickSpacingValue An integer number of pixels to use to
+ * space out the tick marks along the axis. Less or equal zero
+ * implies don't draw tick marks.
+ */
+ public void setTickSpacing(final int tickSpacingValue) {
+ this.tickSpacing = tickSpacingValue;
repaintComponent();
}
- public void setTickSpacing(Number tickSpacing) {
- Utils.checkNull(tickSpacing, "tickSpacing");
+ public void setTickSpacing(final Number tickSpacingValue) {
+ Utils.checkNull(tickSpacingValue, "tickSpacing");
- setTickSpacing(tickSpacing.intValue());
+ setTickSpacing(tickSpacingValue.intValue());
}
@Override
- public boolean mouseClick(Component component, Mouse.Button button, int x,
int y, int count) {
+ public boolean mouseClick(final Component component, final Mouse.Button
button,
+ final int x, final int y, final int count) {
thumb.requestFocus();
return super.mouseClick(component, button, x, y, count);
}
@Override
- public void rangeChanged(Slider slider, int previousStart, int
previousEnd) {
+ public void rangeChanged(final Slider slider, final int previousStart,
final int previousEnd) {
invalidateComponent();
}
@Override
- public void orientationChanged(Slider slider) {
+ public void orientationChanged(final Slider slider) {
invalidateComponent();
}
@Override
- public void valueChanged(Slider slider, int previousValue) {
+ public void valueChanged(final Slider slider, final int previousValue) {
layout();
}
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
Fri Mar 12 21:04:51 2021
@@ -60,22 +60,22 @@ public class TerraSpinnerSkin extends Co
/**
* Starts spinning the specified spinner.
*
- * @param spinnerArgument The spinner to spin
- * @param directionArgument <code>1</code> to adjust the spinner's
selected
+ * @param spinnerValue The spinner to spin
+ * @param directionValue <code>1</code> to adjust the spinner's
selected
* index larger; <code>-1</code> to adjust it smaller
* @exception IllegalStateException If automatic spinner of any spinner
* is already in progress. Only one spinner may be automatically spun
at
* one time
*/
- public void start(Spinner spinnerArgument, int directionArgument) {
- assert (directionArgument != 0) : "Spinner direction must be
positive or negative";
+ public void start(final Spinner spinnerValue, final int
directionValue) {
+ assert (directionValue != 0) : "Spinner direction must be positive
or negative";
if (scheduledSpinnerCallback != null) {
throw new IllegalStateException("Spinner is already running");
}
- this.spinner = spinnerArgument;
- this.direction = directionArgument;
+ this.spinner = spinnerValue;
+ this.direction = directionValue;
// Run once to register we've started, then wait a timeout period
and begin rapidly spinning
scheduledSpinnerCallback =
ApplicationContext.runAndScheduleRecurringCallback(() -> spin(), 400, 30);
@@ -136,10 +136,10 @@ public class TerraSpinnerSkin extends Co
*/
protected class SpinnerContentSkin extends ComponentSkin {
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
int preferredWidth = 0;
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
Spinner.ItemRenderer itemRenderer = spinner.getItemRenderer();
if (sizeToContent) {
@@ -158,10 +158,10 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
int preferredHeight = 0;
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
Spinner.ItemRenderer itemRenderer = spinner.getItemRenderer();
itemRenderer.render(spinner.getSelectedItem(), spinner);
@@ -171,8 +171,8 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public int getBaseline(int width, int height) {
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ public int getBaseline(final int width, final int height) {
+ Spinner spinner = getSpinner();
int baseline = -1;
@@ -187,7 +187,7 @@ public class TerraSpinnerSkin extends Co
public Dimensions getPreferredSize() {
Dimensions preferredSize;
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
Spinner.ItemRenderer itemRenderer = spinner.getItemRenderer();
if (sizeToContent) {
@@ -206,9 +206,9 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
SpinnerContent spinnerContentLocal = (SpinnerContent)
getComponent();
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
int width = getWidth();
int height = getHeight();
@@ -243,7 +243,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void focusedChanged(Component component, Component
obverseComponent) {
+ public void focusedChanged(final Component component, final Component
obverseComponent) {
super.focusedChanged(component, obverseComponent);
repaintComponent();
@@ -254,10 +254,10 @@ public class TerraSpinnerSkin extends Co
* {@link KeyCode#DOWN DOWN} Select the next spinner item.
*/
@Override
- public boolean keyPressed(Component component, int keyCode,
KeyLocation keyLocation) {
+ public boolean keyPressed(final Component component, final int
keyCode, final KeyLocation keyLocation) {
boolean consumed = false;
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
boolean circular = spinner.isCircular();
int count = spinner.getSpinnerData().getLength();
@@ -294,10 +294,10 @@ public class TerraSpinnerSkin extends Co
* rendered text matches the typed key (case insensitive).
*/
@Override
- public boolean keyTyped(Component component, char character) {
+ public boolean keyTyped(final Component component, final char
character) {
boolean consumed = super.keyTyped(component, character);
- Spinner spinner = (Spinner) TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
List<?> spinnerData = spinner.getSpinnerData();
Spinner.ItemRenderer itemRenderer = spinner.getItemRenderer();
@@ -328,7 +328,7 @@ public class TerraSpinnerSkin extends Co
private int direction;
private Image buttonImage;
- public SpinButton(int direction, Image buttonImage) {
+ public SpinButton(final int direction, final Image buttonImage) {
this.direction = direction;
this.buttonImage = buttonImage;
@@ -352,12 +352,12 @@ public class TerraSpinnerSkin extends Co
private boolean pressed = false;
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int height) {
return BUTTON_IMAGE_SIZE + 6;
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int width) {
return BUTTON_IMAGE_SIZE + 2;
}
@@ -367,7 +367,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
// Apply spinner styles to the button
SpinButton spinButton = (SpinButton) getComponent();
@@ -396,7 +396,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void enabledChanged(Component component) {
+ public void enabledChanged(final Component component) {
super.enabledChanged(component);
automaticSpinner.stop();
@@ -407,7 +407,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void mouseOver(Component component) {
+ public void mouseOver(final Component component) {
super.mouseOver(component);
highlighted = true;
@@ -415,7 +415,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void mouseOut(Component component) {
+ public void mouseOut(final Component component) {
super.mouseOut(component);
automaticSpinner.stop();
@@ -426,12 +426,12 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public boolean mouseDown(Component component, Mouse.Button button, int
x, int y) {
+ public boolean mouseDown(final Component component, final Mouse.Button
button, final int x, final int y) {
boolean consumed = super.mouseDown(component, button, x, y);
if (button == Mouse.Button.LEFT) {
SpinButton spinButton = (SpinButton) getComponent();
- Spinner spinner = (Spinner)
TerraSpinnerSkin.this.getComponent();
+ Spinner spinner = getSpinner();
// Start the automatic spinner. It'll be stopped when we
// mouse up or mouse out
@@ -445,7 +445,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public boolean mouseUp(Component component, Mouse.Button button, int
x, int y) {
+ public boolean mouseUp(final Component component, final Mouse.Button
button, final int x, final int y) {
boolean consumed = super.mouseUp(component, button, x, y);
if (button == Mouse.Button.LEFT) {
@@ -474,7 +474,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
graphics.setStroke(new BasicStroke(0));
graphics.setPaint(buttonColor);
}
@@ -482,7 +482,7 @@ public class TerraSpinnerSkin extends Co
protected class SpinUpImage extends SpinButtonImage {
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
super.paint(graphics);
int[] xPoints = {0, 2, 4};
@@ -494,7 +494,7 @@ public class TerraSpinnerSkin extends Co
protected class SpinDownImage extends SpinButtonImage {
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
super.paint(graphics);
int[] xPoints = {0, 2, 4};
@@ -524,19 +524,15 @@ public class TerraSpinnerSkin extends Co
public static final int BUTTON_IMAGE_SIZE = 5;
public TerraSpinnerSkin() {
- setColor(1);
- setBackgroundColor(4);
- setDisabledColor(7);
- setBorderColor(7);
- setButtonColor(1);
- setButtonBackgroundColor(10);
+ setFont(getThemeFont());
+ }
- Theme theme = currentTheme();
- setFont(theme.getFont());
+ private Spinner getSpinner() {
+ return (Spinner) getComponent();
}
@Override
- public void setSize(int width, int height) {
+ public void setSize(final int width, final int height) {
int previousWidth = getWidth();
int previousHeight = getHeight();
@@ -548,9 +544,11 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void install(Component component) {
+ public void install(final Component component) {
super.install(component);
+ setDefaultStyles();
+
Spinner spinner = (Spinner) component;
spinner.getSpinnerListeners().add(this);
spinner.getSpinnerSelectionListeners().add(this);
@@ -561,29 +559,30 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public int getPreferredWidth(int height) {
+ public int getPreferredWidth(final int trialHeight) {
// Preferred width is the sum of our maximum button width plus the
// content width, plus the border
// Border thickness
int preferredWidth = 2;
- int buttonHeight = (height < 0 ? -1 : height / 2);
+ int buttonHeight = (trialHeight < 0 ? -1 : trialHeight / 2);
preferredWidth += Math.max(upButton.getPreferredWidth(buttonHeight),
downButton.getPreferredWidth(buttonHeight));
- if (height >= 0) {
+ int heightConstraint = trialHeight;
+ if (heightConstraint >= 0) {
// Subtract border thickness from height constraint
- height = Math.max(height - 2, 0);
+ heightConstraint = Math.max(heightConstraint - 2, 0);
}
- preferredWidth += spinnerContent.getPreferredWidth(height);
+ preferredWidth += spinnerContent.getPreferredWidth(heightConstraint);
return preferredWidth;
}
@Override
- public int getPreferredHeight(int width) {
+ public int getPreferredHeight(final int trialWidth) {
// Preferred height is the maximum of the button height and the
// renderer's preferred height (plus the border), where button
// height is defined as the larger of the two buttons' preferred
@@ -594,20 +593,21 @@ public class TerraSpinnerSkin extends Co
int preferredHeight = Math.max(upButtonPreferredSize.height,
downButtonPreferredSize.height) * 2;
- if (width >= 0) {
+ int widthConstraint = trialWidth;
+ if (widthConstraint >= 0) {
// Subtract the button and border width from width constraint
int buttonWidth = Math.max(upButtonPreferredSize.width,
downButtonPreferredSize.width);
- width = Math.max(width - buttonWidth - 2, 0);
+ widthConstraint = Math.max(widthConstraint - buttonWidth - 2, 0);
}
- preferredHeight = Math.max(preferredHeight,
spinnerContent.getPreferredHeight(width)) + 1;
+ preferredHeight = Math.max(preferredHeight,
spinnerContent.getPreferredHeight(widthConstraint)) + 1;
return preferredHeight;
}
@Override
- public int getBaseline(int width, int height) {
+ public int getBaseline(final int width, final int height) {
Dimensions upButtonPreferredSize = upButton.getPreferredSize();
Dimensions downButtonPreferredSize = downButton.getPreferredSize();
int buttonWidth = Math.max(upButtonPreferredSize.width,
downButtonPreferredSize.width);
@@ -644,7 +644,7 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void paint(Graphics2D graphics) {
+ public void paint(final Graphics2D graphics) {
super.paint(graphics);
int width = getWidth();
@@ -672,13 +672,14 @@ public class TerraSpinnerSkin extends Co
}
@Override
- public void enabledChanged(Component component) {
+ public void enabledChanged(final Component component) {
super.enabledChanged(component);
repaintComponent();
}
@Override
- public boolean mouseClick(Component component, Mouse.Button button, int x,
int y, int count) {
+ public boolean mouseClick(final Component component, final Mouse.Button
button,
+ final int x, final int y, final int count) {
spinnerContent.requestFocus();
return false;
}
@@ -692,125 +693,120 @@ public class TerraSpinnerSkin extends Co
return color;
}
- public void setColor(Color color) {
+ public void setColor(final Color color) {
Utils.checkNull(color, "color");
this.color = color;
repaintComponent();
}
- public final void setColor(String color) {
+ public final void setColor(final String color) {
setColor(GraphicsUtilities.decodeColor(color, "color"));
}
- public final void setColor(int color) {
- Theme theme = currentTheme();
- setColor(theme.getColor(color));
+ public final void setColor(final int color) {
+ setColor(getColor(color));
}
public Color getDisabledColor() {
return disabledColor;
}
- public void setDisabledColor(Color disabledColor) {
+ public void setDisabledColor(final Color disabledColor) {
Utils.checkNull(disabledColor, "disabledColor");
this.disabledColor = disabledColor;
repaintComponent();
}
- public final void setDisabledColor(String disabledColor) {
- setDisabledColor(GraphicsUtilities.decodeColor(disabledColor,
"disabledColor"));
+ public final void setDisabledColor(final String disabledColorString) {
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColorString,
"disabledColor"));
}
- public final void setDisabledColor(int disabledColor) {
- Theme theme = currentTheme();
- setDisabledColor(theme.getColor(disabledColor));
+ public final void setDisabledColor(final int disabledColorIndex) {
+ setDisabledColor(getColor(disabledColorIndex));
}
public Color getBorderColor() {
return borderColor;
}
- public void setBorderColor(Color borderColor) {
+ public void setBorderColor(final Color borderColor) {
Utils.checkNull(borderColor, "borderColor");
this.borderColor = borderColor;
repaintComponent();
}
- public final void setBorderColor(String borderColor) {
- setBorderColor(GraphicsUtilities.decodeColor(borderColor,
"borderColor"));
+ public final void setBorderColor(final String borderColorString) {
+ setBorderColor(GraphicsUtilities.decodeColor(borderColorString,
"borderColor"));
}
- public final void setBorderColor(int borderColor) {
- Theme theme = currentTheme();
- setBorderColor(theme.getColor(borderColor));
+ public final void setBorderColor(final int borderColorIndex) {
+ setBorderColor(getColor(borderColorIndex));
}
public Color getButtonColor() {
return buttonColor;
}
- public void setButtonColor(Color buttonColor) {
+ public void setButtonColor(final Color buttonColor) {
// TODO: is null acceptable here?
this.buttonColor = buttonColor;
repaintComponent();
}
- public final void setButtonColor(String buttonColor) {
- setButtonColor(GraphicsUtilities.decodeColor(buttonColor,
"buttonColor"));
+ public final void setButtonColor(final String buttonColorString) {
+ setButtonColor(GraphicsUtilities.decodeColor(buttonColorString,
"buttonColor"));
}
- public final void setButtonColor(int buttonColor) {
- Theme theme = currentTheme();
- setButtonColor(theme.getColor(buttonColor));
+ public final void setButtonColor(final int buttonColorIndex) {
+ setButtonColor(getColor(buttonColorIndex));
}
public Color getButtonBackgroundColor() {
return buttonBackgroundColor;
}
- public void setButtonBackgroundColor(Color buttonBackgroundColor) {
+ public void setButtonBackgroundColor(final Color buttonBackgroundColor) {
// TODO: not sure if null is acceptable here (certainly if theme is
flat)
this.buttonBackgroundColor = buttonBackgroundColor;
this.buttonBevelColor = TerraTheme.brighten(buttonBackgroundColor);
repaintComponent();
}
- public final void setButtonBackgroundColor(String buttonBackgroundColor) {
-
setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColor,
"buttonBackgroundColor"));
+ public final void setButtonBackgroundColor(final String
buttonBackgroundColorString) {
+
setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColorString,
"buttonBackgroundColor"));
}
- public final void setButtonBackgroundColor(int buttonBackgroundColor) {
- Theme theme = currentTheme();
- setButtonBackgroundColor(theme.getColor(buttonBackgroundColor));
+ public final void setButtonBackgroundColor(final int
buttonBackgroundColorIndex) {
+ setButtonBackgroundColor(getColor(buttonBackgroundColorIndex));
}
public Font getFont() {
return font;
}
- public void setFont(Font font) {
+ public void setFont(final Font font) {
Utils.checkNull(font, "font");
this.font = font;
invalidateContent();
}
- public final void setFont(String font) {
- setFont(decodeFont(font));
+ public final void setFont(final String fontString) {
+ setFont(decodeFont(fontString));
}
- public final void setFont(Dictionary<String, ?> font) {
- setFont(Theme.deriveFont(font));
+ public final void setFont(final Dictionary<String, ?> fontDictionary) {
+ setFont(Theme.deriveFont(fontDictionary));
}
public boolean isSizeToContent() {
return sizeToContent;
}
- public void setSizeToContent(boolean sizeToContent) {
+ public void setSizeToContent(final boolean sizeToContent) {
this.sizeToContent = sizeToContent;
invalidateContent();
}
@@ -825,28 +821,28 @@ public class TerraSpinnerSkin extends Co
// SpinnerListener methods
@Override
- public void spinnerDataChanged(Spinner spinner, List<?>
previousSpinnerData) {
+ public void spinnerDataChanged(final Spinner spinner, final List<?>
previousSpinnerData) {
invalidateContent();
}
@Override
- public void itemRendererChanged(Spinner spinner, Spinner.ItemRenderer
previousItemRenderer) {
+ public void itemRendererChanged(final Spinner spinner, final
Spinner.ItemRenderer previousItemRenderer) {
invalidateContent();
}
@Override
- public void circularChanged(Spinner spinner) {
+ public void circularChanged(final Spinner spinner) {
// No-op
}
// SpinnerSelectionListener methods
@Override
- public void selectedIndexChanged(Spinner spinner, int
previousSelectedIndex) {
+ public void selectedIndexChanged(final Spinner spinner, final int
previousSelectedIndex) {
// No-op
}
@Override
- public void selectedItemChanged(Spinner spinner, Object
previousSelectedItem) {
+ public void selectedItemChanged(final Spinner spinner, final Object
previousSelectedItem) {
invalidateContent();
}
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
Fri Mar 12 21:04:51 2021
@@ -16,7 +16,6 @@
*/
package org.apache.pivot.wtk.skin.terra;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.TextAreaSkin;
/**
@@ -24,42 +23,75 @@ import org.apache.pivot.wtk.skin.TextAre
* the current theme.
*/
public class TerraTextAreaSkin extends TextAreaSkin {
+ /**
+ * Specific constructor with nothing to do.
+ * <p> Default colors, etc. set by call to {@link
TerraTheme#setDefaultStyles}
+ * from {@link TextAreaSkin#install}.
+ */
public TerraTextAreaSkin() {
- // Defaults set in the "terra_theme_defaults.json" file
}
- public final void setColor(int color) {
- Theme theme = currentTheme();
- setColor(theme.getColor(color));
- }
-
- public final void setInactiveColor(int inactiveColor) {
- Theme theme = currentTheme();
- setInactiveColor(theme.getColor(inactiveColor));
- }
-
- public final void setBackgroundColor(int backgroundColor) {
- Theme theme = currentTheme();
- setBackgroundColor(theme.getColor(backgroundColor));
- }
-
- public final void setSelectionColor(int selectionColor) {
- Theme theme = currentTheme();
- setSelectionColor(theme.getColor(selectionColor));
- }
-
- public final void setSelectionBackgroundColor(int
selectionBackgroundColor) {
- Theme theme = currentTheme();
- setSelectionBackgroundColor(theme.getColor(selectionBackgroundColor));
- }
-
- public final void setInactiveSelectionColor(int inactiveSelectionColor) {
- Theme theme = currentTheme();
- setInactiveSelectionColor(theme.getColor(inactiveSelectionColor));
- }
-
- public final void setInactiveSelectionBackgroundColor(int
inactiveSelectionBackgroundColor) {
- Theme theme = currentTheme();
-
setInactiveSelectionBackgroundColor(theme.getColor(inactiveSelectionBackgroundColor));
+ /**
+ * Set the foreground color to the given theme color.
+ *
+ * @param color The theme color index for the foreground color.
+ */
+ public final void setColor(final int color) {
+ setColor(getColor(color));
+ }
+
+ /**
+ * Set the inactive color to the given theme color.
+ *
+ * @param inactiveColor The theme color index for the inactive color.
+ */
+ public final void setInactiveColor(final int inactiveColor) {
+ setInactiveColor(getColor(inactiveColor));
+ }
+
+ /**
+ * Set the background color to the given theme color.
+ *
+ * @param backgroundColor The theme color index for the background color.
+ */
+ public final void setBackgroundColor(final int backgroundColor) {
+ setBackgroundColor(getColor(backgroundColor));
+ }
+
+ /**
+ * Set the selection color to the given theme color.
+ *
+ * @param selectionColor The theme color index for the selection color.
+ */
+ public final void setSelectionColor(final int selectionColor) {
+ setSelectionColor(getColor(selectionColor));
+ }
+
+ /**
+ * Set the selection background color to the given theme color.
+ *
+ * @param selectionBackgroundColor The theme color index for the selection
background color.
+ */
+ public final void setSelectionBackgroundColor(final int
selectionBackgroundColor) {
+ setSelectionBackgroundColor(getColor(selectionBackgroundColor));
+ }
+
+ /**
+ * Set the inactive selection color to the given theme color.
+ *
+ * @param inactiveSelectionColor The theme color index for the inactive
selection color.
+ */
+ public final void setInactiveSelectionColor(final int
inactiveSelectionColor) {
+ setInactiveSelectionColor(getColor(inactiveSelectionColor));
+ }
+
+ /**
+ * Set the inactive selection background color to the given theme color.
+ *
+ * @param inactiveSelectionBackgroundColor The theme color index for the
inactive
+ * selection background color.
+ */
+ public final void setInactiveSelectionBackgroundColor(final int
inactiveSelectionBackgroundColor) {
+
setInactiveSelectionBackgroundColor(getColor(inactiveSelectionBackgroundColor));
}
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextPaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextPaneSkin.java?rev=1887553&r1=1887552&r2=1887553&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextPaneSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextPaneSkin.java
Fri Mar 12 21:04:51 2021
@@ -16,51 +16,73 @@
*/
package org.apache.pivot.wtk.skin.terra;
-import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.TextPaneSkin;
/**
- * Terra text area skin. This part of the skin deals with color
+ * Terra Text Pane skin. This part of the skin deals with color
* selection that is specific to the theme.
*/
public class TerraTextPaneSkin extends TextPaneSkin {
+ /**
+ * Specific constructor with nothing to do.
+ * <p> Default colors, etc. set by call to {@link
TerraTheme#setDefaultStyles}
+ * from {@link TextPaneSkin#install}.
+ */
public TerraTextPaneSkin() {
- setColor(1);
- setBackgroundColor(11);
- setInactiveColor(7);
- setSelectionColor(4);
- setSelectionBackgroundColor(14);
- setInactiveSelectionColor(1);
- setInactiveSelectionBackgroundColor(9);
}
- public final void setColor(int color) {
- Theme theme = currentTheme();
- setColor(theme.getColor(color));
- }
-
- public final void setInactiveColor(int inactiveColor) {
- Theme theme = currentTheme();
- setInactiveColor(theme.getColor(inactiveColor));
- }
-
- public final void setSelectionColor(int selectionColor) {
- Theme theme = currentTheme();
- setSelectionColor(theme.getColor(selectionColor));
- }
-
- public final void setSelectionBackgroundColor(int
selectionBackgroundColor) {
- Theme theme = currentTheme();
- setSelectionBackgroundColor(theme.getColor(selectionBackgroundColor));
- }
-
- public final void setInactiveSelectionColor(int inactiveSelectionColor) {
- Theme theme = currentTheme();
- setInactiveSelectionColor(theme.getColor(inactiveSelectionColor));
- }
-
- public final void setInactiveSelectionBackgroundColor(int
inactiveSelectionBackgroundColor) {
- Theme theme = currentTheme();
-
setInactiveSelectionBackgroundColor(theme.getColor(inactiveSelectionBackgroundColor));
+ /**
+ * Set the foreground color to the given theme index color.
+ *
+ * @param color The theme index for the new foreground color.
+ */
+ public final void setColor(final int color) {
+ setColor(getColor(color));
+ }
+
+ /**
+ * Set the inactive color to the given theme index color.
+ *
+ * @param inactiveColor The theme index for the new inactive color.
+ */
+ public final void setInactiveColor(final int inactiveColor) {
+ setInactiveColor(getColor(inactiveColor));
+ }
+
+ /**
+ * Set the selection color to the given theme index color.
+ *
+ * @param selectionColor The theme index for the new selection color.
+ */
+ public final void setSelectionColor(final int selectionColor) {
+ setSelectionColor(getColor(selectionColor));
+ }
+
+ /**
+ * Set the selection background color to the given theme index color.
+ *
+ * @param selectionBackgroundColor The theme index for the new selection
background color.
+ */
+ public final void setSelectionBackgroundColor(final int
selectionBackgroundColor) {
+ setSelectionBackgroundColor(getColor(selectionBackgroundColor));
+ }
+
+ /**
+ * Set the inactive selection color to the given theme index color.
+ *
+ * @param inactiveSelectionColor The theme index for the new inactive
selection color.
+ */
+ public final void setInactiveSelectionColor(final int
inactiveSelectionColor) {
+ setInactiveSelectionColor(getColor(inactiveSelectionColor));
+ }
+
+ /**
+ * Set the inactive selection background color to the given theme index
color.
+ *
+ * @param inactiveSelectionBackgroundColor The theme index for the new
inactive selection
+ * background color.
+ */
+ public final void setInactiveSelectionBackgroundColor(final int
inactiveSelectionBackgroundColor) {
+
setInactiveSelectionBackgroundColor(getColor(inactiveSelectionBackgroundColor));
}
}
