Author: rwhitcomb Date: Wed Apr 4 16:45:42 2018 New Revision: 1828362 URL: http://svn.apache.org/viewvc?rev=1828362&view=rev Log: PIVOT-1032: Fix the remaining cases of [WhitespaceAround] errors in the check-style report.
Modified: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java pivot/trunk/core/src/org/apache/pivot/util/Utils.java pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Modified: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original) +++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Wed Apr 4 16:45:42 2018 @@ -1531,7 +1531,7 @@ public class BXMLSerializer implements S } private void reportException(ScriptException exception, String script) { - reportException(new SerializationException("Failed to execute script:\n"+script, exception)); + reportException(new SerializationException("Failed to execute script:\n" + script, exception)); } /** Modified: pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java (original) +++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java Wed Apr 4 16:45:42 2018 @@ -92,7 +92,7 @@ public class ArrayStack<T> implements St public T pop() { int length = arrayList.getLength(); if (length == 0) { - throw new IllegalStateException((getComparator()==null?"stack":"queue")+" is empty"); + throw new IllegalStateException((getComparator() == null ? "stack" : "queue") + " is empty"); } T item = arrayList.remove(length - 1, 1).get(0); Modified: pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java (original) +++ pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java Wed Apr 4 16:45:42 2018 @@ -87,7 +87,7 @@ public class LinkedStack<T> implements S public T pop() { int length = linkedList.getLength(); if (length == 0) { - throw new IllegalStateException((getComparator()==null?"stack":"queue")+" is empty"); + throw new IllegalStateException((getComparator() == null ? "stack" : "queue") + " is empty"); } T item = linkedList.remove(length - 1, 1).get(0); Modified: pivot/trunk/core/src/org/apache/pivot/util/Utils.java URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Utils.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/core/src/org/apache/pivot/util/Utils.java (original) +++ pivot/trunk/core/src/org/apache/pivot/util/Utils.java Wed Apr 4 16:45:42 2018 @@ -258,7 +258,7 @@ public class Utils { */ public static void checkZeroBasedIndex(int index, int size) { if (index < 0 || index >= size) { - throw new IndexOutOfBoundsException("Index " + index + " out of bounds [0," + (size-1) + "]."); + throw new IndexOutOfBoundsException("Index " + index + " out of bounds [0," + (size - 1) + "]."); } } Modified: pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java (original) +++ pivot/trunk/core/test/org/apache/pivot/functional/monad/test/OptionTest.java Wed Apr 4 16:45:42 2018 @@ -37,7 +37,7 @@ public class OptionTest { assertNotNull(o); } - @Test(expected=NoSuchElementException.class) + @Test(expected = NoSuchElementException.class) public void companionNoneTest() { OptionCompanion<Object> o = OptionCompanion.getInstance(); assertNotNull(o); Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java (original) +++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java Wed Apr 4 16:45:42 2018 @@ -103,7 +103,7 @@ public class Pivot964Swing extends javax panel_display.add(button2, java.awt.BorderLayout.WEST); pack(); - }// </editor-fold> + } // </editor-fold> public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Wed Apr 4 16:45:42 2018 @@ -210,7 +210,7 @@ public class TerraAlertSkin extends Terr this.borderBackgroundColor = borderBackgroundColor; - if (messageBorder != null){ + if (messageBorder != null) { messageBorder.getStyles().put(Style.backgroundColor, borderBackgroundColor); } } @@ -234,7 +234,7 @@ public class TerraAlertSkin extends Terr this.borderColor = borderColor; - if (messageBorder != null){ + if (messageBorder != null) { messageBorder.getStyles().put(Style.color, borderColor); } } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Wed Apr 4 16:45:42 2018 @@ -965,7 +965,7 @@ public class TerraFileBrowserSkin extend String text = null; - if (file != null){ + if (file != null) { text = file.getName(); } Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java (original) +++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java Wed Apr 4 16:45:42 2018 @@ -1118,7 +1118,7 @@ public class TerraVFSBrowserSkin extends String text = null; - if (file != null){ + if (file != null) { text = file.getName().getBaseName(); } Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java (original) +++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java Wed Apr 4 16:45:42 2018 @@ -219,7 +219,7 @@ public class ScrollBar extends Container if (end < value + extent) { throw new IllegalArgumentException( - "end (" + end + ") is less than value ("+ value + ") + extent (" + extent + ")"); + "end (" + end + ") is less than value (" + value + ") + extent (" + extent + ")"); } this.start = start; Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java?rev=1828362&r1=1828361&r2=1828362&view=diff ============================================================================== --- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java (original) +++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Wed Apr 4 16:45:42 2018 @@ -1200,7 +1200,8 @@ public class TextPane extends Container if (msg != null && !msg.isEmpty()) { System.out.println(msg + ":"); } - System.out.format(FORMAT, StringUtils.fromNChars(' ', indent*2), node.getClass().getSimpleName(), node.getDocumentOffset(), node.getCharacterCount()); + String indenting = StringUtils.fromNChars(' ', indent * 2); + System.out.format(FORMAT, indenting, node.getClass().getSimpleName(), node.getDocumentOffset(), node.getCharacterCount()); if (node instanceof Element) { for (Node n : (Element)node) { dumpNode("", n, indent + 1);