You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/02/21 18:32:39 UTC
svn commit: r1448732 - in /pivot/branches/2.0.x:
core/src/org/apache/pivot/beans/ core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/io/ core/src/org/apache/pivot/json/
core/src/org/apache/pivot/serialization/ core/src/org/apache/pivot/te...
Author: smartini
Date: Thu Feb 21 17:32:38 2013
New Revision: 1448732
URL: http://svn.apache.org/r1448732
Log:
fix many eclipse (4.2.x) warnings, enforcing best practice coding
Modified:
pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BXMLSerializer.java
pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java
pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayList.java
pivot/branches/2.0.x/core/src/org/apache/pivot/collections/Sequence.java
pivot/branches/2.0.x/core/src/org/apache/pivot/io/IOTask.java
pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSONSerializer.java
pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/CSVSerializer.java
pivot/branches/2.0.x/core/src/org/apache/pivot/text/CharSequenceCharacterIterator.java
pivot/branches/2.0.x/core/src/org/apache/pivot/xml/XMLSerializer.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/DataBindingTest.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/JavascriptConsoleTest.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/Pivot861.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/TestDialog.java
pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java
pivot/branches/2.0.x/web/src/org/apache/pivot/web/Query.java
pivot/branches/2.0.x/web/src/org/apache/pivot/web/QueryDictionary.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ImageView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TreeView.java
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BXMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BXMLSerializer.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BXMLSerializer.java Thu Feb 21 17:32:38 2013
@@ -204,7 +204,8 @@ public class BXMLSerializer implements S
}
@Override
- public Object evaluate(Object value) {
+ public Object evaluate(final Object value) {
+ Object result = value;
Bindings bindings = scriptEngine.getBindings(ScriptContext.GLOBAL_SCOPE);
if (bindings.containsKey(functionName)) {
Invocable invocable;
@@ -215,7 +216,7 @@ public class BXMLSerializer implements S
}
try {
- value = invocable.invokeFunction(functionName, value);
+ result = invocable.invokeFunction(functionName, result);
} catch (NoSuchMethodException exception) {
throw new RuntimeException(exception);
} catch (ScriptException exception) {
@@ -225,7 +226,7 @@ public class BXMLSerializer implements S
throw new RuntimeException("Mapping function \"" + functionName + "\" is not defined.");
}
- return value;
+ return result;
}
}
@@ -393,7 +394,7 @@ public class BXMLSerializer implements S
/** DO NOT USE. see https://issues.apache.org/jira/browse/PIVOT-742 */
@Deprecated
- public BXMLSerializer(final ClassLoader classLoader) {
+ public BXMLSerializer(@SuppressWarnings("unused") final ClassLoader classLoader) {
throw new UnsupportedOperationException("https://issues.apache.org/jira/browse/PIVOT-742");
}
@@ -447,6 +448,10 @@ public class BXMLSerializer implements S
processEndElement();
break;
}
+
+ default: {
+ break;
+ }
}
}
} catch (XMLStreamException exception) {
@@ -1393,6 +1398,11 @@ public class BXMLSerializer implements S
case DEFINE: {
// No-op
+ break;
+ }
+
+ default: {
+ break;
}
}
@@ -1706,34 +1716,38 @@ public class BXMLSerializer implements S
}
private static void setStaticProperty(Object object, Class<?> propertyClass,
- String propertyName, Object value)
+ final String propertyName, final Object value)
throws SerializationException {
Class<?> objectType = object.getClass();
- propertyName = Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
+ String propertyNameUpdated =
+ Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);
+ Object valueToAssign = value;
Method setterMethod = null;
- if (value != null) {
- setterMethod = getStaticSetterMethod(propertyClass, propertyName,
- objectType, value.getClass());
+ if (valueToAssign != null) {
+ setterMethod = getStaticSetterMethod(propertyClass, propertyNameUpdated,
+ objectType, valueToAssign.getClass());
}
if (setterMethod == null) {
- Method getterMethod = getStaticGetterMethod(propertyClass, propertyName, objectType);
+ Method getterMethod = getStaticGetterMethod(propertyClass, propertyNameUpdated, objectType);
if (getterMethod != null) {
Class<?> propertyType = getterMethod.getReturnType();
- setterMethod = getStaticSetterMethod(propertyClass, propertyName,
+ setterMethod = getStaticSetterMethod(propertyClass, propertyNameUpdated,
objectType, propertyType);
- if (value instanceof String) {
- value = BeanAdapter.coerce((String)value, propertyType);
+ if (valueToAssign instanceof String) {
+ valueToAssign = BeanAdapter.coerce((String)valueToAssign, propertyType);
}
}
}
if (setterMethod == null) {
- throw new SerializationException(propertyClass.getName() + "." + propertyName
- + " is not valid static property.");
+ throw new SerializationException(propertyClass.getName()
+ + "." + propertyNameUpdated
+ + " is not valid static property."
+ );
}
// Invoke the setter
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/beans/BeanAdapter.java Thu Feb 21 17:32:38 2013
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.Locale;
import java.util.NoSuchElementException;
-import org.apache.pivot.beans.PropertyNotFoundException;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.MapListener;
import org.apache.pivot.util.ListenerList;
@@ -278,7 +277,7 @@ public class BeanAdapter implements Map<
* If the given property does not exist or is read-only.
*/
@Override
- public Object put(String key, Object value) {
+ public Object put(final String key, final Object value) {
if (key == null) {
throw new IllegalArgumentException("key is null.");
}
@@ -288,10 +287,11 @@ public class BeanAdapter implements Map<
}
Method setterMethod = null;
+ Object valueUpdated = value;
- if (value != null) {
+ if (valueUpdated != null) {
// Get the setter method for the value type
- setterMethod = getSetterMethod(key, value.getClass());
+ setterMethod = getSetterMethod(key, valueUpdated.getClass());
}
if (setterMethod == null) {
@@ -300,7 +300,7 @@ public class BeanAdapter implements Map<
if (propertyType != null) {
setterMethod = getSetterMethod(key, propertyType);
- value = coerce(value, propertyType);
+ valueUpdated = coerce(valueUpdated, propertyType);
}
}
@@ -313,28 +313,28 @@ public class BeanAdapter implements Map<
}
Class<?> fieldType = field.getType();
- if (value != null) {
- Class<?> valueType = value.getClass();
+ if (valueUpdated != null) {
+ Class<?> valueType = valueUpdated.getClass();
if (!fieldType.isAssignableFrom(valueType)) {
- value = coerce(value, fieldType);
+ valueUpdated = coerce(valueUpdated, fieldType);
}
}
try {
- field.set(bean, value);
+ field.set(bean, valueUpdated);
} catch (IllegalAccessException exception) {
throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
}
} else {
try {
- setterMethod.invoke(bean, new Object[] {value});
+ setterMethod.invoke(bean, new Object[] {valueUpdated});
} catch (IllegalAccessException exception) {
throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
key, bean.getClass().getName()), exception);
} catch (InvocationTargetException exception) {
throw new RuntimeException(String.format("Error setting property \"%s\" for type %s to value \"%s\"",
- key, bean.getClass().getName(), "" + value), exception.getCause());
+ key, bean.getClass().getName(), "" + valueUpdated), exception.getCause());
}
}
@@ -765,7 +765,7 @@ public class BeanAdapter implements Map<
* @return
* The getter method, or <tt>null</tt> if the method does not exist.
*/
- public static Method getGetterMethod(Class<?> beanClass, String key) {
+ public static Method getGetterMethod(final Class<?> beanClass, final String key) {
if (beanClass == null) {
throw new IllegalArgumentException("beanClass is null.");
}
@@ -779,18 +779,18 @@ public class BeanAdapter implements Map<
}
// Upper-case the first letter
- key = Character.toUpperCase(key.charAt(0)) + key.substring(1);
+ String keyUpdated = Character.toUpperCase(key.charAt(0)) + key.substring(1);
Method getterMethod = null;
try {
- getterMethod = beanClass.getMethod(GET_PREFIX + key);
+ getterMethod = beanClass.getMethod(GET_PREFIX + keyUpdated);
} catch (NoSuchMethodException exception) {
// No-op
}
if (getterMethod == null) {
try {
- getterMethod = beanClass.getMethod(IS_PREFIX + key);
+ getterMethod = beanClass.getMethod(IS_PREFIX + keyUpdated);
} catch (NoSuchMethodException exception) {
// No-op
}
@@ -811,7 +811,7 @@ public class BeanAdapter implements Map<
* @return
* The getter method, or <tt>null</tt> if the method does not exist.
*/
- public static Method getSetterMethod(Class<?> beanClass, String key, Class<?> valueType) {
+ public static Method getSetterMethod(final Class<?> beanClass, final String key, final Class<?> valueType) {
if (beanClass == null) {
throw new IllegalArgumentException("beanClass is null.");
}
@@ -829,8 +829,8 @@ public class BeanAdapter implements Map<
if (valueType != null) {
// Upper-case the first letter and prepend the "set" prefix to
// determine the method name
- key = Character.toUpperCase(key.charAt(0)) + key.substring(1);
- final String methodName = SET_PREFIX + key;
+ String keyUpdated = Character.toUpperCase(key.charAt(0)) + key.substring(1);
+ final String methodName = SET_PREFIX + keyUpdated;
try {
setterMethod = beanClass.getMethod(methodName, valueType);
@@ -841,7 +841,7 @@ public class BeanAdapter implements Map<
if (setterMethod == null) {
// Look for a match on the value's super type
Class<?> superType = valueType.getSuperclass();
- setterMethod = getSetterMethod(beanClass, key, superType);
+ setterMethod = getSetterMethod(beanClass, keyUpdated, superType);
}
if (setterMethod == null) {
@@ -860,7 +860,7 @@ public class BeanAdapter implements Map<
// No-op
} catch (IllegalAccessException exception) {
throw new RuntimeException(String.format(ILLEGAL_ACCESS_EXCEPTION_MESSAGE_FORMAT,
- key, beanClass.getName()), exception);
+ keyUpdated, beanClass.getName()), exception);
}
}
@@ -872,7 +872,7 @@ public class BeanAdapter implements Map<
while (setterMethod == null
&& i < n) {
Class<?> interfaceType = interfaces[i++];
- setterMethod = getSetterMethod(beanClass, key, interfaceType);
+ setterMethod = getSetterMethod(beanClass, keyUpdated, interfaceType);
}
}
}
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayList.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayList.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayList.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/collections/ArrayList.java Thu Feb 21 17:32:38 2013
@@ -403,8 +403,8 @@ public class ArrayList<T> implements Lis
public void ensureCapacity(int capacity) {
if (capacity > items.length) {
- capacity = Math.max(this.items.length * 3 / 2, capacity);
- Object[] itemsLocal = new Object[capacity];
+ int capacityMax = Math.max(this.items.length * 3 / 2, capacity);
+ Object[] itemsLocal = new Object[capacityMax];
System.arraycopy(this.items, 0, itemsLocal, 0, length);
this.items = itemsLocal;
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/collections/Sequence.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/collections/Sequence.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/collections/Sequence.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/collections/Sequence.java Thu Feb 21 17:32:38 2013
@@ -324,7 +324,7 @@ public interface Sequence<T> {
* The item that was previously stored at the given path.
*/
@SuppressWarnings("unchecked")
- public static <T> T update(Sequence<T> sequence, Path path, T item) {
+ public static <T> T update(final Sequence<T> sequence, final Path path, final T item) {
if (sequence == null) {
throw new IllegalArgumentException("sequence is null.");
}
@@ -334,11 +334,12 @@ public interface Sequence<T> {
}
int i = 0, n = path.getLength() - 1;
+ Sequence<T> sequenceUpdated = sequence;
while (i < n) {
- sequence = (Sequence<T>)sequence.get(path.get(i++));
+ sequenceUpdated = (Sequence<T>)sequenceUpdated.get(path.get(i++));
}
- return sequence.update(path.get(i), item);
+ return sequenceUpdated.update(path.get(i), item);
}
/**
@@ -374,7 +375,7 @@ public interface Sequence<T> {
* The path of the item to remove.
*/
@SuppressWarnings("unchecked")
- public static <T> Sequence<T> remove(Sequence<T> sequence, Path path, int count) {
+ public static <T> Sequence<T> remove(final Sequence<T> sequence, final Path path, int count) {
if (sequence == null) {
throw new IllegalArgumentException("sequence is null.");
}
@@ -384,11 +385,12 @@ public interface Sequence<T> {
}
int i = 0, n = path.getLength() - 1;
+ Sequence<T> sequenceUpdated = sequence;
while (i < n) {
- sequence = (Sequence<T>)sequence.get(path.get(i++));
+ sequenceUpdated = (Sequence<T>)sequenceUpdated.get(path.get(i++));
}
- return sequence.remove(path.get(i), count);
+ return sequenceUpdated.remove(path.get(i), count);
}
/**
@@ -404,7 +406,7 @@ public interface Sequence<T> {
* The item at the given path, or <tt>null</tt> if the path is empty.
*/
@SuppressWarnings("unchecked")
- public static <T> T get(Sequence<T> sequence, Path path) {
+ public static <T> T get(final Sequence<T> sequence, final Path path) {
if (sequence == null) {
throw new IllegalArgumentException("sequence is null.");
}
@@ -418,11 +420,12 @@ public interface Sequence<T> {
item = null;
} else {
int i = 0, n = path.getLength() - 1;
+ Sequence<T> sequenceUpdated = sequence;
while (i < n) {
- sequence = (Sequence<T>)sequence.get(path.get(i++));
+ sequenceUpdated = (Sequence<T>)sequenceUpdated.get(path.get(i++));
}
- item = sequence.get(path.get(i));
+ item = sequenceUpdated.get(path.get(i));
}
return item;
@@ -442,7 +445,7 @@ public interface Sequence<T> {
* sequence; <tt>null</tt>, otherwise.
*/
@SuppressWarnings("unchecked")
- public static <T> Path pathOf(Sequence<T> sequence, T item) {
+ public static <T> Path pathOf(final Sequence<T> sequence, final T item) {
if (sequence == null) {
throw new IllegalArgumentException("sequence is null.");
}
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/io/IOTask.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/io/IOTask.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/io/IOTask.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/io/IOTask.java Thu Feb 21 17:32:38 2013
@@ -193,6 +193,7 @@ public abstract class IOTask<V> extends
}
}
+ // TODO: use AtomicInteger instead of volatile ...
protected volatile long bytesSent = 0;
protected volatile long bytesReceived = 0;
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSONSerializer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSONSerializer.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSONSerializer.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/json/JSONSerializer.java Thu Feb 21 17:32:38 2013
@@ -217,6 +217,7 @@ public class JSONSerializer implements S
*
* @see #readObject(Reader)
*/
+ @SuppressWarnings("resource")
@Override
public Object readObject(InputStream inputStream)
throws IOException, SerializationException {
@@ -846,6 +847,7 @@ public class JSONSerializer implements S
*
* @see #writeObject(Object, Writer)
*/
+ @SuppressWarnings("resource")
@Override
public void writeObject(Object object, OutputStream outputStream)
throws IOException, SerializationException {
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/serialization/CSVSerializer.java Thu Feb 21 17:32:38 2013
@@ -205,6 +205,7 @@ public class CSVSerializer implements Se
*
* @see #readObject(Reader)
*/
+ @SuppressWarnings("resource")
@Override
public List<?> readObject(InputStream inputStream)
throws IOException, SerializationException {
@@ -441,6 +442,7 @@ public class CSVSerializer implements Se
*
* @see #writeObject(List, Writer)
*/
+ @SuppressWarnings("resource")
@Override
public void writeObject(List<?> items, OutputStream outputStream)
throws IOException, SerializationException {
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/text/CharSequenceCharacterIterator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/text/CharSequenceCharacterIterator.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/text/CharSequenceCharacterIterator.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/text/CharSequenceCharacterIterator.java Thu Feb 21 17:32:38 2013
@@ -45,33 +45,35 @@ public final class CharSequenceCharacter
throw new IllegalArgumentException("charSequence may not be null");
}
+ int endIndexUpdated = endIndex;
+
if (endIndex == -1) {
- endIndex = charSequence.length();
+ endIndexUpdated = charSequence.length();
}
- if (beginIndex > endIndex) {
- throw new IllegalArgumentException("beginIndex > endIndex, " + beginIndex + ">" + endIndex);
+ if (beginIndex > endIndexUpdated) {
+ throw new IllegalArgumentException("beginIndex > endIndex, " + beginIndex + ">" + endIndexUpdated);
}
if (beginIndex < 0) {
throw new IndexOutOfBoundsException("beginIndex < 0, " + beginIndex);
}
- if (endIndex > charSequence.length()) {
- throw new IndexOutOfBoundsException("endIndex > char sequence length, " + endIndex + ">" + charSequence.length());
+ if (endIndexUpdated > charSequence.length()) {
+ throw new IndexOutOfBoundsException("endIndex > char sequence length, " + endIndexUpdated + ">" + charSequence.length());
}
if (index < beginIndex) {
throw new IndexOutOfBoundsException("(index < beginIndex, " + index + "<" + beginIndex);
}
- if (index > endIndex) {
- throw new IndexOutOfBoundsException("(index > endIndex, " + index + ">" + endIndex);
+ if (index > endIndexUpdated) {
+ throw new IndexOutOfBoundsException("(index > endIndex, " + index + ">" + endIndexUpdated);
}
this.charSequence = charSequence;
this.beginIndex = beginIndex;
- this.endIndex = endIndex;
+ this.endIndex = endIndexUpdated;
setIndex(index);
}
Modified: pivot/branches/2.0.x/core/src/org/apache/pivot/xml/XMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/src/org/apache/pivot/xml/XMLSerializer.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/core/src/org/apache/pivot/xml/XMLSerializer.java (original)
+++ pivot/branches/2.0.x/core/src/org/apache/pivot/xml/XMLSerializer.java Thu Feb 21 17:32:38 2013
@@ -211,6 +211,10 @@ public class XMLSerializer implements Se
break;
}
+
+ default: {
+ break;
+ }
}
}
} catch (XMLStreamException exception) {
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/DataBindingTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/DataBindingTest.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/DataBindingTest.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/DataBindingTest.java Thu Feb 21 17:32:38 2013
@@ -36,12 +36,13 @@ import org.apache.pivot.wtk.content.Spin
public class DataBindingTest extends Application.Adapter {
public static class TestListButtonDataRenderer extends ListButtonDataRenderer {
@Override
- public void render(Object data, Button button, boolean highlighted) {
- if (data != null) {
- data = JSON.get(data, "text");
+ public void render(final Object data, Button button, boolean highlighted) {
+ Object dataLoaded = data;
+ if (dataLoaded != null) {
+ dataLoaded = JSON.get(data, "text");
}
- super.render(data, button, highlighted);
+ super.render(dataLoaded, button, highlighted);
}
@Override
@@ -52,13 +53,14 @@ public class DataBindingTest extends App
public static class TestListViewItemRenderer extends ListViewItemRenderer {
@Override
- public void render(Object item, int index, ListView listView, boolean selected,
+ public void render(final Object item, int index, final ListView listView, boolean selected,
boolean checked, boolean highlighted, boolean disabled) {
- if (item != null) {
- item = JSON.get(item, "text");
+ Object itemLoaded = item;
+ if (itemLoaded != null) {
+ itemLoaded = JSON.get(item, "text");
}
- super.render(item, index, listView, selected, checked, highlighted, disabled);
+ super.render(itemLoaded, index, listView, selected, checked, highlighted, disabled);
}
@Override
@@ -69,12 +71,13 @@ public class DataBindingTest extends App
public static class TestSpinnerItemRenderer extends SpinnerItemRenderer {
@Override
- public void render(Object item, Spinner spinner) {
- if (item != null) {
- item = JSON.get(item, "text");
+ public void render(final Object item, final Spinner spinner) {
+ Object itemLoaded = item;
+ if (itemLoaded != null) {
+ itemLoaded = JSON.get(item, "text");
}
- super.render(item, spinner);
+ super.render(itemLoaded, spinner);
}
@Override
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/JavascriptConsoleTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/JavascriptConsoleTest.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/JavascriptConsoleTest.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/JavascriptConsoleTest.java Thu Feb 21 17:32:38 2013
@@ -107,16 +107,16 @@ public class JavascriptConsoleTest exten
* @param className the full class name (to use as a base name), for loading resources
*/
private void loadResources(String className) {
- if (className == null || className.length() < 1) {
- className = MAIN_CLASS_NAME; // set a useful default
- }
-
try {
// load some resources here, just to show its usage from JS files,
// but only if not already loaded ...
if (resources == null) {
resources = new Resources(MAIN_CLASS_NAME, locale);
- logObject("buildResources, load resources from \"" + className + "\", with locale " + locale);
+ logObject("buildResources, load resources from "
+ + "\""
+ + ((className != null && className.length() > 0) ? className : MAIN_CLASS_NAME) // set a useful default
+ + "\", with locale " + locale
+ );
}
} catch (Exception e) {
e.printStackTrace();
@@ -150,17 +150,18 @@ public class JavascriptConsoleTest exten
* @throws SerializationException in case of error
* @throws IOException in case of error
*/
- private Window loadWindow(String fileName, BXMLSerializer bxmlSerializer)
+ private Window loadWindow(String fileName, final BXMLSerializer bxmlSerializer)
throws SerializationException, IOException {
logObject("loadWindow from \"" + fileName + "\", with the serializer " + bxmlSerializer);
- if (bxmlSerializer == null) {
- bxmlSerializer = new BXMLSerializer();
+ BXMLSerializer serializer = bxmlSerializer;
+ if (serializer == null) {
+ serializer = new BXMLSerializer();
}
// return (Window)bxmlSerializer.readObject(JavascriptConsoleTest.class, fileName); // ok
// better, to allow usage of resources (without having to call setLocation or setResources in the serializer) ...
- return (Window)bxmlSerializer.readObject(JavascriptConsoleTest.class, fileName, true);
+ return (Window)serializer.readObject(JavascriptConsoleTest.class, fileName, true);
}
/**
@@ -175,11 +176,12 @@ public class JavascriptConsoleTest exten
* @param bxmlSerializer the serializer to use, or if null a new one will be created
* @return the Window instance
*/
- public Window loadWindowFromURL(String urlString, BXMLSerializer bxmlSerializer) {
+ public Window loadWindowFromURL(String urlString, final BXMLSerializer bxmlSerializer) {
logObject("loadWindow from \"" + urlString + "\", with the serializer " + bxmlSerializer);
- if (bxmlSerializer == null) {
- bxmlSerializer = new BXMLSerializer();
+ BXMLSerializer serializer = bxmlSerializer;
+ if (serializer == null) {
+ serializer = new BXMLSerializer();
}
Window loadedWindow = null;
@@ -187,9 +189,9 @@ public class JavascriptConsoleTest exten
URL url = new URL(urlString);
// force the location, so it will be possible to decode resources like labels ...
- bxmlSerializer.setLocation(url);
+ serializer.setLocation(url);
- loadedWindow = (Window)bxmlSerializer.readObject(url);
+ loadedWindow = (Window)serializer.readObject(url);
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) {
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java Thu Feb 21 17:32:38 2013
@@ -51,6 +51,7 @@ public class Pivot859 extends Applicatio
private String defaultURL = null;
+ @Override
public void startup(final Display display, Map<String, String> properties) throws Exception {
System.out.println("startup(...)");
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/Pivot861.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/Pivot861.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/Pivot861.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/Pivot861.java Thu Feb 21 17:32:38 2013
@@ -27,6 +27,7 @@ import org.apache.pivot.wtk.Display;
*/
public class Pivot861 extends Application.Adapter {
+ @Override
public void startup(final Display display, Map<String, String> args) throws Exception {
System.out.println("Pivot861 startup(...)");
System.out.println("\n"
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/TestDialog.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/TestDialog.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/TestDialog.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot861/TestDialog.java Thu Feb 21 17:32:38 2013
@@ -51,10 +51,12 @@ public class TestDialog extends Dialog i
return dialog;
}
+ @Override
public void initialize(Map<String, Object> namespace, URL location, Resources resources) {
System.out.println("TestDialog initialize(...)");
this.okButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
TestDialog.this.close(true);
}
Modified: pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java (original)
+++ pivot/branches/2.0.x/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java Thu Feb 21 17:32:38 2013
@@ -135,7 +135,7 @@ public class Pivot894 extends Applicatio
e.printStackTrace();
}
return row;
- };
+ }
}, 100);
}
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java Thu Feb 21 17:32:38 2013
@@ -340,15 +340,16 @@ public class BXMLExplorerDocument extend
}
}
- private String nameForObject(Object obj) {
- if (obj instanceof FakeWindow) {
- obj = ((FakeWindow) obj).window;
+ private String nameForObject(final Object obj) {
+ Object objUpdated = obj;
+ if (objUpdated instanceof FakeWindow) {
+ objUpdated = ((FakeWindow) objUpdated).window;
}
- String bxmlID = widgetToID.get(obj);
+ String bxmlID = widgetToID.get(objUpdated);
if (bxmlID == null) {
- return obj.getClass().getSimpleName();
+ return objUpdated.getClass().getSimpleName();
}
- return obj.getClass().getSimpleName() + " " + bxmlID;
+ return objUpdated.getClass().getSimpleName() + " " + bxmlID;
}
private static class MyTreeViewNodeRenderer extends TreeViewNodeRenderer {
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java Thu Feb 21 17:32:38 2013
@@ -80,7 +80,7 @@ public class DataBinding extends Window
@Override
public void buttonPressed(Button button) {
form.clear();
- sourceLabel.setText(null);
+ sourceLabel.setText("");
}
});
}
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java Thu Feb 21 17:32:38 2013
@@ -125,39 +125,43 @@ public class ComponentExplorerWindow ext
}
switch (componentNode.getHorizontalScrollBarPolicy()) {
- case AUTO:
- horizontalScrollBarPolicyGroup.setSelection(horizontalAutoButton);
- break;
- case FILL:
- horizontalScrollBarPolicyGroup.setSelection(horizontalFillButton);
- break;
- case FILL_TO_CAPACITY:
- horizontalScrollBarPolicyGroup.setSelection(horizontalFillToCapacityButton);
- break;
- case NEVER:
- horizontalScrollBarPolicyGroup.setSelection(horizontalNeverButton);
- break;
- case ALWAYS:
- horizontalScrollBarPolicyGroup.setSelection(horizontalAlwaysButton);
- break;
+ case AUTO:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalAutoButton);
+ break;
+ case FILL:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalFillButton);
+ break;
+ case FILL_TO_CAPACITY:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalFillToCapacityButton);
+ break;
+ case NEVER:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalNeverButton);
+ break;
+ case ALWAYS:
+ horizontalScrollBarPolicyGroup.setSelection(horizontalAlwaysButton);
+ break;
+ default:
+ break;
}
switch (componentNode.getVerticalScrollBarPolicy()) {
- case AUTO:
- verticalScrollBarPolicyGroup.setSelection(verticalAutoButton);
- break;
- case FILL:
- verticalScrollBarPolicyGroup.setSelection(verticalFillButton);
- break;
- case FILL_TO_CAPACITY:
- verticalScrollBarPolicyGroup.setSelection(verticalFillToCapacityButton);
- break;
- case NEVER:
- verticalScrollBarPolicyGroup.setSelection(verticalNeverButton);
- break;
- case ALWAYS:
- verticalScrollBarPolicyGroup.setSelection(verticalAlwaysButton);
- break;
+ case AUTO:
+ verticalScrollBarPolicyGroup.setSelection(verticalAutoButton);
+ break;
+ case FILL:
+ verticalScrollBarPolicyGroup.setSelection(verticalFillButton);
+ break;
+ case FILL_TO_CAPACITY:
+ verticalScrollBarPolicyGroup.setSelection(verticalFillToCapacityButton);
+ break;
+ case NEVER:
+ verticalScrollBarPolicyGroup.setSelection(verticalNeverButton);
+ break;
+ case ALWAYS:
+ verticalScrollBarPolicyGroup.setSelection(verticalAlwaysButton);
+ break;
+ default:
+ break;
}
} else {
sourceTextArea.setText("");
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java Thu Feb 21 17:32:38 2013
@@ -95,6 +95,10 @@ class RulerSkin extends ComponentSkin im
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java Thu Feb 21 17:32:38 2013
@@ -63,6 +63,7 @@ public class ListViews extends Window im
}
private void updateSelection(ListView listViewArgument) {
+ // TODO: in future use StringBuffer instead ...
String selectionText = "";
Sequence<Span> selectedRanges = listViewArgument.getSelectedRanges();
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java Thu Feb 21 17:32:38 2013
@@ -95,6 +95,10 @@ class RulerSkin extends ComponentSkin im
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/web/src/org/apache/pivot/web/Query.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/web/src/org/apache/pivot/web/Query.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/web/src/org/apache/pivot/web/Query.java (original)
+++ pivot/branches/2.0.x/web/src/org/apache/pivot/web/Query.java Thu Feb 21 17:32:38 2013
@@ -371,7 +371,8 @@ public abstract class Query<V> extends I
}
@SuppressWarnings("unchecked")
- protected Object execute(Method method, Object value) throws QueryException {
+ protected Object execute(final Method method, final Object value) throws QueryException {
+ Object result = value;
URL location = getLocation();
HttpURLConnection connection = null;
@@ -407,8 +408,8 @@ public abstract class Query<V> extends I
}
// Set the request headers
- if (value != null) {
- connection.setRequestProperty("Content-Type", serializerLocal.getMIMEType(value));
+ if (result != null) {
+ connection.setRequestProperty("Content-Type", serializerLocal.getMIMEType(result));
}
for (String key : requestHeaders) {
@@ -423,18 +424,18 @@ public abstract class Query<V> extends I
// Set the input/output state
connection.setDoInput(true);
- connection.setDoOutput(value != null);
+ connection.setDoOutput(result != null);
// Connect to the server
connection.connect();
queryListeners.connected(this);
// Write the request body
- if (value != null) {
+ if (result != null) {
OutputStream outputStream = null;
try {
outputStream = connection.getOutputStream();
- serializerLocal.writeObject(value, new MonitoredOutputStream(outputStream));
+ serializerLocal.writeObject(result, new MonitoredOutputStream(outputStream));
} finally {
if (outputStream != null) {
outputStream.close();
@@ -471,7 +472,7 @@ public abstract class Query<V> extends I
InputStream inputStream = null;
try {
inputStream = connection.getInputStream();
- value = serializerLocal.readObject(new MonitoredInputStream(inputStream));
+ result = serializerLocal.readObject(new MonitoredInputStream(inputStream));
} finally {
if (inputStream != null) {
inputStream.close();
@@ -492,7 +493,7 @@ public abstract class Query<V> extends I
throw exception;
}
- return value;
+ return result;
}
/**
Modified: pivot/branches/2.0.x/web/src/org/apache/pivot/web/QueryDictionary.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/web/src/org/apache/pivot/web/QueryDictionary.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/web/src/org/apache/pivot/web/QueryDictionary.java (original)
+++ pivot/branches/2.0.x/web/src/org/apache/pivot/web/QueryDictionary.java Thu Feb 21 17:32:38 2013
@@ -36,12 +36,13 @@ public final class QueryDictionary imple
}
@Override
- public String get(String key) {
+ public String get(final String key) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
if (list != null && list.getLength() > 0) {
return list.get(0);
}
@@ -49,12 +50,13 @@ public final class QueryDictionary imple
return null;
}
- public String get(String key, int index) {
+ public String get(final String key, int index) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
if (list == null || list.getLength() <= index) {
throw new IndexOutOfBoundsException();
}
@@ -63,15 +65,16 @@ public final class QueryDictionary imple
}
@Override
- public String put(String key, String value) {
+ public String put(final String key, final String value) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
ArrayList<String> list = new ArrayList<String>();
list.add(value);
- ArrayList<String> previous = map.put(key, list);
+ ArrayList<String> previous = map.put(searchKey, list);
if (previous != null && previous.getLength() > 0) {
return previous.get(0);
}
@@ -79,14 +82,15 @@ public final class QueryDictionary imple
return null;
}
- public int add(String key, String value) {
+ public int add(final String key, final String value) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
if (list == null) {
- put(key, value);
+ put(searchKey, value);
return 0;
}
@@ -94,12 +98,13 @@ public final class QueryDictionary imple
return list.getLength() - 1;
}
- public void insert(String key, String value, int index) {
+ public void insert(final String key, final String value, int index) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
// e.g if index = 0 and length = 0, throw an exception
if (list == null || list.getLength() <= index) {
@@ -110,12 +115,13 @@ public final class QueryDictionary imple
}
@Override
- public String remove(String key) {
+ public String remove(final String key) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.remove(key);
+ ArrayList<String> list = map.remove(searchKey);
if (list != null && list.getLength() > 0) {
return list.get(0);
}
@@ -123,12 +129,13 @@ public final class QueryDictionary imple
return null;
}
- public String remove(String key, int index) {
+ public String remove(final String key, int index) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
if (list == null || list.getLength() <= index) {
throw new IndexOutOfBoundsException();
}
@@ -141,21 +148,23 @@ public final class QueryDictionary imple
}
@Override
- public boolean containsKey(String key) {
+ public boolean containsKey(final String key) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- return map.containsKey(key);
+ return map.containsKey(searchKey);
}
- public int getLength(String key) {
+ public int getLength(final String key) {
+ String searchKey = key;
if (!caseSensitiveKeys) {
- key = key.toLowerCase();
+ searchKey = searchKey.toLowerCase();
}
- ArrayList<String> list = map.get(key);
+ ArrayList<String> list = map.get(searchKey);
if (list == null) {
return 0;
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Thu Feb 21 17:32:38 2013
@@ -812,6 +812,10 @@ public abstract class ApplicationContext
break;
}
+
+ default: {
+ break;
+ }
}
}
@@ -836,6 +840,10 @@ public abstract class ApplicationContext
break;
}
+
+ default: {
+ break;
+ }
}
}
@@ -881,6 +889,10 @@ public abstract class ApplicationContext
button = Mouse.Button.RIGHT;
break;
}
+
+ default: {
+ break;
+ }
}
// Process the event
@@ -898,6 +910,10 @@ public abstract class ApplicationContext
display.mouseOut();
break;
}
+
+ default: {
+ break;
+ }
}
} catch (Exception exception) {
handleUncaughtException(exception);
@@ -1032,6 +1048,10 @@ public abstract class ApplicationContext
break;
}
+
+ default: {
+ break;
+ }
}
} catch (Exception exception) {
handleUncaughtException(exception);
@@ -1181,6 +1201,10 @@ public abstract class ApplicationContext
break;
}
+
+ default: {
+ break;
+ }
}
} catch (Exception exception) {
handleUncaughtException(exception);
@@ -1207,6 +1231,10 @@ public abstract class ApplicationContext
scrollType = Mouse.ScrollType.UNIT;
break;
}
+
+ default: {
+ break;
+ }
}
// Process the event
@@ -1244,6 +1272,10 @@ public abstract class ApplicationContext
}
break;
}
+
+ default: {
+ break;
+ }
}
} catch (Exception exception) {
handleUncaughtException(exception);
@@ -1302,6 +1334,10 @@ public abstract class ApplicationContext
keyLocation = Keyboard.KeyLocation.KEYPAD;
break;
}
+
+ default: {
+ break;
+ }
}
if (dragDescendant == null) {
@@ -1410,6 +1446,10 @@ public abstract class ApplicationContext
break;
}
+
+ default: {
+ break;
+ }
}
} else {
DragSource dragSource = dragDescendant.getDragSource();
@@ -1879,6 +1919,10 @@ public abstract class ApplicationContext
dropAction = DropAction.LINK;
break;
}
+
+ default: {
+ break;
+ }
}
return dropAction;
@@ -1911,16 +1955,17 @@ public abstract class ApplicationContext
nativeDropAction = DnDConstants.ACTION_COPY;
break;
}
-
case MOVE: {
nativeDropAction = DnDConstants.ACTION_MOVE;
break;
}
-
case LINK: {
nativeDropAction = DnDConstants.ACTION_LINK;
break;
}
+ default: {
+ break;
+ }
}
}
@@ -1939,16 +1984,17 @@ public abstract class ApplicationContext
cursor = java.awt.dnd.DragSource.DefaultCopyDrop;
break;
}
-
case MOVE: {
cursor = java.awt.dnd.DragSource.DefaultMoveDrop;
break;
}
-
case LINK: {
cursor = java.awt.dnd.DragSource.DefaultLinkDrop;
break;
}
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Thu Feb 21 17:32:38 2013
@@ -239,11 +239,13 @@ public final class DesktopApplicationCon
exit();
break;
}
-
case WindowEvent.WINDOW_CLOSED: {
System.exit(0);
break;
}
+ default: {
+ break;
+ }
}
}
@@ -261,7 +263,6 @@ public final class DesktopApplicationCon
break;
}
-
case WindowEvent.WINDOW_DEICONIFIED: {
try {
application.resume();
@@ -271,6 +272,9 @@ public final class DesktopApplicationCon
break;
}
+ default: {
+ break;
+ }
}
}
}
@@ -337,12 +341,10 @@ public final class DesktopApplicationCon
break;
}
-
case WindowEvent.WINDOW_CLOSING: {
dispose();
break;
}
-
case WindowEvent.WINDOW_CLOSED: {
Display display = this.displayHost.getDisplay();
displays.remove(display);
@@ -353,6 +355,9 @@ public final class DesktopApplicationCon
break;
}
+ default: {
+ break;
+ }
}
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java Thu Feb 21 17:32:38 2013
@@ -77,13 +77,17 @@ public final class GraphicsUtilities {
final int length, final Orientation orientation, final int thickness) {
if (length > 0 && thickness > 0) {
switch (orientation) {
- case HORIZONTAL:
- graphics.fillRect(x, y, length, thickness);
- break;
-
- case VERTICAL:
- graphics.fillRect(x, y, thickness, length);
- break;
+ case HORIZONTAL: {
+ graphics.fillRect(x, y, length, thickness);
+ break;
+ }
+ case VERTICAL: {
+ graphics.fillRect(x, y, thickness, length);
+ break;
+ }
+ default: {
+ break;
+ }
}
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ImageView.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ImageView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ImageView.java Thu Feb 21 17:32:38 2013
@@ -382,6 +382,10 @@ public class ImageView extends Component
value = imageBindMapping.toImageName(value);
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ListView.java Thu Feb 21 17:32:38 2013
@@ -1622,8 +1622,13 @@ public class ListView extends Component
break;
}
- case NONE:
+ case NONE: {
break;
+ }
+
+ default: {
+ break;
+ }
}
if (checkmarksEnabled) {
@@ -1719,8 +1724,13 @@ public class ListView extends Component
break;
}
- case NONE:
+ case NONE: {
break;
+ }
+
+ default: {
+ break;
+ }
}
if (checkmarksEnabled) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TableView.java Thu Feb 21 17:32:38 2013
@@ -2170,8 +2170,14 @@ public class TableView extends Component
break;
}
- case NONE:
+
+ case NONE: {
break;
+ }
+
+ default: {
+ break;
+ }
}
}
@@ -2241,8 +2247,14 @@ public class TableView extends Component
break;
}
- case NONE:
+
+ case NONE: {
break;
+ }
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TreeView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=1448732&r1=1448731&r2=1448732&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/TreeView.java Thu Feb 21 17:32:38 2013
@@ -1661,7 +1661,7 @@ public class TreeView extends Component
// Notify listeners
treeViewNodeStateListeners.nodeCheckStateChanged(this, path, previousCheckState);
- if (showMixedCheckmarkState) {
+ if (showMixedCheckmarkState && ancestorCheckStates != null) {
// Notify listeners of any changes to our ancestors' check states
Path ancestorPath = new Path(path, path.getLength() - 1);