You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2014/09/11 15:08:57 UTC
svn commit: r1624277 - in /pivot/trunk: charts/src/org/apache/pivot/charts/
core/src/org/apache/pivot/util/ demos/src/org/apache/pivot/demos/styles/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/w...
Author: smartini
Date: Thu Sep 11 13:08:57 2014
New Revision: 1624277
URL: http://svn.apache.org/r1624277
Log:
trim-whitespace, and fix some eclipse warnings
Modified:
pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/DialView.java
pivot/trunk/charts/src/org/apache/pivot/charts/HistogramView.java
pivot/trunk/charts/src/org/apache/pivot/charts/PolarChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/SingleValueChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/SpiderWebView.java
pivot/trunk/charts/src/org/apache/pivot/charts/ThermometerView.java
pivot/trunk/core/src/org/apache/pivot/util/Version.java
pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Theme.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java Thu Sep 11 13:08:57 2014
@@ -279,7 +279,8 @@ public abstract class ChartView extends
}
@Override
- public void comparatorChanged(List<ValueMarker> list, Comparator<ValueMarker> previousComparator) {
+ public void comparatorChanged(List<ValueMarker> list,
+ Comparator<ValueMarker> previousComparator) {
// No-op
}
}
@@ -589,4 +590,3 @@ public abstract class ChartView extends
}
}
-
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/DialView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/DialView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/DialView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/DialView.java Thu Sep 11 13:08:57 2014
@@ -22,9 +22,7 @@ package org.apache.pivot.charts;
public class DialView extends SingleValueChartView {
public static enum Shape {
- PIE,
- CHORD,
- CIRCLE
+ PIE, CHORD, CIRCLE
}
public DialView() {
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/HistogramView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/HistogramView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/HistogramView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/HistogramView.java Thu Sep 11 13:08:57 2014
@@ -28,9 +28,9 @@ public class HistogramView extends Chart
private final double binEnd;
private final double frequency;
- public HistogramBin(int series, int item, double binStart,
- double binValue, double binEnd, double frequency) {
- super(series,item);
+ public HistogramBin(int series, int item, double binStart, double binValue, double binEnd,
+ double frequency) {
+ super(series, item);
this.binEnd = binEnd;
this.binStart = binStart;
this.binValue = binValue;
@@ -55,10 +55,10 @@ public class HistogramView extends Chart
@Override
public String toString() {
- return "bin #"+getElementIndex()+","+binStart+" - "+binEnd+", frequency "+frequency;
+ return "bin #" + getElementIndex() + "," + binStart + " - " + binEnd + ", frequency "
+ + frequency;
}
}
}
-
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/PolarChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/PolarChartView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/PolarChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/PolarChartView.java Thu Sep 11 13:08:57 2014
@@ -23,4 +23,3 @@ public class PolarChartView extends Char
}
}
-
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/SingleValueChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/SingleValueChartView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/SingleValueChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/SingleValueChartView.java Thu Sep 11 13:08:57 2014
@@ -21,97 +21,97 @@ import java.util.EnumMap;
import org.apache.pivot.collections.List;
/**
- * Base class for charts that display just a single value
- * but with bounds and state limits (normal, warning, critical).
+ * Base class for charts that display just a single value but with bounds and
+ * state limits (normal, warning, critical).
*/
public class SingleValueChartView extends ChartView {
- private double lowerBound = -1.0d;
- private double upperBound = -1.0d;
+ private double lowerBound = -1.0d;
+ private double upperBound = -1.0d;
- public static enum Range {
- NORMAL,
- WARNING,
- CRITICAL
- }
+ public static enum Range {
+ NORMAL, WARNING, CRITICAL
+ }
- public static class ValueRange {
- private double lower;
- private double upper;
+ public static class ValueRange {
+ private double lower;
+ private double upper;
- public ValueRange(double lower, double upper) {
- this.lower = lower;
- this.upper = upper;
- }
- public double getLower() {
- return lower;
- }
- public double getUpper() {
- return upper;
- }
+ public ValueRange(double lower, double upper) {
+ this.lower = lower;
+ this.upper = upper;
}
- private EnumMap<Range, ValueRange> ranges = new EnumMap<>(Range.class);
-
- public Number getLowerBound() {
- return lowerBound;
+ public double getLower() {
+ return lower;
}
- public void setLowerBound(Number value) {
- this.lowerBound = value.doubleValue();
+ public double getUpper() {
+ return upper;
}
+ }
- public Number getUpperBound() {
- return upperBound;
- }
+ private EnumMap<Range, ValueRange> ranges = new EnumMap<>(Range.class);
- public void setUpperBound(Number value) {
- this.upperBound = value.doubleValue();
- }
+ public Number getLowerBound() {
+ return Double.valueOf(lowerBound);
+ }
- public ValueRange getValueBounds() {
- return new ValueRange(this.lowerBound, this.upperBound);
- }
+ public void setLowerBound(Number value) {
+ this.lowerBound = value.doubleValue();
+ }
- public void setValueBounds(ValueRange bounds) {
- this.lowerBound = bounds.getLower();
- this.upperBound = bounds.getUpper();
- }
+ public Number getUpperBound() {
+ return Double.valueOf(upperBound);
+ }
- public ValueRange getValueRange(Range range) {
- return ranges.get(range);
- }
+ public void setUpperBound(Number value) {
+ this.upperBound = value.doubleValue();
+ }
- public void setValueRange(Range range, ValueRange values) {
- ranges.put(range, values);
- }
+ public ValueRange getValueBounds() {
+ return new ValueRange(this.lowerBound, this.upperBound);
+ }
- public void setValueRange(Range range, double lower, double upper) {
- ranges.put(range, new ValueRange(lower, upper));
- }
+ public void setValueBounds(ValueRange bounds) {
+ this.lowerBound = bounds.getLower();
+ this.upperBound = bounds.getUpper();
+ }
+
+ public ValueRange getValueRange(Range range) {
+ return ranges.get(range);
+ }
- public Number getValue() {
- if (chartData == null) {
- return null;
- } else if (chartData.getLength() != 1) {
- throw new IllegalStateException("Only one value can be displayed.");
- }
- Object value = chartData.get(0);
- if (value instanceof Number) {
- return (Number)value;
- } else if (value instanceof String) {
- return Double.parseDouble((String)value);
- } else {
- return Double.parseDouble(value.toString());
- }
+ public void setValueRange(Range range, ValueRange values) {
+ ranges.put(range, values);
+ }
+
+ public void setValueRange(Range range, double lower, double upper) {
+ ranges.put(range, new ValueRange(lower, upper));
+ }
+
+ public Number getValue() {
+ if (chartData == null) {
+ return null;
+ } else if (chartData.getLength() != 1) {
+ throw new IllegalStateException("Only one value can be displayed.");
+ }
+ Object value = chartData.get(0);
+ if (value instanceof Number) {
+ return (Number) value;
+ } else if (value instanceof String) {
+ return Double.valueOf((String) value);
+ } else {
+ return Double.valueOf(value.toString());
}
+ }
- @SuppressWarnings("unchecked")
- public void setValue(Number value) {
- if (chartData.getLength() == 1) {
- ((List<Object>)chartData).update(0, value);
- } else {
- ((List<Object>)chartData).insert(value, 0);
- }
+ @SuppressWarnings("unchecked")
+ public void setValue(Number value) {
+ if (chartData.getLength() == 1) {
+ ((List<Object>) chartData).update(0, value);
+ } else {
+ ((List<Object>) chartData).insert(value, 0);
}
+ }
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/SpiderWebView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/SpiderWebView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/SpiderWebView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/SpiderWebView.java Thu Sep 11 13:08:57 2014
@@ -23,4 +23,3 @@ public class SpiderWebView extends Chart
}
}
-
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/ThermometerView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/ThermometerView.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/ThermometerView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/ThermometerView.java Thu Sep 11 13:08:57 2014
@@ -22,10 +22,7 @@ package org.apache.pivot.charts;
public class ThermometerView extends SingleValueChartView {
public static enum Units {
- NONE,
- CELSIUS,
- FAHRENHEIT,
- KELVIN
+ NONE, CELSIUS, FAHRENHEIT, KELVIN
}
public ThermometerView() {
Modified: pivot/trunk/core/src/org/apache/pivot/util/Version.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Version.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Version.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Version.java Thu Sep 11 13:08:57 2014
@@ -105,7 +105,7 @@ public class Version implements Comparab
@Override
public String toString() {
String string = this.majorRevision + "." + this.minorRevision + "."
- + this.maintenanceRevision + "_" + String.format("%02d", this.updateRevision);
+ + this.maintenanceRevision + "_" + String.format("%02d", Byte.valueOf(this.updateRevision));
if (this.build != null) {
string += "-" + this.build;
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java Thu Sep 11 13:08:57 2014
@@ -251,8 +251,8 @@ public class ColorSchemeBuilderWindow ex
for (int i = 0; i < numberOfPaletteColors; i++) {
ColorChooserButton colorChooserButton = colorChooserButtons.get(i);
Color color = colorChooserButton.getSelectedColor();
- colors.add(String.format("#%02X%02X%02X",
- Integer.valueOf(color.getRed()),
+ colors.add(String.format("#%02X%02X%02X",
+ Integer.valueOf(color.getRed()),
Integer.valueOf(color.getGreen()),
Integer.valueOf(color.getBlue()))
);
@@ -278,8 +278,8 @@ public class ColorSchemeBuilderWindow ex
colorChooserButton.setSelectedColor(themeOriginalColors.get(i));
Color color = colorChooserButton.getSelectedColor();
- colors.add(String.format("#%02X%02X%02X",
- Integer.valueOf(color.getRed()),
+ colors.add(String.format("#%02X%02X%02X",
+ Integer.valueOf(color.getRed()),
Integer.valueOf(color.getGreen()),
Integer.valueOf(color.getBlue()))
);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java Thu Sep 11 13:08:57 2014
@@ -538,7 +538,7 @@ public final class TerraTheme extends Th
/**
* Gets the theme's default background color.
- *
+ *
* @return the color if set, or White if the theme is not dark (default), or Black.
*/
@Override
@@ -548,7 +548,7 @@ public final class TerraTheme extends Th
/**
* Gets the theme's default foreground color.
- *
+ *
* @return the color if set, or Black if the theme is not dark (default), or White.
*/
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Theme.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Theme.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Theme.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Theme.java Thu Sep 11 13:08:57 2014
@@ -224,7 +224,7 @@ public abstract class Theme {
/**
* Returns a safe (and general) default background color.
- *
+ *
* @return White if the theme is not dark (default), or Black.
*/
public Color getDefaultBackgroundColor() {
@@ -236,7 +236,7 @@ public abstract class Theme {
/**
* Returns a safe (and general) default foreground color.
- *
+ *
* @return Black if the theme is not dark (default), or White.
*/
public Color getDefaultForegroundColor() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java Thu Sep 11 13:08:57 2014
@@ -83,7 +83,7 @@ public abstract class Transition {
/**
* Creates a new transition with the given duration, rate, and repeat.
- *
+ *
* Note that if the current Theme has transitions not enabled,
* will be set default values instead of given arguments.
*
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=1624277&r1=1624276&r2=1624277&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Thu Sep 11 13:08:57 2014
@@ -447,7 +447,7 @@ public abstract class ComponentSkin impl
/**
* Returns the Theme default background color.
- *
+ *
* @return White if the theme is not dark (default), or Black.
*/
protected Color defaultBackgroundColor() {
@@ -456,7 +456,7 @@ public abstract class ComponentSkin impl
/**
* Returns the Theme default foreground color.
- *
+ *
* @return Black if the theme is not dark (default), or White.
*/
protected Color defaultForegroundColor() {