You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2018/08/17 22:27:05 UTC
svn commit: r1838293 [1/3] - in /pivot/trunk:
charts/src/org/apache/pivot/charts/ core/src/org/apache/pivot/beans/
core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/collections/adapter/
core/src/org/apache/pivot/collections/immutable/ co...
Author: rwhitcomb
Date: Fri Aug 17 22:27:05 2018
New Revision: 1838293
URL: http://svn.apache.org/viewvc?rev=1838293&view=rev
Log:
PIVOT-1032: Fix the remaining LineLength errors, some AvoidNestedBlocks errors
and many others in many of the smaller files touched here.
Modified:
pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java
pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java
pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableList.java
pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java
pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java
pivot/trunk/core/src/org/apache/pivot/text/AttributedStringCharacterIterator.java
pivot/trunk/core/src/org/apache/pivot/util/CharUtils.java
pivot/trunk/core/src/org/apache/pivot/util/ImageUtils.java
pivot/trunk/core/src/org/apache/pivot/util/ImmutableIterator.java
pivot/trunk/core/src/org/apache/pivot/util/Utils.java
pivot/trunk/core/test/org/apache/pivot/util/test/CharUtilsTest.java
pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/CurrencyValidator.java
pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotApplicationLaunchShortcut.java
pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotScriptApplicationLaunchShortcut.java
pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationWithPropertiesTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TextAreaConsoleTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot765.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot862.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspector.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.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/Accordion.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneAttributeListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/NumberRulerSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.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=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java Fri Aug 17 22:27:05 2018
@@ -47,11 +47,11 @@ public abstract class ChartView extends
this(null, null);
}
- public Category(String key) {
+ public Category(final String key) {
this(key, key);
}
- public Category(String key, String label) {
+ public Category(final String key, final String label) {
this.key = key;
this.label = label;
}
@@ -64,7 +64,7 @@ public abstract class ChartView extends
return key;
}
- public void setKey(String key) {
+ public void setKey(final String key) {
Utils.checkNull(key, "key");
String previousKey = this.key;
@@ -83,7 +83,7 @@ public abstract class ChartView extends
return label;
}
- public void setLabel(String label) {
+ public void setLabel(final String label) {
Utils.checkNull(label, "label");
String previousLabel = this.label;
@@ -106,7 +106,7 @@ public abstract class ChartView extends
private int seriesIndex;
private int elementIndex;
- public Element(int seriesIndex, int elementIndex) {
+ public Element(final int seriesIndex, final int elementIndex) {
this.seriesIndex = seriesIndex;
this.elementIndex = elementIndex;
}
@@ -134,8 +134,7 @@ public abstract class ChartView extends
@Override
public String toString() {
- String string = getClass().getName() + seriesIndex + ", " + elementIndex;
- return string;
+ return getClass().getName() + seriesIndex + ", " + elementIndex;
}
}
@@ -151,7 +150,7 @@ public abstract class ChartView extends
*/
public final class CategorySequence implements Sequence<Category> {
@Override
- public int add(Category category) {
+ public int add(final Category category) {
int index = getLength();
insert(category, index);
@@ -159,7 +158,7 @@ public abstract class ChartView extends
}
@Override
- public void insert(Category category, int index) {
+ public void insert(final Category category, final int index) {
Utils.checkNull(category, "category");
if (category.getChartView() != null) {
@@ -174,12 +173,12 @@ public abstract class ChartView extends
}
@Override
- public Category update(int index, Category category) {
+ public Category update(final int index, final Category category) {
throw new UnsupportedOperationException();
}
@Override
- public int remove(Category category) {
+ public int remove(final Category category) {
int index = indexOf(category);
if (index != -1) {
remove(index, 1);
@@ -189,7 +188,7 @@ public abstract class ChartView extends
}
@Override
- public Sequence<Category> remove(int index, int count) {
+ public Sequence<Category> remove(final int index, final int count) {
Sequence<Category> removed = categories.remove(index, count);
if (count > 0) {
@@ -204,12 +203,12 @@ public abstract class ChartView extends
}
@Override
- public Category get(int index) {
+ public Category get(final int index) {
return categories.get(index);
}
@Override
- public int indexOf(Category category) {
+ public int indexOf(final Category category) {
return categories.indexOf(category);
}
@@ -224,28 +223,28 @@ public abstract class ChartView extends
*/
private class ListHandler implements ListListener<Object> {
@Override
- public void itemInserted(List<Object> list, int index) {
+ public void itemInserted(final List<Object> list, final int index) {
chartViewSeriesListeners.seriesInserted(ChartView.this, index);
}
@Override
- public void itemsRemoved(List<Object> list, int index, Sequence<Object> items) {
+ public void itemsRemoved(final List<Object> list, final int index, final Sequence<Object> items) {
int count = items.getLength();
chartViewSeriesListeners.seriesRemoved(ChartView.this, index, count);
}
@Override
- public void itemUpdated(List<Object> list, int index, Object previousItem) {
+ public void itemUpdated(final List<Object> list, final int index, final Object previousItem) {
chartViewSeriesListeners.seriesUpdated(ChartView.this, index);
}
@Override
- public void listCleared(List<Object> list) {
+ public void listCleared(final List<Object> list) {
chartViewSeriesListeners.seriesCleared(ChartView.this);
}
@Override
- public void comparatorChanged(List<Object> list, Comparator<Object> previousComparator) {
+ public void comparatorChanged(final List<Object> list, final Comparator<Object> previousComparator) {
if (list.getComparator() != null) {
chartViewSeriesListeners.seriesSorted(ChartView.this);
}
@@ -254,28 +253,27 @@ public abstract class ChartView extends
private class ValueMarkersHandler implements ListListener<ValueMarker> {
@Override
- public void itemInserted(List<ValueMarker> list, int index) {
+ public void itemInserted(final List<ValueMarker> list, final int index) {
chartViewListeners.chartDataChanged(ChartView.this, getChartData());
}
@Override
- public void itemsRemoved(List<ValueMarker> list, int index, Sequence<ValueMarker> items) {
+ public void itemsRemoved(final List<ValueMarker> list, final int index, final Sequence<ValueMarker> items) {
chartViewListeners.chartDataChanged(ChartView.this, getChartData());
}
@Override
- public void itemUpdated(List<ValueMarker> list, int index, ValueMarker previousItem) {
+ public void itemUpdated(final List<ValueMarker> list, final int index, final ValueMarker previousItem) {
chartViewListeners.chartDataChanged(ChartView.this, getChartData());
}
@Override
- public void listCleared(List<ValueMarker> list) {
+ public void listCleared(final List<ValueMarker> list) {
chartViewListeners.chartDataChanged(ChartView.this, getChartData());
}
@Override
- public void comparatorChanged(List<ValueMarker> list,
- Comparator<ValueMarker> previousComparator) {
+ public void comparatorChanged(final List<ValueMarker> list, final Comparator<ValueMarker> previousComparator) {
// No-op
}
}
@@ -317,7 +315,7 @@ public abstract class ChartView extends
this(DEFAULT_SERIES_NAME_KEY, new ArrayList<>());
}
- public ChartView(String seriesNameKey, List<?> chartData) {
+ public ChartView(final String seriesNameKey, final List<?> chartData) {
setSeriesNameKey(seriesNameKey);
setTitle(title);
setChartData(chartData);
@@ -327,8 +325,9 @@ public abstract class ChartView extends
@Override
@SuppressWarnings("unchecked")
- protected void installSkin(Class<? extends Component> componentClass) {
- Class<? extends org.apache.pivot.wtk.Skin> skinClass = provider.getSkinClass((Class<? extends ChartView>) componentClass);
+ protected void installSkin(final Class<? extends Component> componentClass) {
+ Class<? extends org.apache.pivot.wtk.Skin> skinClass =
+ provider.getSkinClass((Class<? extends ChartView>) componentClass);
try {
setSkin(skinClass.newInstance());
@@ -348,7 +347,7 @@ public abstract class ChartView extends
}
@SuppressWarnings("unchecked")
- public void setChartData(List<?> chartData) {
+ public void setChartData(final List<?> chartData) {
Utils.checkNull(chartData, "chartData");
List<?> previousChartData = this.chartData;
@@ -369,7 +368,7 @@ public abstract class ChartView extends
return seriesNameKey;
}
- public void setSeriesNameKey(String seriesNameKey) {
+ public void setSeriesNameKey(final String seriesNameKey) {
Utils.checkNull(seriesNameKey, "seriesNameKey");
String previousSeriesNameKey = this.seriesNameKey;
@@ -384,7 +383,7 @@ public abstract class ChartView extends
return title;
}
- public void setTitle(String title) {
+ public void setTitle(final String title) {
String previousTitle = this.title;
if (previousTitle != title) {
@@ -397,7 +396,7 @@ public abstract class ChartView extends
return horizontalAxisLabel;
}
- public void setHorizontalAxisLabel(String horizontalAxisLabel) {
+ public void setHorizontalAxisLabel(final String horizontalAxisLabel) {
String previousHorizontalAxisLabel = this.horizontalAxisLabel;
if (previousHorizontalAxisLabel != horizontalAxisLabel) {
@@ -410,7 +409,7 @@ public abstract class ChartView extends
return verticalAxisLabel;
}
- public void setVerticalAxisLabel(String verticalAxisLabel) {
+ public void setVerticalAxisLabel(final String verticalAxisLabel) {
String previousVerticalAxisLabel = this.verticalAxisLabel;
if (previousVerticalAxisLabel != verticalAxisLabel) {
@@ -423,14 +422,14 @@ public abstract class ChartView extends
return showLegend;
}
- public void setShowLegend(boolean showLegend) {
+ public void setShowLegend(final boolean showLegend) {
if (this.showLegend != showLegend) {
this.showLegend = showLegend;
chartViewListeners.showLegendChanged(this);
}
}
- public Element getElementAt(int x, int y) {
+ public Element getElementAt(final int x, final int y) {
return ((Skin) getSkin()).getElementAt(x, y);
}
@@ -450,7 +449,7 @@ public abstract class ChartView extends
return valueMarkers;
}
- public void setValueMarkers(List<ValueMarker> valueMarkers) {
+ public void setValueMarkers(final List<ValueMarker> valueMarkers) {
List<ValueMarker> previousValueMarkers = this.valueMarkers;
if (previousValueMarkers != valueMarkers) {
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=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Fri Aug 17 22:27:05 2018
@@ -83,7 +83,8 @@ public class BXMLSerializer implements S
public final HashMap<String, String> properties = new HashMap<>();
public final LinkedList<Attribute> attributes = new LinkedList<>();
- public Element(Element parent, Type type, String name, Class<?> propertyClass, Object value) {
+ public Element(final Element parent, final Type type, final String name,
+ final Class<?> propertyClass, final Object value) {
this.parent = parent;
this.type = type;
this.name = name;
@@ -98,7 +99,7 @@ public class BXMLSerializer implements S
public final Class<?> propertyClass;
public Object value;
- public Attribute(Element element, String name, Class<?> propertyClass, Object value) {
+ public Attribute(final Element element, final String name, final Class<?> propertyClass, final Object value) {
this.element = element;
this.name = name;
this.propertyClass = propertyClass;
@@ -106,17 +107,19 @@ public class BXMLSerializer implements S
}
}
-/* private static void printBindings(String message, java.util.Map<String,Object> bindings) {
+/* private static void printBindings(final String message, final java.util.Map<String,Object> bindings) {
System.out.format("===== %1$s =====%n", message);
System.out.format("--- Bindings %1$s=%2$s ---%n", bindings, bindings.getClass().getName());
for (String key : bindings.keySet()) {
Object value = bindings.get(key);
- System.out.format("key: %1$s, value: %2$s [%3$s]%n", key, value, Integer.toHexString(System.identityHashCode(value)));
+ System.out.format("key: %1$s, value: %2$s [%3$s]%n",
+ key, value, Integer.toHexString(System.identityHashCode(value)));
if (key.equals(NASHORN_GLOBAL)) {
Bindings globalBindings = (Bindings)value;
for (String globalKey : globalBindings.keySet()) {
Object globalValue = globalBindings.get(globalKey);
- System.out.format(" global key: %1$s, value: %2$s [%3$s]%n", globalKey, globalValue, Integer.toHexString(System.identityHashCode(globalValue)));
+ System.out.format(" global key: %1$s, value: %2$s [%3$s]%n",
+ globalKey, globalValue, Integer.toHexString(System.identityHashCode(globalValue)));
}
}
}
@@ -130,14 +133,14 @@ public class BXMLSerializer implements S
private static final String ARGUMENTS_KEY = "arguments";
- public AttributeInvocationHandler(ScriptEngine scriptEngine, String event, String script) {
+ public AttributeInvocationHandler(final ScriptEngine scriptEngine, final String event, final String script) {
this.scriptEngine = scriptEngine;
this.event = event;
this.script = script;
}
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
Object result = null;
String methodName = method.getName();
@@ -169,11 +172,11 @@ public class BXMLSerializer implements S
private static class ElementInvocationHandler implements InvocationHandler {
private ScriptEngine scriptEngine;
- public ElementInvocationHandler(ScriptEngine scriptEngine) {
+ public ElementInvocationHandler(final ScriptEngine scriptEngine) {
this.scriptEngine = scriptEngine;
}
- private Object invokeMethod(String methodName, Object[] args) throws Throwable {
+ private Object invokeMethod(final String methodName, final Object[] args) throws Throwable {
Invocable invocable;
try {
invocable = (Invocable) scriptEngine;
@@ -185,7 +188,7 @@ public class BXMLSerializer implements S
}
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
Object result = null;
String methodName = method.getName();
@@ -227,12 +230,12 @@ public class BXMLSerializer implements S
private ScriptEngine scriptEngine;
private String functionName;
- public ScriptBindMapping(ScriptEngine scriptEngine, String functionName) {
+ public ScriptBindMapping(final ScriptEngine scriptEngine, final String functionName) {
this.scriptEngine = scriptEngine;
this.functionName = functionName;
}
- private Object invokeFunction(String functionName, Object value) {
+ private Object invokeFunction(final String functionName, final Object value) {
Invocable invocable;
try {
invocable = (Invocable) scriptEngine;
@@ -320,7 +323,8 @@ public class BXMLSerializer implements S
public static final String LANGUAGE_PROCESSING_INSTRUCTION = "language";
public static final String NASHORN_GLOBAL = "nashorn.global";
- public static final String NASHORN_COMPAT_SCRIPT = "if (typeof importClass != \"function\") { load(\"nashorn:mozilla_compat.js\"); }";
+ public static final String NASHORN_COMPAT_SCRIPT =
+ "if (typeof importClass != \"function\") { load(\"nashorn:mozilla_compat.js\"); }";
public static final String BXML_PREFIX = "bxml";
public static final String BXML_EXTENSION = "bxml";
@@ -360,7 +364,7 @@ public class BXMLSerializer implements S
fileExtensions.put(PropertiesSerializer.PROPERTIES_EXTENSION, PropertiesSerializer.MIME_TYPE);
}
- private ScriptEngine newEngineByName(String scriptLanguage) throws SerializationException {
+ private ScriptEngine newEngineByName(final String scriptLanguage) throws SerializationException {
ScriptEngine engine = scriptEngineManager.getEngineByName(scriptLanguage);
if (engine == null) {
@@ -394,8 +398,9 @@ public class BXMLSerializer implements S
* @param scriptLanguage Any script language name supported by the current JVM.
* @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).
+ * @throws SerializationException for problems finding the engine.
*/
- private ScriptEngine getEngineByName(String scriptLanguage) throws SerializationException {
+ private ScriptEngine getEngineByName(final String scriptLanguage) throws SerializationException {
String languageKey = scriptLanguage.toLowerCase();
ScriptEngine engine = scriptEngines.get(languageKey);
if (engine != null) {
@@ -429,8 +434,9 @@ public class BXMLSerializer implements S
* @param extension Any script language extension supported by the current JVM.
* @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).
+ * @throws SerializationException for problems finding the engine.
*/
- private ScriptEngine getEngineByExtension(String extension) throws SerializationException {
+ private ScriptEngine getEngineByExtension(final String extension) throws SerializationException {
String extensionKey = extension.toLowerCase();
ScriptEngine engine = scriptEnginesExts.get(extensionKey);
if (engine != null) {
@@ -490,7 +496,7 @@ public class BXMLSerializer implements S
* @return The deserialized object hierarchy.
*/
@Override
- public Object readObject(InputStream inputStream) throws IOException, SerializationException {
+ public Object readObject(final InputStream inputStream) throws IOException, SerializationException {
Utils.checkNull(inputStream, "inputStream");
root = null;
@@ -505,41 +511,30 @@ public class BXMLSerializer implements S
int event = xmlStreamReader.next();
switch (event) {
- case XMLStreamConstants.PROCESSING_INSTRUCTION: {
+ case XMLStreamConstants.PROCESSING_INSTRUCTION:
processProcessingInstruction();
break;
- }
- case XMLStreamConstants.CHARACTERS: {
+ case XMLStreamConstants.CHARACTERS:
processCharacters();
break;
- }
- case XMLStreamConstants.START_ELEMENT: {
+ case XMLStreamConstants.START_ELEMENT:
processStartElement();
break;
- }
- case XMLStreamConstants.END_ELEMENT: {
+ case XMLStreamConstants.END_ELEMENT:
processEndElement();
break;
- }
- default: {
+ default:
break;
- }
}
}
} catch (XMLStreamException exception) {
throw new SerializationException(exception);
}
- } catch (IOException exception) {
- logException(exception);
- throw exception;
- } catch (SerializationException exception) {
- logException(exception);
- throw exception;
- } catch (RuntimeException exception) {
+ } catch (IOException | SerializationException | RuntimeException exception) {
logException(exception);
throw exception;
}
@@ -561,42 +556,39 @@ public class BXMLSerializer implements S
bindMapping = new ScriptBindMapping(getEngineByName(language), bindFunction);
}
+ String targetPath;
+ NamespaceBinding namespaceBinding;
+
switch (elementLocal.type) {
case INSTANCE:
- case INCLUDE: {
+ case INCLUDE:
// Bind to <element ID>.<attribute name>
if (elementLocal.id == null) {
elementLocal.id = INTERNAL_ID_PREFIX + Integer.toString(nextID++);
namespace.put(elementLocal.id, elementLocal.value);
}
- String targetPath = elementLocal.id + "." + attribute.name;
- NamespaceBinding namespaceBinding = new NamespaceBinding(namespace, sourcePath,
- targetPath, bindMapping);
+ targetPath = elementLocal.id + "." + attribute.name;
+ namespaceBinding = new NamespaceBinding(namespace, sourcePath, targetPath, bindMapping);
namespaceBinding.bind();
break;
- }
- case READ_ONLY_PROPERTY: {
+ case READ_ONLY_PROPERTY:
// Bind to <parent element ID>.<element name>.<attribute name>
if (elementLocal.parent.id == null) {
elementLocal.parent.id = INTERNAL_ID_PREFIX + Integer.toString(nextID++);
namespace.put(elementLocal.parent.id, elementLocal.parent.value);
}
- String targetPath = elementLocal.parent.id + "." + elementLocal.name + "."
- + attribute.name;
- NamespaceBinding namespaceBinding = new NamespaceBinding(namespace, sourcePath,
- targetPath, bindMapping);
+ targetPath = elementLocal.parent.id + "." + elementLocal.name + "." + attribute.name;
+ namespaceBinding = new NamespaceBinding(namespace, sourcePath, targetPath, bindMapping);
namespaceBinding.bind();
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -630,7 +622,7 @@ public class BXMLSerializer implements S
* @throws SerializationException for any other errors encountered deserializing the resource.
* @see #readObject(Class, String, boolean)
*/
- public final Object readObject(Class<?> baseType, String resourceName)
+ public final Object readObject(final Class<?> baseType, final String resourceName)
throws IOException, SerializationException {
return readObject(baseType, resourceName, false);
}
@@ -655,7 +647,7 @@ public class BXMLSerializer implements S
* @throws SerializationException for any other errors encountered deserializing the resource.
* @see #readObject(URL, Resources)
*/
- public final Object readObject(Class<?> baseType, String resourceName, boolean localize)
+ public final Object readObject(final Class<?> baseType, final String resourceName, final boolean localize)
throws IOException, SerializationException {
Utils.checkNull(baseType, "baseType");
Utils.checkNull(resourceName, "resourceName");
@@ -681,7 +673,7 @@ public class BXMLSerializer implements S
* @throws SerializationException for any other errors encountered deserializing the resource.
* @see #readObject(URL, Resources)
*/
- public final Object readObject(URL locationArgument)
+ public final Object readObject(final URL locationArgument)
throws IOException, SerializationException {
return readObject(locationArgument, null);
}
@@ -697,7 +689,7 @@ public class BXMLSerializer implements S
* @throws SerializationException for any other errors encountered deserializing the resource.
* @see #readObject(InputStream)
*/
- public final Object readObject(URL locationArgument, Resources resourcesArgument)
+ public final Object readObject(final URL locationArgument, final Resources resourcesArgument)
throws IOException, SerializationException {
Utils.checkNull(locationArgument, "location");
@@ -735,7 +727,7 @@ public class BXMLSerializer implements S
String text = xmlStreamReader.getText();
switch (element.type) {
- case INSTANCE: {
+ case INSTANCE:
if (element.value instanceof Sequence<?>) {
Sequence<Object> sequence = (Sequence<Object>) element.value;
@@ -751,21 +743,17 @@ public class BXMLSerializer implements S
throw new SerializationException(exception);
}
}
-
break;
- }
case WRITABLE_PROPERTY:
case LISTENER_LIST_PROPERTY:
- case SCRIPT: {
+ case SCRIPT:
element.value = text;
break;
- }
- default: {
+ default:
throw new SerializationException("Unexpected characters in " + element.type
+ " element.");
- }
}
}
}
@@ -782,6 +770,7 @@ public class BXMLSerializer implements S
// Get element properties
String namespaceURI = xmlStreamReader.getNamespaceURI();
String prefix = xmlStreamReader.getPrefix();
+ String localName = xmlStreamReader.getLocalName();
// Some stream readers incorrectly report an empty string as the prefix
// for the default namespace
@@ -789,8 +778,6 @@ public class BXMLSerializer implements S
prefix = null;
}
- String localName = xmlStreamReader.getLocalName();
-
// Determine the type and value of this element
Element.Type elementType;
String name;
@@ -852,8 +839,7 @@ public class BXMLSerializer implements S
} else {
// The element represents a property
if (prefix != null) {
- throw new SerializationException(
- "Property elements cannot have a namespace prefix.");
+ throw new SerializationException("Property elements cannot have a namespace prefix.");
}
if (element.value instanceof Dictionary<?, ?>) {
@@ -928,8 +914,7 @@ public class BXMLSerializer implements S
}
if (mimeType == null) {
- throw new SerializationException("Cannot determine MIME type of include \"" + src
- + "\".");
+ throw new SerializationException("Cannot determine MIME type of include \"" + src + "\".");
}
boolean inline = false;
@@ -941,8 +926,7 @@ public class BXMLSerializer implements S
Class<? extends Serializer<?>> serializerClass = mimeTypes.get(mimeType);
if (serializerClass == null) {
- throw new SerializationException("No serializer associated with MIME type "
- + mimeType + ".");
+ throw new SerializationException("No serializer associated with MIME type " + mimeType + ".");
}
Serializer<?> serializer;
@@ -1020,18 +1004,15 @@ public class BXMLSerializer implements S
// The attribute represents an internal value
if (localName.equals(ID_ATTRIBUTE)) {
if (value.length() == 0 || value.contains(".")) {
- throw new IllegalArgumentException("\"" + value
- + "\" is not a valid ID value.");
+ throw new IllegalArgumentException("\"" + value + "\" is not a valid ID value.");
}
if (namespace.containsKey(value)) {
throw new SerializationException("ID " + value + " is already in use.");
}
- if (element.type != Element.Type.INSTANCE
- && element.type != Element.Type.INCLUDE) {
- throw new SerializationException(
- "An ID cannot be assigned to this element.");
+ if (element.type != Element.Type.INSTANCE && element.type != Element.Type.INCLUDE) {
+ throw new SerializationException("An ID cannot be assigned to this element.");
}
element.id = value;
@@ -1043,27 +1024,23 @@ public class BXMLSerializer implements S
boolean property = false;
switch (element.type) {
- case INCLUDE: {
+ case INCLUDE:
property = (localName.equals(INCLUDE_SRC_ATTRIBUTE)
|| localName.equals(INCLUDE_RESOURCES_ATTRIBUTE)
|| localName.equals(INCLUDE_MIME_TYPE_ATTRIBUTE)
|| localName.equals(INCLUDE_INLINE_ATTRIBUTE));
break;
- }
- case SCRIPT: {
+ case SCRIPT:
property = (localName.equals(SCRIPT_SRC_ATTRIBUTE));
break;
- }
- case REFERENCE: {
+ case REFERENCE:
property = (localName.equals(REFERENCE_ID_ATTRIBUTE));
break;
- }
- default: {
+ default:
break;
- }
}
if (property) {
@@ -1093,8 +1070,7 @@ public class BXMLSerializer implements S
name = localName;
}
- if (value.startsWith(NAMESPACE_BINDING_PREFIX)
- && value.endsWith(NAMESPACE_BINDING_SUFFIX)) {
+ if (value.startsWith(NAMESPACE_BINDING_PREFIX) && value.endsWith(NAMESPACE_BINDING_SUFFIX)) {
// The attribute represents a namespace binding
if (propertyClass != null) {
throw new SerializationException(
@@ -1158,7 +1134,8 @@ public class BXMLSerializer implements S
if (JSON.containsKey(namespace, value)) {
attribute.value = JSON.get(namespace, value);
} else {
- Object nashornGlobal = scriptEngineManager.getBindings().get(NASHORN_GLOBAL);
+ Object nashornGlobal =
+ scriptEngineManager.getBindings().get(NASHORN_GLOBAL);
if (nashornGlobal == null) {
throw new SerializationException("Value \"" + value
+ "\" is not defined.");
@@ -1196,15 +1173,17 @@ public class BXMLSerializer implements S
private void processEndElement() throws SerializationException {
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ Dictionary<String, Object> dictionary;
+ String script;
+ ScriptEngine scriptEngine;
switch (element.type) {
case INSTANCE:
case INCLUDE:
- case REFERENCE: {
+ case REFERENCE:
// Apply attributes
for (Attribute attribute : element.attributes) {
if (attribute.propertyClass == null) {
- Dictionary<String, Object> dictionary;
if (element.value instanceof Dictionary<?, ?>) {
dictionary = (Dictionary<String, Object>) element.value;
} else {
@@ -1309,10 +1288,8 @@ public class BXMLSerializer implements S
}
break;
- }
- case READ_ONLY_PROPERTY: {
- Dictionary<String, Object> dictionary;
+ case READ_ONLY_PROPERTY:
if (element.value instanceof Dictionary<?, ?>) {
dictionary = (Dictionary<String, Object>) element.value;
} else {
@@ -1330,11 +1307,9 @@ public class BXMLSerializer implements S
}
break;
- }
- case WRITABLE_PROPERTY: {
+ case WRITABLE_PROPERTY:
if (element.propertyClass == null) {
- Dictionary<String, Object> dictionary;
if (element.parent.value instanceof Dictionary) {
dictionary = (Dictionary<String, Object>) element.parent.value;
} else {
@@ -1356,14 +1331,13 @@ public class BXMLSerializer implements S
}
break;
- }
- case LISTENER_LIST_PROPERTY: {
+ case LISTENER_LIST_PROPERTY:
// Evaluate the script
- String script = (String) element.value;
+ script = (String) element.value;
// Get a new engine here in order to make the script function private to this object
- ScriptEngine scriptEngine = newEngineByName(language);
+ scriptEngine = newEngineByName(language);
// ORIGINAL COMMENT: Don't pollute the engine namespace with the listener functions
// Removed for Java 1.8+ because Nashorn handles globals differently
@@ -1405,9 +1379,8 @@ public class BXMLSerializer implements S
}
break;
- }
- case SCRIPT: {
+ case SCRIPT:
String src = null;
if (element.properties.containsKey(SCRIPT_SRC_ATTRIBUTE)) {
src = element.properties.get(SCRIPT_SRC_ATTRIBUTE);
@@ -1431,7 +1404,7 @@ public class BXMLSerializer implements S
}
String extension = src.substring(i + 1);
- ScriptEngine scriptEngine = getEngineByExtension(extension);
+ scriptEngine = getEngineByExtension(extension);
scriptEngine.setBindings(scriptEngineManager.getBindings(), ScriptContext.ENGINE_SCOPE);
@@ -1466,8 +1439,8 @@ public class BXMLSerializer implements S
if (element.value != null) {
// Evaluate the script
- String script = (String) element.value;
- ScriptEngine scriptEngine = getEngineByName(language);
+ script = (String) element.value;
+ scriptEngine = getEngineByName(language);
scriptEngine.setBindings(scriptEngineManager.getBindings(), ScriptContext.ENGINE_SCOPE);
@@ -1479,16 +1452,13 @@ public class BXMLSerializer implements S
}
}
break;
- }
- case DEFINE: {
+ case DEFINE:
// No-op
break;
- }
- default: {
+ default:
break;
- }
}
// Move up the stack
@@ -1510,7 +1480,7 @@ public class BXMLSerializer implements S
return xmlStreamReader.getLocation();
}
- private void logException(Throwable exception) {
+ private void logException(final Throwable exception) {
Location streamReaderlocation = xmlStreamReader.getLocation();
String message = "An error occurred at line number " + streamReaderlocation.getLineNumber();
@@ -1523,7 +1493,7 @@ public class BXMLSerializer implements S
reportException(new SerializationException(message, exception));
}
- private void reportException(ScriptException exception, String script) {
+ private void reportException(final ScriptException exception, final String script) {
reportException(new SerializationException("Failed to execute script:\n" + script, exception));
}
@@ -1533,7 +1503,7 @@ public class BXMLSerializer implements S
* print to <tt>System.err</tt>.
* @param exception Whatever exception has been thrown during processing.
*/
- protected void reportException(Throwable exception) {
+ protected void reportException(final Throwable exception) {
String message = exception.getLocalizedMessage();
if (Utils.isNullOrEmpty(message)) {
message = exception.getClass().getSimpleName();
@@ -1543,13 +1513,13 @@ public class BXMLSerializer implements S
}
@Override
- public void writeObject(Object object, OutputStream outputStream) throws IOException,
+ public void writeObject(final Object object, final OutputStream outputStream) throws IOException,
SerializationException {
throw new UnsupportedOperationException();
}
@Override
- public String getMIMEType(Object object) {
+ public String getMIMEType(final Object object) {
return MIME_TYPE;
}
@@ -1570,7 +1540,7 @@ public class BXMLSerializer implements S
}
@Override
- public void setNamespace(Map<String, Object> namespace) {
+ public void setNamespace(final Map<String, Object> namespace) {
Utils.checkNull(namespace, "namespace");
this.namespace = namespace;
@@ -1582,7 +1552,7 @@ public class BXMLSerializer implements S
}
@Override
- public void setLocation(URL location) {
+ public void setLocation(final URL location) {
this.location = location;
}
@@ -1592,7 +1562,7 @@ public class BXMLSerializer implements S
}
@Override
- public void setResources(Resources resources) {
+ public void setResources(final Resources resources) {
this.resources = resources;
}
@@ -1603,7 +1573,7 @@ public class BXMLSerializer implements S
* @throws BindException If an error occurs during binding.
* @see #bind(Object, Class)
*/
- public void bind(Object object) {
+ public void bind(final Object object) {
Utils.checkNull(object, "bind object");
bind(object, object.getClass());
@@ -1618,7 +1588,7 @@ public class BXMLSerializer implements S
* @param type The type of the object.
* @throws BindException If an error occurs during binding.
*/
- public void bind(Object object, Class<?> type) throws BindException {
+ public void bind(final Object object, final Class<?> type) throws BindException {
Utils.checkNull(object, "bind object");
Utils.checkNull(type, "bind type");
@@ -1676,12 +1646,11 @@ public class BXMLSerializer implements S
*
* @param type The type of serializer being requested.
* @return The new serializer to use.
- * @throws InstantiationException if an object of the given type cannot
- * be instantiated.
+ * @throws InstantiationException if an object of the given type cannot be instantiated.
* @throws IllegalAccessException if the class cannot be accessed in the
* current security environment.
*/
- protected Serializer<?> newIncludeSerializer(Class<? extends Serializer<?>> type)
+ protected Serializer<?> newIncludeSerializer(final Class<? extends Serializer<?>> type)
throws InstantiationException, IllegalAccessException {
return type.newInstance();
}
@@ -1694,12 +1663,11 @@ public class BXMLSerializer implements S
*
* @param type The type of object being requested.
* @return The newly created object.
- * @throws InstantiationException if an object of the given type cannot
- * be instantiated.
+ * @throws InstantiationException if an object of the given type cannot be instantiated.
* @throws IllegalAccessException if the class cannot be accessed in the
* current security environment.
*/
- protected Object newTypedObject(Class<?> type)
+ protected Object newTypedObject(final Class<?> type)
throws InstantiationException, IllegalAccessException {
return type.newInstance();
}
@@ -1752,8 +1720,8 @@ public class BXMLSerializer implements S
return mimeTypes;
}
- private static Method getStaticGetterMethod(Class<?> propertyClass, String propertyName,
- Class<?> objectType) {
+ private static Method getStaticGetterMethod(final Class<?> propertyClass, final String propertyName,
+ final Class<?> objectType) {
Method method = null;
if (objectType != null) {
@@ -1780,8 +1748,8 @@ public class BXMLSerializer implements S
return method;
}
- private static Method getStaticSetterMethod(Class<?> propertyClass, String propertyName,
- Class<?> objectType, Class<?> propertyValueType) {
+ private static Method getStaticSetterMethod(final Class<?> propertyClass, final String propertyName,
+ final Class<?> objectType, final Class<?> propertyValueType) {
Method method = null;
if (objectType != null) {
@@ -1801,8 +1769,7 @@ public class BXMLSerializer implements S
Class<?> primitivePropertyValueType = (Class<?>) primitiveTypeField.get(null);
try {
- method = propertyClass.getMethod(methodName, objectType,
- primitivePropertyValueType);
+ method = propertyClass.getMethod(methodName, objectType, primitivePropertyValueType);
} catch (NoSuchMethodException exception) {
// No-op
}
@@ -1822,7 +1789,7 @@ public class BXMLSerializer implements S
return method;
}
- private static void setStaticProperty(Object object, Class<?> propertyClass,
+ private static void setStaticProperty(final Object object, final Class<?> propertyClass,
final String propertyName, final Object value) throws SerializationException {
Class<?> objectType = object.getClass();
String propertyNameUpdated = Character.toUpperCase(propertyName.charAt(0))
@@ -1836,13 +1803,11 @@ public class BXMLSerializer implements S
}
if (setterMethod == null) {
- Method getterMethod = getStaticGetterMethod(propertyClass, propertyNameUpdated,
- objectType);
+ Method getterMethod = getStaticGetterMethod(propertyClass, propertyNameUpdated, objectType);
if (getterMethod != null) {
Class<?> propertyType = getterMethod.getReturnType();
- setterMethod = getStaticSetterMethod(propertyClass, propertyNameUpdated,
- objectType, propertyType);
+ setterMethod = getStaticSetterMethod(propertyClass, propertyNameUpdated, objectType, propertyType);
if (valueToAssign instanceof String) {
valueToAssign = BeanAdapter.coerce((String) valueToAssign, propertyType, propertyNameUpdated);
@@ -1870,7 +1835,7 @@ public class BXMLSerializer implements S
* or {@code null} to set the default, default value.
* @see #DEFAULT_LANGUAGE
*/
- protected void setDefaultLanguage(String defaultLanguage) {
+ protected void setDefaultLanguage(final String defaultLanguage) {
if (defaultLanguage == null) {
this.defaultLanguage = DEFAULT_LANGUAGE;
} else {
Modified: pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java Fri Aug 17 22:27:05 2018
@@ -142,7 +142,7 @@ public interface Sequence<T> {
/**
* Class representing an immutable path.
*/
- public static class ImmutablePath extends Path {
+ public static final class ImmutablePath extends Path {
public ImmutablePath(final Integer... elements) {
super(elements);
}
Modified: pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java Fri Aug 17 22:27:05 2018
@@ -17,6 +17,7 @@
package org.apache.pivot.collections.adapter;
import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
@@ -34,6 +35,7 @@ import org.apache.pivot.util.Utils;
/**
* Implementation of the {@link List} interface that is backed by an instance of
* {@link java.util.List}.
+ * @param <T> Type of elements in the list.
*/
public class ListAdapter<T> implements List<T>, Serializable {
private static final long serialVersionUID = 1649736907064653706L;
@@ -43,14 +45,14 @@ public class ListAdapter<T> implements L
private transient ListListenerList<T> listListeners = new ListListenerList<>();
- public ListAdapter(java.util.List<T> list) {
+ public ListAdapter(final java.util.List<T> list) {
Utils.checkNull(list, "list");
this.list = list;
}
@SuppressWarnings("unchecked")
- public ListAdapter(T... a) {
+ public ListAdapter(final T... a) {
this.list = Arrays.asList(a);
}
@@ -59,7 +61,7 @@ public class ListAdapter<T> implements L
}
@Override
- public int add(T item) {
+ public int add(final T item) {
int index = -1;
if (comparator == null) {
@@ -79,7 +81,7 @@ public class ListAdapter<T> implements L
}
@Override
- public void insert(T item, int index) {
+ public void insert(final T item, final int index) {
if (comparator != null && Collections.binarySearch(list, item, comparator) != -(index + 1)) {
throw new IllegalArgumentException(
"Given insertion point " + index + " does not match the sorted insertion location.");
@@ -90,7 +92,7 @@ public class ListAdapter<T> implements L
}
@Override
- public T update(int index, T item) {
+ public T update(final int index, final T item) {
if (comparator != null) {
// Ensure that the new item is greater or equal to its
// predecessor and less than or equal to its successor
@@ -127,7 +129,8 @@ public class ListAdapter<T> implements L
if ((predecessor != null && comparator.compare(item, predecessor) < 0)
|| (successor != null && comparator.compare(item, successor) > 0)) {
- throw new IllegalArgumentException("Updated item at index " + index + " is not in correct sorted order.");
+ throw new IllegalArgumentException("Updated item at index " + index
+ + " is not in correct sorted order.");
}
}
@@ -160,7 +163,7 @@ public class ListAdapter<T> implements L
}
@Override
- public int remove(T item) {
+ public int remove(final T item) {
int index = indexOf(item);
if (index != -1) {
remove(index, 1);
@@ -171,13 +174,13 @@ public class ListAdapter<T> implements L
@SuppressWarnings("unchecked")
@Override
- public Sequence<T> remove(int index, int count) {
+ public Sequence<T> remove(final int index, final int count) {
java.util.List<T> removedList = null;
try {
- removedList = list.getClass().newInstance();
- } catch (IllegalAccessException exception) {
+ removedList = list.getClass().getDeclaredConstructor().newInstance();
+ } catch (IllegalAccessException | InstantiationException exception) {
throw new RuntimeException(exception);
- } catch (InstantiationException exception) {
+ } catch (NoSuchMethodException | InvocationTargetException exception) {
throw new RuntimeException(exception);
}
@@ -203,12 +206,12 @@ public class ListAdapter<T> implements L
}
@Override
- public T get(int index) {
+ public T get(final int index) {
return list.get(index);
}
@Override
- public int indexOf(T item) {
+ public int indexOf(final T item) {
return list.indexOf(item);
}
@@ -228,7 +231,7 @@ public class ListAdapter<T> implements L
}
@Override
- public void setComparator(Comparator<T> comparator) {
+ public void setComparator(final Comparator<T> comparator) {
Comparator<T> previousComparator = this.comparator;
if (previousComparator != comparator) {
Modified: pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableList.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableList.java Fri Aug 17 22:27:05 2018
@@ -28,6 +28,7 @@ import org.apache.pivot.util.Utils;
/**
* Unmodifiable implementation of the {@link List} interface.
+ * @param <T> Type of elements in this list.
*/
public final class ImmutableList<T> implements List<T> {
private List<T> list = null;
@@ -36,34 +37,34 @@ public final class ImmutableList<T> impl
private static final String ERROR_MSG = "Immutable list cannot be modified.";
- public ImmutableList(List<T> list) {
+ public ImmutableList(final List<T> list) {
Utils.checkNull(list, "list");
this.list = list;
}
@Override
- public int add(T item) {
+ public int add(final T item) {
throw new UnsupportedOperationException(ERROR_MSG);
}
@Override
- public void insert(T item, int index) {
+ public void insert(final T item, final int index) {
throw new UnsupportedOperationException(ERROR_MSG);
}
@Override
- public T update(int index, T item) {
+ public T update(final int index, final T item) {
throw new UnsupportedOperationException(ERROR_MSG);
}
@Override
- public int remove(T item) {
+ public int remove(final T item) {
throw new UnsupportedOperationException(ERROR_MSG);
}
@Override
- public Sequence<T> remove(int index, int count) {
+ public Sequence<T> remove(final int index, final int count) {
throw new UnsupportedOperationException(ERROR_MSG);
}
@@ -73,12 +74,12 @@ public final class ImmutableList<T> impl
}
@Override
- public T get(int index) {
+ public T get(final int index) {
return list.get(index);
}
@Override
- public int indexOf(T item) {
+ public int indexOf(final T item) {
return list.indexOf(item);
}
@@ -98,7 +99,7 @@ public final class ImmutableList<T> impl
}
@Override
- public void setComparator(Comparator<T> comparator) {
+ public void setComparator(final Comparator<T> comparator) {
throw new UnsupportedOperationException(ERROR_MSG);
}
Modified: pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java Fri Aug 17 22:27:05 2018
@@ -27,30 +27,32 @@ import org.apache.pivot.util.Utils;
/**
* Unmodifiable implementation of the {@link Map} interface.
+ * @param <K> Key type for the elements of this map.
+ * @param <V> Value type for the map elements.
*/
-public class ImmutableMap<K, V> implements Map<K, V> {
+public final class ImmutableMap<K, V> implements Map<K, V> {
private Map<K, V> map = null;
private MapListener.Listeners<K, V> mapListeners = new MapListener.Listeners<>();
- public ImmutableMap(Map<K, V> map) {
+ public ImmutableMap(final Map<K, V> map) {
Utils.checkNull(map, "map");
this.map = map;
}
@Override
- public V get(K key) {
+ public V get(final K key) {
return map.get(key);
}
@Override
- public V put(K key, V value) {
+ public V put(final K key, final V value) {
throw new UnsupportedOperationException();
}
@Override
- public V remove(K key) {
+ public V remove(final K key) {
throw new UnsupportedOperationException();
}
@@ -60,7 +62,7 @@ public class ImmutableMap<K, V> implemen
}
@Override
- public boolean containsKey(K key) {
+ public boolean containsKey(final K key) {
return map.containsKey(key);
}
@@ -80,7 +82,7 @@ public class ImmutableMap<K, V> implemen
}
@Override
- public void setComparator(Comparator<K> comparator) {
+ public void setComparator(final Comparator<K> comparator) {
throw new UnsupportedOperationException();
}
Modified: pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java Fri Aug 17 22:27:05 2018
@@ -27,25 +27,26 @@ import org.apache.pivot.util.Utils;
/**
* Unmodifiable implementation of the {@link Set} interface.
+ * @param <E> Type of elements in this set.
*/
-public class ImmutableSet<E> implements Set<E> {
+public final class ImmutableSet<E> implements Set<E> {
private Set<E> set = null;
private SetListener.Listeners<E> setListeners = new SetListener.Listeners<>();
- public ImmutableSet(Set<E> set) {
+ public ImmutableSet(final Set<E> set) {
Utils.checkNull(set, "set");
this.set = set;
}
@Override
- public boolean add(E element) {
+ public boolean add(final E element) {
throw new UnsupportedOperationException();
}
@Override
- public boolean remove(E element) {
+ public boolean remove(final E element) {
throw new UnsupportedOperationException();
}
@@ -55,7 +56,7 @@ public class ImmutableSet<E> implements
}
@Override
- public boolean contains(E element) {
+ public boolean contains(final E element) {
return set.contains(element);
}
@@ -75,7 +76,7 @@ public class ImmutableSet<E> implements
}
@Override
- public void setComparator(Comparator<E> comparator) {
+ public void setComparator(final Comparator<E> comparator) {
throw new UnsupportedOperationException();
}
Modified: pivot/trunk/core/src/org/apache/pivot/text/AttributedStringCharacterIterator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/text/AttributedStringCharacterIterator.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/text/AttributedStringCharacterIterator.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/text/AttributedStringCharacterIterator.java Fri Aug 17 22:27:05 2018
@@ -82,7 +82,8 @@ public class AttributedStringCharacterIt
this.attributes = attributes;
}
- public AttributedStringCharacterIterator(String text, int beginIndex, int endIndex, AttributedCharacterIterator.Attribute[] attributes) {
+ public AttributedStringCharacterIterator(String text, int beginIndex, int endIndex,
+ AttributedCharacterIterator.Attribute[] attributes) {
Utils.checkNull(text, "text");
this.storage = new AttributedString(text.substring(beginIndex, endIndex));
this.length = endIndex - beginIndex;
Modified: pivot/trunk/core/src/org/apache/pivot/util/CharUtils.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/CharUtils.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/CharUtils.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/CharUtils.java Fri Aug 17 22:27:05 2018
@@ -21,7 +21,7 @@ import org.apache.pivot.text.CharSpan;
/**
* A set of static methods that perform various character-based operations.
*/
-public class CharUtils {
+public final class CharUtils {
/**
* Private constructor for a utility class.
*/
Modified: pivot/trunk/core/src/org/apache/pivot/util/ImageUtils.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/ImageUtils.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/ImageUtils.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/ImageUtils.java Fri Aug 17 22:27:05 2018
@@ -21,7 +21,7 @@ import java.net.URL;
/**
* Utility class for dealing with images.
*/
-public class ImageUtils {
+public final class ImageUtils {
/**
* Private constructor for a utility class.
*/
Modified: pivot/trunk/core/src/org/apache/pivot/util/ImmutableIterator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/ImmutableIterator.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/ImmutableIterator.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/ImmutableIterator.java Fri Aug 17 22:27:05 2018
@@ -26,19 +26,18 @@ import java.util.Iterator;
* <p>Note: the <tt>remove()</tt> method implementation here has
* been taken out because there is now a default implementation
* in the {@link Iterator} interface itself in Java 8.
+ * @param <T> The type of elements we are iterating over.
*/
-public class ImmutableIterator<T> implements Iterator<T> {
+public final class ImmutableIterator<T> implements Iterator<T> {
private Iterator<T> iterator;
/**
- * Construct an immutable iterator over the base iterator
- * given here.
+ * Construct an immutable iterator over the base iterator given here.
*
- * @param iterator The base iterator we want to protect
- * from change.
+ * @param iterator The base iterator we want to protect from change.
* @throws IllegalArgumentException if the iterator is <tt>null</tt>.
*/
- public ImmutableIterator(Iterator<T> iterator) {
+ public ImmutableIterator(final Iterator<T> iterator) {
Utils.checkNull(iterator, "iterator");
this.iterator = iterator;
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=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Utils.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Utils.java Fri Aug 17 22:27:05 2018
@@ -19,7 +19,7 @@ package org.apache.pivot.util;
/**
* Utility methods for other parts of the code.
*/
-public class Utils {
+public final class Utils {
/**
* Non-public constructor for a utility class.
*/
Modified: pivot/trunk/core/test/org/apache/pivot/util/test/CharUtilsTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/util/test/CharUtilsTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/util/test/CharUtilsTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/util/test/CharUtilsTest.java Fri Aug 17 22:27:05 2018
@@ -28,7 +28,9 @@ import org.apache.pivot.util.CharUtils;
* Test the word selection and navigation methods in {@link CharUtils}.
*/
public class CharUtilsTest {
- private static final String TEST_STRING = "A successful man is one who can lay a firm foundation with the bricks others have thrown at him. -David Brinkley\n";
+ private static final String TEST_STRING =
+ "A successful man is one who can lay a firm foundation with the bricks others have thrown at him."
+ + " -David Brinkley\n";
@Test
public void testSelectWord() {
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/CurrencyValidator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/CurrencyValidator.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/CurrencyValidator.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/CurrencyValidator.java Fri Aug 17 22:27:05 2018
@@ -25,21 +25,22 @@ import org.apache.pivot.wtk.validation.V
/**
* Validates that text represents a valid dollar value.
*/
-public class CurrencyValidator implements Validator {
+public final class CurrencyValidator implements Validator {
protected static final DecimalFormat FORMAT = new DecimalFormat("0.00");
static {
FORMAT.setParseBigDecimal(true);
}
@Override
- public boolean isValid(String text) {
+ public boolean isValid(final String text) {
boolean valid = true;
if (text.length() > 0) {
ParsePosition parsePosition = new ParsePosition(0);
BigDecimal numericAmount = (BigDecimal) FORMAT.parse(text, parsePosition);
valid = (numericAmount != null && numericAmount.scale() <= 2
- && numericAmount.signum() >= 0 && parsePosition.getErrorIndex() == -1 && parsePosition.getIndex() == text.length());
+ && numericAmount.signum() >= 0 && parsePosition.getErrorIndex() == -1
+ && parsePosition.getIndex() == text.length());
}
return valid;
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=1838293&r1=1838292&r2=1838293&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 Fri Aug 17 22:27:05 2018
@@ -115,7 +115,8 @@ public class ColorSchemeBuilderWindow ex
row.add(colorBoxPane);
// Add listeners
- ColorChooserButtonSelectionListener colorChooserButtonSelectionListener = new ColorChooserButtonSelectionListener() {
+ ColorChooserButtonSelectionListener colorChooserButtonSelectionListener =
+ new ColorChooserButtonSelectionListener() {
@Override
public void selectedColorChanged(ColorChooserButton colorChooserButtonArgument,
Color previousSelectedColor) {
Modified: pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotApplicationLaunchShortcut.java
URL: http://svn.apache.org/viewvc/pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotApplicationLaunchShortcut.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotApplicationLaunchShortcut.java (original)
+++ pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotApplicationLaunchShortcut.java Fri Aug 17 22:27:05 2018
@@ -64,7 +64,8 @@ public class PivotApplicationLaunchShort
private void launch(Object element, String mode) {
if (element instanceof IAdaptable) {
- ICompilationUnit compilationUnit = (ICompilationUnit) ((IAdaptable) element).getAdapter(ICompilationUnit.class);
+ ICompilationUnit compilationUnit = (ICompilationUnit)
+ ((IAdaptable) element).getAdapter(ICompilationUnit.class);
if (compilationUnit != null) {
IType type = compilationUnit.findPrimaryType();
@@ -83,15 +84,16 @@ public class PivotApplicationLaunchShort
private ILaunchConfiguration getExistingLaunchConfiguration(IType type) {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
+ ILaunchConfigurationType launchConfigurationType =
+ launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
ILaunchConfiguration existingLaunchConfiguration = null;
try {
String applicationProjectName = type.getJavaProject().getElementName();
String applicationTypeName = type.getFullyQualifiedName();
- ILaunchConfiguration[] launchConfigurations = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(
- launchConfigurationType);
+ ILaunchConfiguration[] launchConfigurations =
+ DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(launchConfigurationType);
for (int i = 0; i < launchConfigurations.length; i++) {
ILaunchConfiguration launchConfiguration = launchConfigurations[i];
@@ -126,7 +128,8 @@ public class PivotApplicationLaunchShort
String applicationTypeName = type.getFullyQualifiedName();
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType configurationType = launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
+ ILaunchConfigurationType configurationType =
+ launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
String name = launchManager.generateUniqueLaunchConfigurationNameFrom(type.getElementName());
ILaunchConfigurationWorkingCopy workingLaunchConfiguration = configurationType.newInstance(
Modified: pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotScriptApplicationLaunchShortcut.java
URL: http://svn.apache.org/viewvc/pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotScriptApplicationLaunchShortcut.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotScriptApplicationLaunchShortcut.java (original)
+++ pivot/trunk/eclipse/src/org/apache/pivot/eclipse/PivotScriptApplicationLaunchShortcut.java Fri Aug 17 22:27:05 2018
@@ -79,14 +79,15 @@ public class PivotScriptApplicationLaunc
private ILaunchConfiguration getExistingLaunchConfiguration(IFile file) {
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
+ ILaunchConfigurationType launchConfigurationType =
+ launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
ILaunchConfiguration existingLaunchConfiguration = null;
try {
String fileProjectName = file.getProject().getName();
- ILaunchConfiguration[] launchConfigurations = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(
- launchConfigurationType);
+ ILaunchConfiguration[] launchConfigurations =
+ DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(launchConfigurationType);
for (int i = 0; i < launchConfigurations.length; i++) {
ILaunchConfiguration launchConfiguration = launchConfigurations[i];
@@ -121,7 +122,8 @@ public class PivotScriptApplicationLaunc
String fileName = file.getName();
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfigurationType configurationType = launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
+ ILaunchConfigurationType configurationType =
+ launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
String name = launchManager.generateUniqueLaunchConfigurationNameFrom(fileName);
ILaunchConfigurationWorkingCopy workingLaunchConfiguration = configurationType.newInstance(
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationWithPropertiesTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationWithPropertiesTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationWithPropertiesTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationWithPropertiesTest.java Fri Aug 17 22:27:05 2018
@@ -91,11 +91,13 @@ public class ApplicationWithPropertiesTe
System.out.println("application instance = " + application);
application.getProperties().put(SAMPLE_PROP_KEY, sample);
- System.out.println("application sample external property \"" + SAMPLE_PROP_KEY + "\" = \""
- + application.getProperties().get(SAMPLE_PROP_KEY) + "\"");
+ System.out.println("application sample external property \""
+ + SAMPLE_PROP_KEY + "\" = \""
+ + application.getProperties().get(SAMPLE_PROP_KEY) + "\"");
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
application.getProperties().put(SAMPLE_CLASSLOADER_PROP_KEY, classLoader);
- System.out.println("application sample external classloader property \"" + SAMPLE_CLASSLOADER_PROP_KEY + "\" = \""
+ System.out.println("application sample external classloader property \""
+ + SAMPLE_CLASSLOADER_PROP_KEY + "\" = \""
+ application.getProperties().get(SAMPLE_CLASSLOADER_PROP_KEY) + "\"");
System.out.println("Executing application ...");
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java Fri Aug 17 22:27:05 2018
@@ -24,7 +24,9 @@ public class BXMLDictionaryTest {
public static void main(String[] args) throws Exception {
BXMLSerializer bxmlSerializer = new BXMLSerializer();
@SuppressWarnings("unchecked")
- HashMap<String, Object> hashMap = (HashMap<String, Object>) bxmlSerializer.readObject(BXMLDictionaryTest.class.getResource("bxml_dictionary_test.bxml"));
+ HashMap<String, Object> hashMap =
+ (HashMap<String, Object>) bxmlSerializer.readObject(
+ BXMLDictionaryTest.class.getResource("bxml_dictionary_test.bxml"));
System.out.println(JSONSerializer.toString(hashMap));
}
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java Fri Aug 17 22:27:05 2018
@@ -77,7 +77,8 @@ public class FileBrowserWithCharsetTest
lb.getListButtonSelectionListeners().add(new ListButtonSelectionListener() {
@Override
public void selectedItemChanged(ListButton listButton, Object previousSelectedItem) {
- System.out.println(listButton.toString() + "; New character set selection: " + listButton.getSelectedItem());
+ System.out.println(listButton.toString() + "; New character set selection: "
+ + listButton.getSelectedItem());
}
});
box.add(lb);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/LabelAntialiasTest.java Fri Aug 17 22:27:05 2018
@@ -38,13 +38,13 @@ import org.apache.pivot.wtk.VerticalAlig
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.content.NumericSpinnerData;
-public class LabelAntialiasTest implements Application {
+public final class LabelAntialiasTest implements Application {
private Window window = null;
private TablePane.Row labelRow = null;
private Spinner rotationAngleSpinner = null;
private int currentRotationAngle = 0;
- private Label buildLabel(double rotation) {
+ private Label buildLabel(final double rotation) {
Label label = new Label();
Font font = new Font("Arial", Font.BOLD, 64);
@@ -72,7 +72,8 @@ public class LabelAntialiasTest implemen
System.out.println("Show Font Desktop Hints:");
Toolkit toolkit = Toolkit.getDefaultToolkit();
- java.util.Map<?, ?> fontDesktopHints = (java.util.Map<?, ?>) toolkit.getDesktopProperty("awt.font.desktophints");
+ java.util.Map<?, ?> fontDesktopHints =
+ (java.util.Map<?, ?>) toolkit.getDesktopProperty("awt.font.desktophints");
System.out.println(fontDesktopHints);
}
@@ -97,7 +98,7 @@ public class LabelAntialiasTest implemen
}
@Override
- public void startup(Display display, Map<String, String> properties) {
+ public void startup(final Display display, final Map<String, String> properties) {
window = new Window();
showFontDesktopHints();
@@ -123,7 +124,7 @@ public class LabelAntialiasTest implemen
rotationAngleSpinner.getSpinnerSelectionListeners().add(new SpinnerSelectionListener() {
@Override
- public void selectedItemChanged(Spinner spinner, Object previousSelectedItem) {
+ public void selectedItemChanged(final Spinner spinner, final Object previousSelectedItem) {
currentRotationAngle = (Integer) spinner.getSelectedItem();
if (labelRow.getLength() > 0) {
labelRow.remove(0, labelRow.getLength());
@@ -137,7 +138,7 @@ public class LabelAntialiasTest implemen
}
@Override
- public boolean shutdown(boolean optional) {
+ public boolean shutdown(final boolean optional) {
if (window != null) {
window.close();
}
@@ -145,7 +146,7 @@ public class LabelAntialiasTest implemen
return false;
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
DesktopApplicationContext.main(LabelAntialiasTest.class, args);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java Fri Aug 17 22:27:05 2018
@@ -42,13 +42,18 @@ import org.apache.pivot.wtk.WindowStateL
import org.apache.pivot.wtk.media.Image;
import org.apache.pivot.wtk.media.Picture;
-public class SheetTest implements Application {
+public final class SheetTest implements Application {
private Frame frame = null;
private Sheet sheet = null;
+ private static final String LICENSE_TEXT =
+ "Unless required by applicable law or agreed to in writing, software distributed under the License "
+ + "is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express "
+ + "or implied.";
+
@SuppressWarnings("unused")
@Override
- public void startup(final Display display, Map<String, String> properties) throws Exception {
+ public void startup(final Display display, final Map<String, String> properties) throws Exception {
Picture picture = (Picture) Image.load(getClass().getResource("IMG_0767_2.jpg"));
picture.resample(120);
@@ -76,29 +81,26 @@ public class SheetTest implements Applic
row0.add(sheetContent);
- Label promptBody = new Label(
- "Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.");
+ Label promptBody = new Label(LICENSE_TEXT);
promptBody.getStyles().put(Style.wrapText, true);
- final Prompt prompt = new Prompt(MessageType.INFO, "Prompt", new ArrayList<>("OK"),
- promptBody);
+ final Prompt prompt = new Prompt(MessageType.INFO, "Prompt", new ArrayList<>("OK"), promptBody);
prompt.setTitle("Prompt");
prompt.getStyles().put(Style.resizable, true);
prompt.getComponentMouseListeners().add(new ComponentMouseListener() {
@Override
- public void mouseOver(Component component) {
+ public void mouseOver(final Component component) {
System.out.println("Mouse Over");
}
@Override
- public void mouseOut(Component component) {
+ public void mouseOut(final Component component) {
System.out.println("Mouse out");
}
});
- Label alertBody = new Label(
- "Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.");
+ Label alertBody = new Label(LICENSE_TEXT);
alertBody.getStyles().put(Style.wrapText, true);
final Alert alert = new Alert(MessageType.INFO, "Alert", new ArrayList<>("OK"), alertBody);
@@ -117,14 +119,14 @@ public class SheetTest implements Applic
closeButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
- public void buttonPressed(Button buttonArgument) {
+ public void buttonPressed(final Button buttonArgument) {
buttonArgument.getWindow().close();
}
});
button.getButtonPressListeners().add(new ButtonPressListener() {
@Override
- public void buttonPressed(Button buttonArgument) {
+ public void buttonPressed(final Button buttonArgument) {
prompt.open(frame);
Display displayLocal = DesktopApplicationContext.createDisplay(640, 480, 100, 100,
@@ -140,7 +142,7 @@ public class SheetTest implements Applic
sheet.getWindowStateListeners().add(new WindowStateListener() {
@Override
- public void windowOpened(Window window) {
+ public void windowOpened(final Window window) {
closeButton.requestFocus();
}
});
@@ -149,7 +151,7 @@ public class SheetTest implements Applic
}
@Override
- public boolean shutdown(boolean optional) {
+ public boolean shutdown(final boolean optional) {
if (frame != null) {
frame.close();
}
@@ -157,7 +159,7 @@ public class SheetTest implements Applic
return false;
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
DesktopApplicationContext.main(SheetTest.class, args);
}
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TextAreaConsoleTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TextAreaConsoleTest.java?rev=1838293&r1=1838292&r2=1838293&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TextAreaConsoleTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TextAreaConsoleTest.java Fri Aug 17 22:27:05 2018
@@ -48,7 +48,8 @@ public class TextAreaConsoleTest impleme
throw new RuntimeException(ex);
}
console = new Console(new TextAreaOutputStream(consoleArea).toPrintStream());
- logMessageButton.getButtonPressListeners().add((button) -> console.log(String.format("%1$d. Hello, World!", line++)));
+ logMessageButton.getButtonPressListeners().add(
+ (button) -> console.log(String.format("%1$d. Hello, World!", line++)));
window.open(display);
}