You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/08/06 13:36:22 UTC
svn commit: r801606 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: ScrollBar.java
ScrollBarListener.java Slider.java SliderListener.java
skin/terra/TerraScrollBarSkin.java skin/terra/TerraSliderSkin.java
Author: gbrown
Date: Thu Aug 6 11:36:21 2009
New Revision: 801606
URL: http://svn.apache.org/viewvc?rev=801606&view=rev
Log:
Rename "rangeStart/rangeEnd" properties in ScrollBar and Slider to "start/end" for consistency with other similar properties (e.g. "x/y" and "location" in Component).
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java Thu Aug 6 11:36:21 2009
@@ -35,11 +35,11 @@
}
}
- public void scopeChanged(ScrollBar scrollBar, int previousRangeStart,
- int previousRangeEnd, int previousExtent) {
+ public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
+ int previousExtent) {
for (ScrollBarListener listener : this) {
- listener.scopeChanged(scrollBar, previousRangeStart,
- previousRangeEnd, previousExtent);
+ listener.scopeChanged(scrollBar, previousStart, previousEnd,
+ previousExtent);
}
}
@@ -67,8 +67,8 @@
}
private Orientation orientation;
- private int rangeStart = 0;
- private int rangeEnd = 100;
+ private int start = 0;
+ private int end = 100;
private int extent = 100;
private int value = 0;
private int unitIncrement = 1;
@@ -109,28 +109,28 @@
}
}
- public int getRangeStart() {
- return rangeStart;
+ public int getStart() {
+ return start;
}
- public void setRangeStart(int rangeStart) {
- setScope(rangeStart, rangeEnd, extent);
+ public void setStart(int start) {
+ setScope(start, end, extent);
}
- public int getRangeEnd() {
- return rangeEnd;
+ public int getEnd() {
+ return end;
}
- public void setRangeEnd(int rangeEnd) {
- setScope(rangeStart, rangeEnd, extent);
+ public void setEnd(int end) {
+ setScope(start, end, extent);
}
public Span getRange() {
- return new Span(rangeStart, rangeEnd);
+ return new Span(start, end);
}
- public void setRange(int rangeStart, int rangeEnd) {
- setScope(rangeStart, rangeEnd, extent);
+ public void setRange(int start, int end) {
+ setScope(start, end, extent);
}
public final void setRange(Span range) {
@@ -162,35 +162,35 @@
}
public void setExtent(int extent) {
- setScope(rangeStart, rangeEnd, extent);
+ setScope(start, end, extent);
}
- public void setScope(int rangeStart, int rangeEnd, int extent) {
- int previousRangeStart = this.rangeStart;
- int previousRangeEnd = this.rangeEnd;
+ public void setScope(int start, int end, int extent) {
+ int previousStart = this.start;
+ int previousEnd = this.end;
int previousExtent = this.extent;
- if (rangeStart != previousRangeStart
- || rangeEnd != previousRangeEnd
+ if (start != previousStart
+ || end != previousEnd
|| extent != previousExtent) {
- if (rangeStart > value) {
- throw new IllegalArgumentException("rangeStart is greater than value");
+ if (start > value) {
+ throw new IllegalArgumentException("start is greater than value");
}
if (extent < 0) {
throw new IllegalArgumentException("extent is negative");
}
- if (rangeEnd < value + extent) {
- throw new IllegalArgumentException("rangeEnd is less than value+extent");
+ if (end < value + extent) {
+ throw new IllegalArgumentException("end is less than value+extent");
}
- this.rangeStart = rangeStart;
- this.rangeEnd = rangeEnd;
+ this.start = start;
+ this.end = end;
this.extent = extent;
- scrollBarListeners.scopeChanged(this, previousRangeStart,
- previousRangeEnd, previousExtent);
+ scrollBarListeners.scopeChanged(this, previousStart, previousEnd,
+ previousExtent);
}
}
@@ -202,12 +202,12 @@
int previousValue = this.value;
if (value != previousValue) {
- if (value < rangeStart) {
- throw new IllegalArgumentException("value is less than rangeStart");
+ if (value < start) {
+ throw new IllegalArgumentException("value is less than start");
}
- if (value + extent > rangeEnd) {
- throw new IllegalArgumentException("value+extent is greater than rangeEnd");
+ if (value + extent > end) {
+ throw new IllegalArgumentException("value+extent is greater than end");
}
this.value = value;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java Thu Aug 6 11:36:21 2009
@@ -34,12 +34,12 @@
* Called when a scroll bar's scope has changed.
*
* @param scrollBar
- * @param previousRangeStart
- * @param previousRangeEnd
+ * @param previousStart
+ * @param previousEnd
* @param previousExtent
*/
- public void scopeChanged(ScrollBar scrollBar, int previousRangeStart,
- int previousRangeEnd, int previousExtent);
+ public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
+ int previousExtent);
/**
* Called when a scroll bar's unit increment has changed.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java Thu Aug 6 11:36:21 2009
@@ -27,9 +27,9 @@
public class Slider extends Container {
private static class SliderListenerList extends ListenerList<SliderListener>
implements SliderListener {
- public void rangeChanged(Slider slider, int previousRangeStart, int previousRangeEnd) {
+ public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
for (SliderListener listener : this) {
- listener.rangeChanged(slider, previousRangeStart, previousRangeEnd);
+ listener.rangeChanged(slider, previousStart, previousEnd);
}
}
}
@@ -43,62 +43,62 @@
}
}
- private int rangeStart = DEFAULT_RANGE_START;
- private int rangeEnd = DEFAULT_RANGE_END;
+ private int start = DEFAULT_START;
+ private int end = DEFAULT_END;
private int value = DEFAULT_VALUE;
private SliderListenerList sliderListeners = new SliderListenerList();
private SliderValueListenerList sliderValueListeners = new SliderValueListenerList();
- public static final int DEFAULT_RANGE_START = 0;
- public static final int DEFAULT_RANGE_END = 100;
+ public static final int DEFAULT_START = 0;
+ public static final int DEFAULT_END = 100;
public static final int DEFAULT_VALUE = 0;
public Slider() {
installSkin(Slider.class);
}
- public int getRangeStart() {
- return rangeStart;
+ public int getStart() {
+ return start;
}
- public void setRangeStart(int rangeStart) {
- setRange(rangeStart, rangeEnd);
+ public void setStart(int start) {
+ setRange(start, end);
}
- public int getRangeEnd() {
- return rangeEnd;
+ public int getEnd() {
+ return end;
}
- public void setRangeEnd(int rangeEnd) {
- setRange(rangeStart, rangeEnd);
+ public void setEnd(int end) {
+ setRange(start, end);
}
- public void setRange(int rangeStart, int rangeEnd) {
- if (rangeStart > rangeEnd) {
- throw new IllegalArgumentException("rangeStart is greater than maximum.");
+ public void setRange(int start, int end) {
+ if (start > end) {
+ throw new IllegalArgumentException("start is greater than maximum.");
}
- int previousRangeStart = this.rangeStart;
- int previousRangeEnd = this.rangeEnd;
+ int previousStart = this.start;
+ int previousEnd = this.end;
int previousValue = this.value;
- if (rangeStart != previousRangeStart
- || rangeEnd != previousRangeEnd) {
- this.rangeStart = rangeStart;
- if (value < rangeStart) {
- this.value = rangeStart;
+ if (start != previousStart
+ || end != previousEnd) {
+ this.start = start;
+ if (value < start) {
+ this.value = start;
}
- this.rangeEnd = rangeEnd;
- if (value > rangeEnd) {
- this.value = rangeEnd;
+ this.end = end;
+ if (value > end) {
+ this.value = end;
}
- sliderListeners.rangeChanged(this, previousRangeStart, previousRangeEnd);
+ sliderListeners.rangeChanged(this, previousStart, previousEnd);
- if (previousValue < rangeStart
- || previousValue > rangeEnd) {
+ if (previousValue < start
+ || previousValue > end) {
sliderValueListeners.valueChanged(this, previousValue);
}
}
@@ -133,11 +133,11 @@
}
public void setValue(int value) {
- if (value < rangeStart) {
+ if (value < start) {
throw new IllegalArgumentException("value is less than minimum.");
}
- if (value > rangeEnd) {
+ if (value > end) {
throw new IllegalArgumentException("value is greater than maximum.");
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java Thu Aug 6 11:36:21 2009
@@ -26,8 +26,8 @@
* Called when a slider's range has changed.
*
* @param slider
- * @param previousRangeStart
- * @param previousRangeEnd
+ * @param previousStart
+ * @param previousEnd
*/
- public void rangeChanged(Slider slider, int previousRangeStart, int previousRangeEnd);
+ public void rangeChanged(Slider slider, int previousStart, int previousEnd);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java Thu Aug 6 11:36:21 2009
@@ -113,8 +113,8 @@
private void scroll() {
ScrollBar scrollBar = (ScrollBar)TerraScrollBarSkin.this.getComponent();
- int rangeStart = scrollBar.getRangeStart();
- int rangeEnd = scrollBar.getRangeEnd();
+ int start = scrollBar.getStart();
+ int end = scrollBar.getEnd();
int extent = scrollBar.getExtent();
int value = scrollBar.getValue();
@@ -127,7 +127,7 @@
}
if (adjustment < 0) {
- int newValue = Math.max(value + adjustment, rangeStart);
+ int newValue = Math.max(value + adjustment, start);
scrollBar.setValue(newValue);
if (stopValue != -1
@@ -136,12 +136,12 @@
stop();
}
- if (newValue == rangeStart) {
+ if (newValue == start) {
// We implicit stop at the minimum scroll bar value
stop();
}
} else {
- int newValue = Math.min(value + adjustment, rangeEnd - extent);
+ int newValue = Math.min(value + adjustment, end - extent);
scrollBar.setValue(newValue);
if (stopValue != -1
@@ -150,7 +150,7 @@
stop();
}
- if (newValue == rangeEnd - extent) {
+ if (newValue == end - extent) {
// We implicitly stop at the maximum scroll bar value
stop();
}
@@ -533,9 +533,9 @@
int realValue = (int)(pixelValue / getValueScale());
// Bound the value
- int rangeEnd = scrollBar.getRangeEnd();
+ int end = scrollBar.getEnd();
int extent = scrollBar.getExtent();
- realValue = Math.min(Math.max(realValue, 0), rangeEnd - extent);
+ realValue = Math.min(Math.max(realValue, 0), end - extent);
// Update the scroll bar
scrollBar.setValue(realValue);
@@ -683,14 +683,14 @@
int width = getWidth();
int height = getHeight();
- int rangeStart = scrollBar.getRangeStart();
- int rangeEnd = scrollBar.getRangeEnd();
+ int start = scrollBar.getStart();
+ int end = scrollBar.getEnd();
int extent = scrollBar.getExtent();
int value = scrollBar.getValue();
- int maxLegalRealValue = rangeEnd - extent;
- int numLegalRealValues = maxLegalRealValue - rangeStart + 1;
- float extentPercentage = (float)extent / (float)(rangeEnd - rangeStart);
+ int maxLegalRealValue = end - extent;
+ int numLegalRealValues = maxLegalRealValue - start + 1;
+ float extentPercentage = (float)extent / (float)(end - start);
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
scrollUpButton.setSize(scrollUpButton.getPreferredWidth(-1), height);
@@ -1122,7 +1122,7 @@
scrollBar.getUnitIncrement());
if (wheelRotation > 0) {
- int maxValue = scrollBar.getRangeEnd() - scrollBar.getExtent();
+ int maxValue = scrollBar.getEnd() - scrollBar.getExtent();
newValue = Math.min(newValue, maxValue);
if (previousValue < maxValue) {
@@ -1160,12 +1160,12 @@
float valueScale;
- int rangeStart = scrollBar.getRangeStart();
- int rangeEnd = scrollBar.getRangeEnd();
+ int start = scrollBar.getStart();
+ int end = scrollBar.getEnd();
int extent = scrollBar.getExtent();
- int maxLegalRealValue = rangeEnd - extent;
+ int maxLegalRealValue = end - extent;
- int numLegalRealValues = maxLegalRealValue - rangeStart + 1;
+ int numLegalRealValues = maxLegalRealValue - start + 1;
int numLegalPixelValues;
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
@@ -1205,8 +1205,8 @@
invalidateComponent();
}
- public void scopeChanged(ScrollBar scrollBar, int previousRangeStart,
- int previousRangeEnd, int previousExtent) {
+ public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
+ int previousExtent) {
invalidateComponent();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=801606&r1=801605&r2=801606&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java Thu Aug 6 11:36:21 2009
@@ -124,10 +124,10 @@
float ratio = (float)(sliderX - dragOffset.x) / (sliderWidth - thumbWidth);
- int rangeStart = slider.getRangeStart();
- int rangeEnd = slider.getRangeEnd();
+ int start = slider.getStart();
+ int end = slider.getEnd();
- int value = (int)(rangeStart + (rangeEnd - rangeStart) * ratio);
+ int value = (int)(start + (end - start) * ratio);
slider.setValue(value);
}
@@ -243,11 +243,11 @@
int width = getWidth();
int height = getHeight();
- int rangeStart = slider.getRangeStart();
- int rangeEnd = slider.getRangeEnd();
+ int start = slider.getStart();
+ int end = slider.getEnd();
int value = slider.getValue();
- float ratio = (float)(value - rangeStart) / (rangeEnd - rangeStart);
+ float ratio = (float)(value - start) / (end - start);
thumb.setSize(thumbWidth, thumbHeight);
thumb.setLocation((int)((width - thumbWidth) * ratio),
@@ -392,7 +392,7 @@
setThumbHeight(thumbHeight.intValue());
}
- public void rangeChanged(Slider slider, int previousRangeStart, int previousRangeEnd) {
+ public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
invalidateComponent();
}