Author: rwhitcomb
Date: Thu Apr 5 15:35:29 2018
New Revision: 1828447
URL: http://svn.apache.org/viewvc?rev=1828447&view=rev
Log:
PIVOT-1032: Fix more of the "easy" style errors in various files.
Modified:
pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
pivot/trunk/core/src/org/apache/pivot/io/IOTask.java
pivot/trunk/core/src/org/apache/pivot/serialization/MacroReader.java
pivot/trunk/core/src/org/apache/pivot/text/FileSizeFormat.java
pivot/trunk/core/src/org/apache/pivot/util/Version.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot948/Pivot948.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot964/Pivot964Swing.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot965/Pivot965Main.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/HyperlinkButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.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=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Thu Apr 5
15:35:29 2018
@@ -361,9 +361,7 @@ public class BXMLSerializer implements S
fileExtensions.put(PropertiesSerializer.PROPERTIES_EXTENSION,
PropertiesSerializer.MIME_TYPE);
}
- private ScriptEngine newEngineByName(String scriptLanguage)
- throws SerializationException
- {
+ private ScriptEngine newEngineByName(String scriptLanguage) throws
SerializationException {
ScriptEngine engine =
scriptEngineManager.getEngineByName(scriptLanguage);
if (engine == null) {
@@ -398,9 +396,7 @@ public class BXMLSerializer implements S
* @return Either an existing engine for that name, or a new one found by
the
* {@link #scriptEngineManager} and then cached (in the {@link
#scriptEngines} map).
*/
- private ScriptEngine getEngineByName(String scriptLanguage)
- throws SerializationException
- {
+ private ScriptEngine getEngineByName(String scriptLanguage) throws
SerializationException {
String languageKey = scriptLanguage.toLowerCase();
ScriptEngine engine = scriptEngines.get(languageKey);
if (engine != null) {
@@ -435,9 +431,7 @@ public class BXMLSerializer implements S
* @return Either an existing engine for that extension, or a new one
found by the
* {@link #scriptEngineManager} and then cached (in the {@link
#scriptEnginesExts} map).
*/
- private ScriptEngine getEngineByExtension(String extension)
- throws SerializationException
- {
+ private ScriptEngine getEngineByExtension(String extension) throws
SerializationException {
String extensionKey = extension.toLowerCase();
ScriptEngine engine = scriptEnginesExts.get(extensionKey);
if (engine != null) {
@@ -1251,7 +1245,7 @@ public class BXMLSerializer implements S
getEngineByName(language), attribute.name,
(String) attribute.value);
Object listener =
Proxy.newProxyInstance(classLoader,
- new Class<?>[] { attribute.propertyClass },
handler);
+ new Class<?>[] {attribute.propertyClass},
handler);
// Add the listener
Class<?> listenerListClass =
listenerList.getClass();
@@ -1401,7 +1395,7 @@ public class BXMLSerializer implements S
}
Object listener = Proxy.newProxyInstance(classLoader,
- new Class<?>[] { listenerClass }, handler);
+ new Class<?>[] {listenerClass}, handler);
try {
addMethod.invoke(listenerList, listener);
Modified: pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java Thu Apr 5
15:35:29 2018
@@ -294,7 +294,7 @@ public class BeanAdapter implements Map<
}
} else {
try {
- setterMethod.invoke(bean, new Object[] { valueUpdated });
+ setterMethod.invoke(bean, new Object[] {valueUpdated});
} catch (IllegalAccessException exception) {
throw new
RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
@@ -757,10 +757,9 @@ public class BeanAdapter implements Map<
String valueString =
value.toString().toUpperCase(Locale.ENGLISH);
Method valueOfMethod =
type.getMethod(ENUM_VALUE_OF_METHOD_NAME, String.class);
coercedValue = valueOfMethod.invoke(null, valueString);
- }
- // Nothing to be gained by handling the getMethod() & invoke()
exceptions separately
- catch (IllegalAccessException | InvocationTargetException |
+ } catch (IllegalAccessException | InvocationTargetException |
SecurityException | NoSuchMethodException e) {
+ // Nothing to be gained by handling the getMethod() &
invoke() exceptions separately
throw new IllegalArgumentException(String.format(
ENUM_COERCION_EXCEPTION_MESSAGE,
value.getClass().getName(), value, type,
Arrays.toString(type.getEnumConstants())), e);
Modified: pivot/trunk/core/src/org/apache/pivot/io/IOTask.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/io/IOTask.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/io/IOTask.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/io/IOTask.java Thu Apr 5 15:35:29
2018
@@ -59,7 +59,7 @@ public abstract class IOTask<V> extends
}
@Override
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
if (abort) {
throw new AbortException();
}
@@ -74,7 +74,7 @@ public abstract class IOTask<V> extends
}
@Override
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
if (abort) {
throw new AbortException();
}
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/MacroReader.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/MacroReader.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/MacroReader.java
(original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/MacroReader.java Thu
Apr 5 15:35:29 2018
@@ -35,7 +35,8 @@ import java.util.Queue;
* in the underlying stream. Nested macros are supported, and are expanded at
the
* point of definition, if defined, or at the point of expansion if defined
later.
*/
-public class MacroReader extends Reader {
+public final class MacroReader extends Reader {
+ /** The input reader we are mapping. */
private Reader in;
/** The map of our defined variables and their values. */
@@ -49,7 +50,11 @@ public class MacroReader extends Reader
/** The previous character read. */
private int lastCh = -1;
- public MacroReader(Reader reader) {
+ /**
+ * Construct a new macro reader on top of the given reader.
+ * @param reader The input reader we are going to wrap.
+ */
+ public MacroReader(final Reader reader) {
this.in = reader;
}
@@ -58,21 +63,32 @@ public class MacroReader extends Reader
in.close();
}
- private void queue(int ch) {
+ /**
+ * Add the given character to the lookahead queue for reprocessing.
+ * @param ch The character to queue.
+ */
+ private void queue(final int ch) {
if (ch != -1) {
lookaheadQueue.add(ch);
}
}
- private void queue(String str) {
+ /**
+ * Add all the characters of the given string to the lookahead queue
+ * for reprocessing.
+ * @param str The string to be queued up again.
+ */
+ private void queue(final String str) {
for (int i = 0; i < str.length(); i++) {
- lookaheadQueue.add(str.codePointAt(i));
+ lookaheadQueue.add((int) str.charAt(i));
}
}
/**
* Parse out the next word in the stream (according to Unicode
* Identifier semantics) as the macro name, skipping leading whitespace.
+ * @return The next parsed "word" string.
+ * @throws IOException for errors reading the stream.
*/
private String getNextWord() throws IOException {
StringBuilder buf = new StringBuilder();
@@ -81,11 +97,11 @@ public class MacroReader extends Reader
ch = getNextChar(true);
} while (ch != -1 && Character.isWhitespace(ch));
if (ch != -1) {
- buf.append((char)ch);
- while ((ch = getNextChar(true)) != -1 &&
- ((buf.length() == 0 &&
Character.isUnicodeIdentifierStart(ch)) ||
- (buf.length() > 0 &&
Character.isUnicodeIdentifierPart(ch)))) {
- buf.append((char)ch);
+ buf.append((char) ch);
+ while ((ch = getNextChar(true)) != -1
+ && ((buf.length() == 0 &&
Character.isUnicodeIdentifierStart(ch))
+ || (buf.length() > 0 &&
Character.isUnicodeIdentifierPart(ch)))) {
+ buf.append((char) ch);
}
// Re-queue the character that terminated the word
queue(ch);
@@ -110,13 +126,14 @@ public class MacroReader extends Reader
* invoking this method recursively
* to ignore unknown macro commands
* or undefined macros
+ * @return The next character in the stream.
+ * @throws IOException if there are errors reading the stream.
*/
- private int getNextChar(boolean handleMacros) throws IOException {
+ private int getNextChar(final boolean handleMacros) throws IOException {
int ret = -1;
if (!lookaheadQueue.isEmpty()) {
ret = lookaheadQueue.poll().intValue();
- }
- else {
+ } else {
ret = in.read();
}
// Check for macro define or undefine (starting with "#"
@@ -129,8 +146,7 @@ public class MacroReader extends Reader
skipToEol();
variableMap.remove(name);
return getNextChar(true);
- }
- else if (!keyword.equalsIgnoreCase("define")) {
+ } else if (!keyword.equalsIgnoreCase("define")) {
// Basically ignore any commands we don't understand
// by simply queueing the text back to be read again
// but with the flag set to ignore this command (so
@@ -150,24 +166,22 @@ public class MacroReader extends Reader
queue(ch);
do {
while ((ch = getNextChar(true)) != -1 && ch != '\\' && ch !=
'\n') {
- buf.append((char)ch);
+ buf.append((char) ch);
}
// Check for line continuation character
if (ch == '\\') {
int next = getNextChar(true);
if (next == '\n') {
- buf.append((char)next);
- }
- else {
- buf.append((char)ch);
- buf.append((char)next);
+ buf.append((char) next);
+ } else {
+ buf.append((char) ch);
+ buf.append((char) next);
}
}
} while (ch != -1 && ch != '\n');
variableMap.put(name, buf.toString());
return getNextChar(true);
- }
- else if (ret == '$' && handleMacros) {
+ } else if (ret == '$' && handleMacros) {
// Check for macro expansion
// Note: this allows for nested expansion
int next = getNextChar(true);
@@ -176,7 +190,7 @@ public class MacroReader extends Reader
StringBuilder buf = new StringBuilder();
int ch;
while ((ch = getNextChar(true)) != -1 && ch != '}') {
- buf.append((char)ch);
+ buf.append((char) ch);
}
String expansion = variableMap.get(buf.toString());
if (expansion == null) {
@@ -185,13 +199,11 @@ public class MacroReader extends Reader
queue(buf.toString());
queue(ch);
ret = getNextChar(false);
- }
- else {
+ } else {
queue(expansion);
ret = getNextChar(true);
}
- }
- else {
+ } else {
queue(next);
}
}
@@ -199,7 +211,7 @@ public class MacroReader extends Reader
}
@Override
- public int read(char[] cbuf, int off, int len) throws IOException {
+ public int read(final char[] cbuf, final int off, final int len) throws
IOException {
int read = -1;
for (int i = 0; i < len; i++) {
int ch = getNextChar(true);
@@ -207,7 +219,7 @@ public class MacroReader extends Reader
break;
}
read = i;
- cbuf[off + i] = (char)ch;
+ cbuf[off + i] = (char) ch;
}
return (read == -1) ? read : read + 1;
}
Modified: pivot/trunk/core/src/org/apache/pivot/text/FileSizeFormat.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/text/FileSizeFormat.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/text/FileSizeFormat.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/text/FileSizeFormat.java Thu Apr 5
15:35:29 2018
@@ -28,11 +28,15 @@ import java.text.ParsePosition;
public final class FileSizeFormat extends Format {
private static final long serialVersionUID = 9126510513247641698L;
+ /** The binary value of a "kilo"byte. */
public static final int KILOBYTE = 1024;
- public static final String[] ABBREVIATIONS = { "", "K", "M", "G", "T",
"P", "E", "Z", "Y" };
+ /** The list of first letter abbreviations for each kilobyte power. */
+ public static final String[] ABBREVIATIONS = {"", "K", "M", "G", "T", "P",
"E", "Z", "Y"};
+ /** The singleton instance of this class. */
private static final FileSizeFormat FILE_SIZE_FORMAT = new
FileSizeFormat();
+ /** Private constructor since this is a singleton accessed by the {@link
#getInstance} method. */
private FileSizeFormat() {
}
@@ -47,7 +51,8 @@ public final class FileSizeFormat extend
* @return The original string buffer, with the formatted value appended.
*/
@Override
- public StringBuffer format(Object object, StringBuffer stringBuffer,
FieldPosition fieldPosition) {
+ public StringBuffer format(final Object object, final StringBuffer
stringBuffer,
+ final FieldPosition fieldPosition) {
Number number = (Number) object;
long length = number.longValue();
@@ -79,7 +84,7 @@ public final class FileSizeFormat extend
* @throws UnsupportedOperationException always.
*/
@Override
- public Object parseObject(String arg0, ParsePosition arg1) {
+ public Object parseObject(final String arg0, final ParsePosition arg1) {
throw new UnsupportedOperationException();
}
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=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Version.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Version.java Thu Apr 5 15:35:29
2018
@@ -116,7 +116,7 @@ public class Version implements Comparab
String revision;
// Some "version" strings separate fields with a space
// While Java 9 uses a new scheme where "build" uses a "+"
- String parts[] = string.split("[ +\\-]");
+ String[] parts = string.split("[ +\\-]");
if (parts.length == 1) {
revision = string;
} else {
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot948/Pivot948.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot948/Pivot948.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot948/Pivot948.java
(original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot948/Pivot948.java
Thu Apr 5 15:35:29 2018
@@ -16,9 +16,21 @@
*/
package org.apache.pivot.tests.issues.pivot948;
-import org.apache.pivot.beans.*;
-import org.apache.pivot.collections.*;
-import org.apache.pivot.wtk.*;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BXMLSerializer;
+import org.apache.pivot.collections.List;
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.BindType;
+import org.apache.pivot.wtk.Button;
+import org.apache.pivot.wtk.ButtonPressListener;
+import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.ListButton;
+import org.apache.pivot.wtk.ListView;
+import org.apache.pivot.wtk.PushButton;
+import org.apache.pivot.wtk.TextInput;
+import org.apache.pivot.wtk.Window;
public class Pivot948 implements Application, ButtonPressListener,
ListView.ItemBindMapping {
private Window window = null;
@@ -99,13 +111,11 @@ public class Pivot948 implements Applica
String text = outputResult.getText();
if (text == null || text.trim().isEmpty()) {
listIndex = null;
- }
- else {
+ } else {
listIndex = Integer.valueOf(text);
}
inputList.load(this);
- }
- else if (button == storeButton) {
+ } else if (button == storeButton) {
inputList.store(this);
outputResult.setText(listIndex == null ? "" :
listIndex.toString());
}
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=1828447&r1=1828446&r2=1828447&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
Thu Apr 5 15:35:29 2018
@@ -105,7 +105,7 @@ public class Pivot964Swing extends javax
pack();
} // </editor-fold>
- public static void main(String args[]) {
+ public static void main(String[] args) {
java.awt.EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot965/Pivot965Main.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot965/Pivot965Main.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
---
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot965/Pivot965Main.java
(original)
+++
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot965/Pivot965Main.java
Thu Apr 5 15:35:29 2018
@@ -25,8 +25,7 @@ import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.Window;
-public class Pivot965Main implements Application
-{
+public class Pivot965Main implements Application {
private Window window = null;
@Override
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
Thu Apr 5 15:35:29 2018
@@ -6,7 +6,7 @@
* Version 2.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSEPERCENT_SCALE.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,14 +16,29 @@
*/
package org.apache.pivot.tutorials.calculator;
-import java.io.*;
-import java.math.*;
-import org.apache.pivot.beans.*;
-import org.apache.pivot.collections.*;
-import org.apache.pivot.serialization.*;
-import org.apache.pivot.wtk.*;
-
-public class Calculator implements Application {
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BXMLSerializer;
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.serialization.SerializationException;
+import org.apache.pivot.wtk.Action;
+import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.ApplicationContext;
+import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.ComponentKeyListener;
+import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.Label;
+import org.apache.pivot.wtk.PushButton;
+import org.apache.pivot.wtk.Window;
+
+/**
+ * Calculator demonstration program that mimics the look and feel
+ * of the iOS calculator app (pre iOS-11 that is).
+ */
+public final class Calculator implements Application {
private BXMLSerializer serializer;
@BXML private Window mainWindow;
@@ -49,7 +64,8 @@ public class Calculator implements Appli
@BXML private PushButton nineButton;
@BXML private PushButton dotButton;
- private static MathContext MC = MathContext.DECIMAL64;
+ private static final MathContext MC = MathContext.DECIMAL64;
+ private static final int PERCENT_SCALE = -2;
private static StringBuilder resultBuffer = new StringBuilder("0");
private static BigDecimal result = BigDecimal.ZERO;
@@ -64,14 +80,14 @@ public class Calculator implements Appli
private static Calculator instance;
@Override
- public void startup(Display display, Map<String, String> properties) {
+ public void startup(final Display display, final Map<String, String>
properties) {
try {
serializer.readObject(Calculator.class, "calculator.bxml");
serializer.bind(this);
mainWindow.getComponentKeyListeners().add(new
ComponentKeyListener() {
@Override
- public boolean keyTyped(Component comp, char ch) {
+ public boolean keyTyped(final Component comp, final char ch) {
// Some keys don't give us virtual key mappings, so we
need to
// listen here for the relevant keys typed
switch (ch) {
@@ -102,8 +118,7 @@ public class Calculator implements Appli
mainWindow.open(display);
mainWindow.requestFocus();
- }
- catch (IOException | SerializationException ex) {
+ } catch (IOException | SerializationException ex) {
}
}
@@ -113,18 +128,18 @@ public class Calculator implements Appli
instance.resultText.setText(resultBuffer.toString());
}
- private static void setClearAll(boolean all) {
+ private static void setClearAll(final boolean all) {
instance.clearButton.setButtonData(all ? "AC" : "C");
clearingAll = all;
}
- private static void setOperatorButton(boolean on) {
+ private static void setOperatorButton(final boolean on) {
if (currentOperatorButton != null) {
currentOperatorButton.setStyleName(on ? "buttonBorderHighlight" :
"buttonBorderNormal");
}
}
- private static void digit(char digit) {
+ private static void digit(final char digit) {
setClearAll(false);
setOperatorButton(false);
justSeenOperator = false;
@@ -150,13 +165,14 @@ public class Calculator implements Appli
return;
}
break;
+ default:
+ break;
}
result = new BigDecimal(resultBuffer.toString());
updateResult();
}
- private enum Operator
- {
+ private enum Operator {
ADD,
SUBTRACT,
MULTIPLY,
@@ -165,7 +181,7 @@ public class Calculator implements Appli
private PushButton button;
- public void setButton(PushButton button) {
+ public void setButton(final PushButton button) {
this.button = button;
}
@@ -174,7 +190,7 @@ public class Calculator implements Appli
}
}
- private static void changeOperator(Operator newOperator) {
+ private static void changeOperator(final Operator newOperator) {
if (currentOperator == null) {
currentOperator = newOperator;
accumulator = result;
@@ -203,6 +219,8 @@ public class Calculator implements Appli
case DIVIDE:
result = accumulator.divide(result, MC);
break;
+ default:
+ break;
}
if (newOperator == Operator.EQUALS) {
setOperatorButton(false);
@@ -221,133 +239,131 @@ public class Calculator implements Appli
}
}
- private interface ActionDoer
- {
+ private interface ActionDoer {
void perform(Component source);
}
- private enum ACTION implements ActionDoer
- {
+ private enum ACTION implements ActionDoer {
DOT {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('.');
}
},
ZERO {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('0');
}
},
ONE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('1');
}
},
TWO {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('2');
}
},
THREE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('3');
}
},
FOUR {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('4');
}
},
FIVE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('5');
}
},
SIX {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('6');
}
},
SEVEN {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('7');
}
},
EIGHT {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('8');
}
},
NINE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
digit('9');
}
},
ADD {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
changeOperator(Operator.ADD);
}
},
SUBTRACT {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
changeOperator(Operator.SUBTRACT);
}
},
MULTIPLY {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
changeOperator(Operator.MULTIPLY);
}
},
DIVIDE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
changeOperator(Operator.DIVIDE);
}
},
EQUALS {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
changeOperator(Operator.EQUALS);
}
},
NEGATE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
result = result.negate(MC);
updateResult();
}
},
PERCENT {
@Override
- public void perform(Component source) {
- if (currentOperator == null ||
- currentOperator == Operator.MULTIPLY ||
- currentOperator == Operator.DIVIDE ||
- accumulator == null) {
- result = result.scaleByPowerOfTen(-2);
+ public void perform(final Component source) {
+ if (currentOperator == null
+ || currentOperator == Operator.MULTIPLY
+ || currentOperator == Operator.DIVIDE
+ || accumulator == null) {
+ result = result.scaleByPowerOfTen(PERCENT_SCALE);
} else {
- result = accumulator.multiply(result,
MC).scaleByPowerOfTen(-2);
+ result = accumulator.multiply(result,
MC).scaleByPowerOfTen(PERCENT_SCALE);
}
updateResult();
}
},
BACKSPACE {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
if (resultBuffer.length() > 0 &&
!resultBuffer.toString().equals("0")) {
char ch = resultBuffer.charAt(resultBuffer.length() - 1);
if (ch == '.') {
@@ -364,7 +380,7 @@ public class Calculator implements Appli
},
CLEAR {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
result = BigDecimal.ZERO;
seenDecimalPoint = false;
justSeenOperator = false;
@@ -381,23 +397,22 @@ public class Calculator implements Appli
},
QUIT {
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
DesktopApplicationContext.exit();
}
}
}
- private class CalculatorAction extends Action
- {
+ private class CalculatorAction extends Action {
private ACTION action;
- public CalculatorAction(ACTION action) {
+ public CalculatorAction(final ACTION action) {
this.action = action;
Action.getNamedActions().put(action.toString(), this);
}
@Override
- public void perform(Component source) {
+ public void perform(final Component source) {
action.perform(source);
}
}
@@ -416,7 +431,7 @@ public class Calculator implements Appli
instance = this;
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
DesktopApplicationContext.main(Calculator.class, args);
}
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
Thu Apr 5 15:35:29 2018
@@ -107,8 +107,7 @@ public class TerraVFSBrowserSheetSkin ex
} else {
hostNameBoxPane.setVisible(false);
}
- }
- catch (FileSystemException ex) {
+ } catch (FileSystemException ex) {
throw new RuntimeException(ex);
}
}
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=1828447&r1=1828446&r2=1828447&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
Thu Apr 5 15:35:29 2018
@@ -169,8 +169,7 @@ public class TerraVFSBrowserSkin extends
}
}
return hidden;
- }
- catch (FileSystemException fse) {
+ } catch (FileSystemException fse) {
throw new RuntimeException(fse);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/HyperlinkButton.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/HyperlinkButton.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/HyperlinkButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/HyperlinkButton.java Thu Apr 5
15:35:29 2018
@@ -183,9 +183,7 @@ public class HyperlinkButton extends Lin
* @throws URISyntaxException if the string is not a valid {@link URI}.
* @see #setUri(URI)
*/
- public void setUri(String uriString)
- throws URISyntaxException
- {
+ public void setUri(String uriString) throws URISyntaxException {
Utils.checkNullOrEmpty(uriString, "URI string");
setUri(new URI(uriString));
}
@@ -196,9 +194,7 @@ public class HyperlinkButton extends Lin
* @throws URISyntaxException if the <code>URL</code> does not specify
* a valid {@link URI}.
*/
- public void setUrl(URL url)
- throws URISyntaxException
- {
+ public void setUrl(URL url) throws URISyntaxException {
setUri(url == null ? null : url.toURI());
}
@@ -210,9 +206,7 @@ public class HyperlinkButton extends Lin
* @throws MalformedURLException if the string cannot be converted to a
<code>URL</code>
* @throws URISyntaxException if the <code>URL</code> does not specify a
valid {@link URI}.
*/
- public void setUrl(String urlString)
- throws MalformedURLException, URISyntaxException
- {
+ public void setUrl(String urlString) throws MalformedURLException,
URISyntaxException {
Utils.checkNullOrEmpty(urlString, "URL string");
setUrl(new URL(urlString));
}
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=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Thu Apr 5 15:35:29
2018
@@ -790,8 +790,7 @@ public class TextPane extends Container
for (Node node : element) {
if (node instanceof Element) {
addToText(text, (Element) node, includeSpan);
- }
- else {
+ } else {
Span nodeSpan = node.getDocumentSpan();
Span nodeIntersection = nodeSpan.intersect(includeSpan);
if (nodeIntersection != null) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java Thu Apr 5
15:35:29 2018
@@ -35,7 +35,7 @@ import org.apache.pivot.util.Utils;
* to be able to browse local and remote file systems, and browse inside of
* .zip, .tar, etc. archives as well.
*/
-public class VFSBrowserSheet extends Sheet {
+public final class VFSBrowserSheet extends Sheet {
/**
* Enumeration defining supported modes.
*/
@@ -56,7 +56,8 @@ public class VFSBrowserSheet extends She
private FileObjectList selectedFiles = new FileObjectList();
private Filter<FileObject> disabledFileFilter = null;
- private VFSBrowserSheetListener.Listeners fileBrowserSheetListeners = new
VFSBrowserSheetListener.Listeners();
+ private VFSBrowserSheetListener.Listeners fileBrowserSheetListeners =
+ new VFSBrowserSheetListener.Listeners();
/**
* Creates a new VFSBrowserSheet <p> Note that this version set by default
@@ -123,8 +124,7 @@ public class VFSBrowserSheet extends She
* @see Mode
*/
public VFSBrowserSheet(FileSystemManager manager, Mode mode, String
rootFolder, String homeFolder)
- throws FileSystemException
- {
+ throws FileSystemException {
Utils.checkNull(mode, "Mode");
Utils.checkNull(rootFolder, "Root folder");
@@ -154,8 +154,7 @@ public class VFSBrowserSheet extends She
* @see Mode
*/
public VFSBrowserSheet(FileSystemManager manager, Mode mode, FileObject
rootFolder, FileObject homeFolder)
- throws FileSystemException
- {
+ throws FileSystemException {
Utils.checkNull(mode, "Mode");
Utils.checkNull(rootFolder, "Root folder");
@@ -249,15 +248,11 @@ public class VFSBrowserSheet extends She
return homeDirectory;
}
- public void setHomeDirectory(String homeDirectory)
- throws FileSystemException
- {
+ public void setHomeDirectory(String homeDirectory) throws
FileSystemException {
setHomeDirectory(manager.resolveFile(homeDirectory));
}
- public void setHomeDirectory(FileObject homeDirectory)
- throws FileSystemException
- {
+ public void setHomeDirectory(FileObject homeDirectory) throws
FileSystemException {
Utils.checkNull(homeDirectory, "Home directory");
// Give some grace to set the home folder to an actual file and
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Thu Apr 5
15:35:29 2018
@@ -90,11 +90,11 @@ public class LabelSkin extends Component
int preferredWidth = 0;
if (text != null && text.length() > 0) {
FontRenderContext fontRenderContext =
Platform.getFontRenderContext();
- String str[];
+ String[] str;
if (wrapText) {
str = text.split("\n");
} else {
- str = new String[] { text };
+ str = new String[] {text};
}
for (String line : str) {
@@ -187,11 +187,11 @@ public class LabelSkin extends Component
int preferredWidth = 0;
if (text != null && text.length() > 0) {
- String str[];
+ String[] str;
if (wrapText) {
str = text.split("\n");
} else {
- str = new String[] { text };
+ str = new String[] {text};
}
for (String line : str) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=1828447&r1=1828446&r2=1828447&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Thu Apr 5
15:35:29 2018
@@ -1347,7 +1347,7 @@ public class TablePaneSkin extends Conta
int rowCount = rows.getLength();
int columnCount = tablePane.getColumns().getLength();
- int rowHeightsLocal[] = new int[rowCount];
+ int[] rowHeightsLocal = new int[rowCount];
boolean[] defaultHeightRows = new boolean[rowCount];
int totalRelativeWeight = 0;
