PIVOT-1032: Fix the remaining "Whitespace" errors in all the source.
Plus fix some other style errors in several of the smaller files in
this set.
git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1837914 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java
index a369be8..87faffc 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraActivityIndicatorSkin.java
@@ -38,7 +38,7 @@
public TerraActivityIndicatorSkin() {
setColor(2);
- setBackgroundColor((Color)null);
+ setBackgroundColor((Color) null);
}
@Override
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
index a6dc01d..276632a 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
@@ -192,7 +192,7 @@
if (vote == Vote.APPROVE) {
// If this is the second or subsequent open, then the
// image view has been cleared, so set it up again
- messageTypeChanged((Alert)window, null);
+ messageTypeChanged((Alert) window, null);
}
return vote;
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
index f9e3c9e..3817bbc 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
@@ -316,7 +316,7 @@
// Paint the focus state
if (calendarButton.isFocused()) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
index 86915b3..512e26d 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
@@ -506,7 +506,7 @@
// result of the user toggling the date button (as opposed
// to changing the month or year), clear the selection
if (selectedDate == null
- || (selectedDate.year == ((Integer)yearSpinner.getSelectedItem()).intValue()
+ || (selectedDate.year == ((Integer) yearSpinner.getSelectedItem()).intValue()
&& selectedDate.month == monthSpinner.getSelectedIndex())) {
calendar.setSelectedDate((CalendarDate) null);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
index 0b8f275..0e411fa 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
@@ -317,7 +317,7 @@
// Paint the focus state
if (colorChooserButton.isFocused()) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
index b4f51e2..5482cb1 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
@@ -160,8 +160,8 @@
}
GraphicsUtilities.setAntialiasingOn(graphics);
- int[] xPoints = { 3, 6, 9 };
- int[] yPoints = { 9, 3, 9 };
+ int[] xPoints = {3, 6, 9};
+ int[] yPoints = {9, 3, 9};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -180,8 +180,8 @@
}
GraphicsUtilities.setAntialiasingOn(graphics);
- int[] xPoints = { 3, 6, 9 };
- int[] yPoints = { 3, 9, 3 };
+ int[] xPoints = {3, 6, 9};
+ int[] yPoints = {3, 9, 3};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
index aa65bb8..84dc993 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraGaugeSkin.java
@@ -96,7 +96,7 @@
super.install(component);
@SuppressWarnings("unchecked")
- Gauge<T> gauge = (Gauge<T>)component;
+ Gauge<T> gauge = (Gauge<T>) component;
gauge.getGaugeListeners().add(this);
}
@@ -146,7 +146,7 @@
@Override
public void paint(final Graphics2D graphics) {
@SuppressWarnings("unchecked")
- Gauge<T> gauge = (Gauge<T>)getComponent();
+ Gauge<T> gauge = (Gauge<T>) getComponent();
// NOTE: sanity check: warning level > min && < max, warning < critical if both set
// also critical > main && < max, critical > warning if both set
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
index 71cf74b..8a030b8 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
@@ -376,7 +376,7 @@
// Paint the focus state
if (listButton.isFocused()) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(borderColorLocal);
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
index 44d1d89..96d06ad 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
@@ -53,7 +53,7 @@
}
private MenuBar.ItemSequence getMenuItems() {
- MenuBar menuBar = (MenuBar)getComponent();
+ MenuBar menuBar = (MenuBar) getComponent();
return menuBar.getItems();
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
index 0c079c0..ed5cb8f 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
@@ -298,7 +298,7 @@
// Paint the focus state
if (menuButton.isFocused() && !toolbar) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
index 061e90b..276755a 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
@@ -161,8 +161,8 @@
graphics.translate(dataRenderer.getWidth() + (EXPANDER_SIZE - EXPANDER_ICON_SIZE) / 2,
(height - EXPANDER_ICON_SIZE) / 2);
- int[] xPoints = { 0, EXPANDER_ICON_SIZE, 0 };
- int[] yPoints = { 0, EXPANDER_ICON_SIZE / 2, EXPANDER_ICON_SIZE };
+ int[] xPoints = {0, EXPANDER_ICON_SIZE, 0};
+ int[] yPoints = {0, EXPANDER_ICON_SIZE / 2, EXPANDER_ICON_SIZE};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
index 0d0b134..8932676 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
@@ -74,8 +74,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 0, 3, 6 };
- int[] yPoints = { 5, 1, 5 };
+ int[] xPoints = {0, 3, 6};
+ int[] yPoints = {5, 1, 5};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -89,8 +89,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 0, 3, 6 };
- int[] yPoints = { 1, 5, 1 };
+ int[] xPoints = {0, 3, 6};
+ int[] yPoints = {1, 5, 1};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -104,8 +104,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 1, 5, 1 };
- int[] yPoints = { 0, 3, 6 };
+ int[] xPoints = {1, 5, 1};
+ int[] yPoints = {0, 3, 6};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -119,8 +119,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 5, 1, 5 };
- int[] yPoints = { 0, 3, 6 };
+ int[] xPoints = {5, 1, 5};
+ int[] yPoints = {0, 3, 6};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -136,7 +136,7 @@
@Override
public void setToggleButton(boolean toggleButton) {
- throw new UnsupportedOperationException("Link buttons cannot be toggle buttons.");
+ throw new UnsupportedOperationException("Scroll buttons cannot be toggle buttons.");
}
}
@@ -176,7 +176,7 @@
}
/**
- * @return <tt>false</tt>; link buttons are not focusable.
+ * @return <tt>false</tt>; scroll buttons are not focusable.
*/
@Override
public boolean isFocusable() {
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
index f43cbc4..60f1b74 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
@@ -171,7 +171,7 @@
if (vote == Vote.APPROVE) {
// If this is the second or subsequent open, then the
// image view has been cleared, so set it up again
- messageTypeChanged((Prompt)window, null);
+ messageTypeChanged((Prompt) window, null);
}
return vote;
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
index 00a8747..991fdfb 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
@@ -251,7 +251,7 @@
// Paint the focus state
if (pushButton.isFocused() && !toolbar) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(this.borderColor);
graphics.draw(new RoundRectangle2D.Double(2.5, 2.5, Math.max(width - 5, 0), Math.max(
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
index a6c1401..5696263 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
@@ -173,7 +173,7 @@
graphics.fillOval(0, 0, BUTTON_DIAMETER - 1, BUTTON_DIAMETER - 1);
} else {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(buttonBorderColor);
@@ -199,8 +199,8 @@
if (!themeIsFlat()) {
buttonPaint = new RadialGradientPaint((float) buttonBackgroundCircle.getCenterX(),
(float) buttonBackgroundCircle.getCenterY(),
- (float) buttonBackgroundCircle.getWidth() * 2 / 3, new float[] { 0f, 1f },
- new Color[] { TerraTheme.darken(buttonColor), buttonColor });
+ (float) buttonBackgroundCircle.getWidth() * 2 / 3, new float[] {0f, 1f},
+ new Color[] {TerraTheme.darken(buttonColor), buttonColor});
} else {
buttonPaint = currentTheme().getColor(10);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
index 17bd63c..35db343 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
@@ -140,14 +140,14 @@
if (rollup.isCollapsible()) {
if (rollup.isExpanded()) {
// Paint the collapse image
- int[] xPoints = { 0, 3, 6 };
- int[] yPoints = { 0, 6, 0 };
+ int[] xPoints = {0, 3, 6};
+ int[] yPoints = {0, 6, 0};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
} else {
// Paint the expand image
- int[] xPoints = { 0, 6, 0 };
- int[] yPoints = { 0, 3, 6 };
+ int[] xPoints = {0, 6, 0};
+ int[] yPoints = {0, 3, 6};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
index b8a0362..7f3aaf2 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
@@ -346,7 +346,7 @@
}
private static final BasicStroke DASH_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
@Override
public void paint(Graphics2D graphics) {
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
index a62345b..a8498d8 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
@@ -225,7 +225,7 @@
// Paint the focus state
if (spinnerContentLocal.isFocused()) {
BasicStroke dashStroke = new BasicStroke(1.0f, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND, 1.0f, new float[] { 0.0f, 2.0f }, 0.0f);
+ BasicStroke.JOIN_ROUND, 1.0f, new float[] {0.0f, 2.0f}, 0.0f);
graphics.setStroke(dashStroke);
graphics.setColor(borderColor);
@@ -485,8 +485,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 0, 2, 4 };
- int[] yPoints = { 3, 1, 3 };
+ int[] xPoints = {0, 2, 4};
+ int[] yPoints = {3, 1, 3};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
@@ -497,8 +497,8 @@
public void paint(Graphics2D graphics) {
super.paint(graphics);
- int[] xPoints = { 0, 2, 4 };
- int[] yPoints = { 1, 3, 1 };
+ int[] xPoints = {0, 2, 4};
+ int[] yPoints = {1, 3, 1};
graphics.fillPolygon(xPoints, yPoints, 3);
graphics.drawPolygon(xPoints, yPoints, 3);
}
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
index 3b5269c..826bd54 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
@@ -340,7 +340,7 @@
public int getPreferredWidth(int height) {
int preferredWidth = splitterThickness;
- SplitPane splitPane = (SplitPane)getComponent();
+ SplitPane splitPane = (SplitPane) getComponent();
Component topLeft = splitPane.getTopLeft();
if (topLeft != null) {
@@ -359,7 +359,7 @@
public int getPreferredHeight(int width) {
int preferredHeight = splitterThickness;
- SplitPane splitPane = (SplitPane)getComponent();
+ SplitPane splitPane = (SplitPane) getComponent();
Component topLeft = splitPane.getTopLeft();
if (topLeft != null) {
@@ -379,7 +379,7 @@
int preferredWidth = splitterThickness;
int preferredHeight = splitterThickness;
- SplitPane splitPane = (SplitPane)getComponent();
+ SplitPane splitPane = (SplitPane) getComponent();
Component topLeft = splitPane.getTopLeft();
if (topLeft != null) {
diff --git a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
index b83fce9..857fed6 100644
--- a/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
+++ b/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
@@ -861,10 +861,10 @@
bxmlSerializer.bind(this, TerraVFSBrowserSkin.class);
// Notify all the renderers of which component they are dealing with
- ((FileRenderer)pathListButton.getDataRenderer()).setFileBrowser(fileBrowser);
- ((FileRenderer)pathListButton.getItemRenderer()).setFileBrowser(fileBrowser);
+ ((FileRenderer) pathListButton.getDataRenderer()).setFileBrowser(fileBrowser);
+ ((FileRenderer) pathListButton.getItemRenderer()).setFileBrowser(fileBrowser);
for (TableView.Column col : fileTableView.getColumns()) {
- ((FileRenderer)col.getCellRenderer()).setFileBrowser(fileBrowser);
+ ((FileRenderer) col.getCellRenderer()).setFileBrowser(fileBrowser);
}
homeDirectory = fileBrowser.getHomeDirectory();
