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/09/02 14:39:52 UTC
svn commit: r1519421 [1/3] - in /pivot/trunk:
charts/src/org/apache/pivot/charts/ core/src/org/apache/pivot/collections/
core/src/org/apache/pivot/collections/adapter/
core/src/org/apache/pivot/collections/concurrent/
core/src/org/apache/pivot/collecti...
Author: smartini
Date: Mon Sep 2 12:39:49 2013
New Revision: 1519421
URL: http://svn.apache.org/r1519421
Log:
PIVOT-895 - simplify sources to use the new Java 7 syntax
Modified:
pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
pivot/trunk/core/src/org/apache/pivot/collections/ArrayAdapter.java
pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java
pivot/trunk/core/src/org/apache/pivot/collections/ArrayQueue.java
pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java
pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java
pivot/trunk/core/src/org/apache/pivot/collections/EnumMap.java
pivot/trunk/core/src/org/apache/pivot/collections/EnumSet.java
pivot/trunk/core/src/org/apache/pivot/collections/HashMap.java
pivot/trunk/core/src/org/apache/pivot/collections/HashSet.java
pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java
pivot/trunk/core/src/org/apache/pivot/collections/LinkedQueue.java
pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.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/adapter/MapAdapter.java
pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java
pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedList.java
pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedMap.java
pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedQueue.java
pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedSet.java
pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedStack.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/json/JSON.java
pivot/trunk/core/src/org/apache/pivot/json/JSONSerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java
pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java
pivot/trunk/core/src/org/apache/pivot/util/MIMEType.java
pivot/trunk/core/src/org/apache/pivot/util/Resources.java
pivot/trunk/core/src/org/apache/pivot/util/Service.java
pivot/trunk/core/src/org/apache/pivot/util/TypeLiteral.java
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java
pivot/trunk/core/src/org/apache/pivot/xml/Element.java
pivot/trunk/core/src/org/apache/pivot/xml/XML.java
pivot/trunk/core/test/org/apache/pivot/collections/test/ArrayListTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/EnumListTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/EnumMapTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/HashMapTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/LinkedListTest.java
pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java
pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java
pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
pivot/trunk/core/test/org/apache/pivot/serialization/test/PropertiesSerializerTest.java
pivot/trunk/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java
pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java
pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/styles/ColorSchemeBuilderWindow.java
pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java
pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java
pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/CheckedListViewTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/FileBrowserWithCharsetTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ListViewSelectionTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SheetTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SplashScreenTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/Pivot859.java
pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/ExpenseServlet.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/backgroundtasks/BackgroundTasks.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentPropertyInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentPropertyInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/RepeatableListButtons.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java
pivot/trunk/web-server/src/org/apache/pivot/web/server/ProxyServlet.java
pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
pivot/trunk/web/src/org/apache/pivot/web/Query.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.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/src/org/apache/pivot/wtk/Accordion.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Automation.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/RangeSelection.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeBranch.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinElementView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/validation/ComparableRangeValidator.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=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java Mon Sep 2 12:39:49 2013
@@ -413,7 +413,7 @@ public abstract class ChartView extends
}
public ChartView() {
- this(DEFAULT_SERIES_NAME_KEY, new ArrayList<Object>());
+ this(DEFAULT_SERIES_NAME_KEY, new ArrayList<>());
}
public ChartView(String seriesNameKey, List<?> chartData) {
Modified: pivot/trunk/core/src/org/apache/pivot/collections/ArrayAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/ArrayAdapter.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/ArrayAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayAdapter.java Mon Sep 2 12:39:49 2013
@@ -28,7 +28,7 @@ public class ArrayAdapter<T> implements
private T[] array;
- @SuppressWarnings({"unchecked", "varargs"})
+ @SuppressWarnings({"unchecked"})
public ArrayAdapter(T... array) {
if (array == null) {
throw new IllegalArgumentException();
Modified: pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java Mon Sep 2 12:39:49 2013
@@ -153,7 +153,7 @@ public class ArrayList<T> implements Lis
items = new Object[capacity];
}
- @SuppressWarnings({"unchecked", "varargs"})
+ @SuppressWarnings({"unchecked"})
public ArrayList(T... items) {
this(items, 0, items.length);
}
@@ -305,7 +305,7 @@ public class ArrayList<T> implements Lis
public Sequence<T> remove(int index, int count) {
verifyIndexBounds(index, count, 0, length);
- ArrayList<T> removed = new ArrayList<T>((T[])items, index, count);
+ ArrayList<T> removed = new ArrayList<>((T[])items, index, count);
// Remove items
if (count > 0) {
@@ -452,7 +452,7 @@ public class ArrayList<T> implements Lis
@Override
public ListenerList<ListListener<T>> getListListeners() {
if (listListeners == null) {
- listListeners = new ListListenerList<T>();
+ listListeners = new ListListenerList<>();
}
return listListeners;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/ArrayQueue.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/ArrayQueue.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/ArrayQueue.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayQueue.java Mon Sep 2 12:39:49 2013
@@ -31,8 +31,8 @@ import org.apache.pivot.util.ListenerLis
public class ArrayQueue<T> implements Queue<T>, Serializable {
private static final long serialVersionUID = -3856732506886968324L;
- private ArrayList<T> arrayList = new ArrayList<T>();
- private transient QueueListenerList<T> queueListeners = new QueueListenerList<T>();
+ private ArrayList<T> arrayList = new ArrayList<>();
+ private transient QueueListenerList<T> queueListeners = new QueueListenerList<>();
public ArrayQueue() {
this(null);
@@ -118,7 +118,7 @@ public class ArrayQueue<T> implements Qu
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(arrayList.iterator());
+ return new ImmutableIterator<>(arrayList.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayStack.java Mon Sep 2 12:39:49 2013
@@ -31,8 +31,8 @@ import org.apache.pivot.util.ListenerLis
public class ArrayStack<T> implements Stack<T>, Serializable {
private static final long serialVersionUID = 3175064065273930731L;
- private ArrayList<T> arrayList = new ArrayList<T>();
- private transient StackListenerList<T> stackListeners = new StackListenerList<T>();
+ private ArrayList<T> arrayList = new ArrayList<>();
+ private transient StackListenerList<T> stackListeners = new StackListenerList<>();
public ArrayStack() {
this(null);
@@ -113,7 +113,7 @@ public class ArrayStack<T> implements St
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(arrayList.iterator());
+ return new ImmutableIterator<>(arrayList.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java Mon Sep 2 12:39:49 2013
@@ -59,7 +59,7 @@ public class EnumList<E extends Enum<E>>
private Class<E> enumClass;
private E[] items;
- private transient ListListenerList<E> listListeners = new ListListenerList<E>();
+ private transient ListListenerList<E> listListeners = new ListListenerList<>();
public EnumList(Class<E> enumClass) {
this.enumClass = enumClass;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/EnumMap.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/EnumMap.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/EnumMap.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/EnumMap.java Mon Sep 2 12:39:49 2013
@@ -32,10 +32,10 @@ public class EnumMap<E extends Enum<E>,
private EnumSet<E> keySet;
private Object[] values;
- private transient MapListenerList<E, V> mapListeners = new MapListenerList<E, V>();
+ private transient MapListenerList<E, V> mapListeners = new MapListenerList<>();
public EnumMap(Class<E> enumClass) {
- keySet = new EnumSet<E>(enumClass);
+ keySet = new EnumSet<>(enumClass);
E[] constants = enumClass.getEnumConstants();
values = new Object[constants.length];
Modified: pivot/trunk/core/src/org/apache/pivot/collections/EnumSet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/EnumSet.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/EnumSet.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/EnumSet.java Mon Sep 2 12:39:49 2013
@@ -77,7 +77,7 @@ public class EnumSet<E extends Enum<E>>
private boolean[] members;
private int count = 0;
- private transient SetListenerList<E> setListeners = new SetListenerList<E>();
+ private transient SetListenerList<E> setListeners = new SetListenerList<>();
public EnumSet(Class<E> enumClass) {
this.enumClass = enumClass;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/HashMap.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/HashMap.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/HashMap.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/HashMap.java Mon Sep 2 12:39:49 2013
@@ -206,7 +206,7 @@ public class HashMap<K, V> implements Ma
if (entry.key.equals(key)) {
// Update the entry
previousValue = entry.value;
- iterator.update(new Pair<K, V>(key, value));
+ iterator.update(new Pair<>(key, value));
if (mapListeners != null
&& notifyListeners) {
@@ -221,7 +221,7 @@ public class HashMap<K, V> implements Ma
if (i == bucket.getLength()) {
// Add the entry
- bucket.add(new Pair<K, V>(key, value));
+ bucket.add(new Pair<>(key, value));
if (keys != null) {
keys.add(key);
@@ -357,7 +357,7 @@ public class HashMap<K, V> implements Ma
private void rehash(int capacity) {
ArrayList<LinkedList<Pair<K, V>>> previousBuckets = this.buckets;
- buckets = new ArrayList<LinkedList<Pair<K, V>>>(capacity);
+ buckets = new ArrayList<>(capacity);
for (int i = 0; i < capacity; i++) {
buckets.add(null);
@@ -386,7 +386,7 @@ public class HashMap<K, V> implements Ma
LinkedList<Pair<K, V>> bucket = buckets.get(bucketIndex);
if (bucket == null) {
- bucket = new LinkedList<Pair<K, V>>();
+ bucket = new LinkedList<>();
buckets.update(bucketIndex, bucket);
}
@@ -407,7 +407,7 @@ public class HashMap<K, V> implements Ma
} else {
if (keys == null) {
// Populate key list
- ArrayList<K> keysLocal = new ArrayList<K>((int)(getCapacity() * loadFactor));
+ ArrayList<K> keysLocal = new ArrayList<>((int)(getCapacity() * loadFactor));
for (K key : this) {
keysLocal.add(key);
}
@@ -425,13 +425,13 @@ public class HashMap<K, V> implements Ma
@Override
public Iterator<K> iterator() {
- return (keys == null) ? new KeyIterator() : new ImmutableIterator<K>(keys.iterator());
+ return (keys == null) ? new KeyIterator() : new ImmutableIterator<>(keys.iterator());
}
@Override
public ListenerList<MapListener<K, V>> getMapListeners() {
if (mapListeners == null) {
- mapListeners = new MapListenerList<K, V>();
+ mapListeners = new MapListenerList<>();
}
return mapListeners;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/HashSet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/HashSet.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/HashSet.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/HashSet.java Mon Sep 2 12:39:49 2013
@@ -74,7 +74,7 @@ public class HashSet<E> implements Set<E
}
}
- protected HashMap<E, Void> hashMap = new HashMap<E, Void>();
+ protected HashMap<E, Void> hashMap = new HashMap<>();
private transient SetListenerList<E> setListeners = null;
@@ -180,7 +180,7 @@ public class HashSet<E> implements Set<E
@Override
public ListenerList<SetListener<E>> getSetListeners() {
if (setListeners == null) {
- setListeners = new SetListenerList<E>();
+ setListeners = new SetListenerList<>();
}
return setListeners;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java Mon Sep 2 12:39:49 2013
@@ -193,7 +193,6 @@ public class LinkedList<T> implements Li
}
}
- @SuppressWarnings("unchecked")
@Override
public void remove() {
if (current == null) {
@@ -225,7 +224,7 @@ public class LinkedList<T> implements Li
LinkedList.this.modificationCount++;
if (listListeners != null) {
- LinkedList<T> removed = new LinkedList<T>(item);
+ LinkedList<T> removed = new LinkedList<>(item);
listListeners.itemsRemoved(LinkedList.this, index, removed);
}
@@ -327,7 +326,7 @@ public class LinkedList<T> implements Li
}
private void insert(T item, Node<T> previous, Node<T> next) {
- Node<T> node = new Node<T>(previous, next, item);
+ Node<T> node = new Node<>(previous, next, item);
if (previous == null) {
first = node;
@@ -404,7 +403,7 @@ public class LinkedList<T> implements Li
public Sequence<T> remove(int index, int count) {
verifyIndexBounds(index, count, 0, length);
- LinkedList<T> removed = new LinkedList<T>();
+ LinkedList<T> removed = new LinkedList<>();
if (count > 0) {
// Identify the bounding nodes and build the removed item list
@@ -562,7 +561,7 @@ public class LinkedList<T> implements Li
Node<T> node = null;
for (i = 0; i < length; i++) {
Node<T> previousNode = node;
- node = new Node<T>(previousNode, null, array[i]);
+ node = new Node<>(previousNode, null, array[i]);
if (previousNode == null) {
first = node;
@@ -592,7 +591,7 @@ public class LinkedList<T> implements Li
@Override
public ListenerList<ListListener<T>> getListListeners() {
if (listListeners == null) {
- listListeners = new ListListenerList<T>();
+ listListeners = new ListListenerList<>();
}
return listListeners;
Modified: pivot/trunk/core/src/org/apache/pivot/collections/LinkedQueue.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/LinkedQueue.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/LinkedQueue.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/LinkedQueue.java Mon Sep 2 12:39:49 2013
@@ -31,8 +31,8 @@ import org.apache.pivot.util.ListenerLis
public class LinkedQueue<T> implements Queue<T>, Serializable {
private static final long serialVersionUID = 1598074020226109253L;
- private LinkedList<T> linkedList = new LinkedList<T>();
- private transient QueueListenerList<T> queueListeners = new QueueListenerList<T>();
+ private LinkedList<T> linkedList = new LinkedList<>();
+ private transient QueueListenerList<T> queueListeners = new QueueListenerList<>();
public LinkedQueue() {
this(null);
@@ -110,7 +110,7 @@ public class LinkedQueue<T> implements Q
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(linkedList.iterator());
+ return new ImmutableIterator<>(linkedList.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/LinkedStack.java Mon Sep 2 12:39:49 2013
@@ -30,8 +30,8 @@ import org.apache.pivot.util.ListenerLis
public class LinkedStack<T> implements Stack<T>, Serializable {
private static final long serialVersionUID = -6276454328308188689L;
- private LinkedList<T> linkedList = new LinkedList<T>();
- private transient StackListenerList<T> stackListeners = new StackListenerList<T>();
+ private LinkedList<T> linkedList = new LinkedList<>();
+ private transient StackListenerList<T> stackListeners = new StackListenerList<>();
public LinkedStack() {
this(null);
@@ -104,7 +104,7 @@ public class LinkedStack<T> implements S
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(linkedList.iterator());
+ return new ImmutableIterator<>(linkedList.iterator());
}
@Override
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=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/Sequence.java Mon Sep 2 12:39:49 2013
@@ -29,6 +29,7 @@ public interface Sequence<T> {
* Collection of static utility methods providing path access to nested
* sequence data.
*/
+ @SuppressWarnings("unused")
public static class Tree<T> {
/**
* An object representing a path to a nested node in nested sequence
@@ -99,7 +100,7 @@ public interface Sequence<T> {
@Override
public Iterator<Integer> iterator() {
- return new ImmutableIterator<Integer>(elements.iterator());
+ return new ImmutableIterator<>(elements.iterator());
}
@Override
@@ -481,7 +482,7 @@ public interface Sequence<T> {
* nested sequence.
*/
public static <T> ItemIterator<T> depthFirstIterator(Sequence<T> sequence) {
- return new DepthFirstItemIterator<T>(sequence);
+ return new DepthFirstItemIterator<>(sequence);
}
/**
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=1519421&r1=1519420&r2=1519421&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 Mon Sep 2 12:39:49 2013
@@ -39,7 +39,7 @@ public class ListAdapter<T> implements L
private java.util.List<T> list = null;
private Comparator<T> comparator = null;
- private transient ListListenerList<T> listListeners = new ListListenerList<T>();
+ private transient ListListenerList<T> listListeners = new ListListenerList<>();
public ListAdapter(java.util.List<T> list) {
if (list == null) {
@@ -166,7 +166,6 @@ public class ListAdapter<T> implements L
return index;
}
- @SuppressWarnings("unchecked")
@Override
public Sequence<T> remove(int index, int count) {
java.util.List<T> removedList = null;
@@ -178,7 +177,7 @@ public class ListAdapter<T> implements L
throw new RuntimeException(exception);
}
- List<T> removed = new ListAdapter<T>(removedList);
+ List<T> removed = new ListAdapter<>(removedList);
if (count > 0) {
for (int i = count - 1; i >= 0; i--) {
@@ -241,7 +240,7 @@ public class ListAdapter<T> implements L
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(list.iterator());
+ return new ImmutableIterator<>(list.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java Mon Sep 2 12:39:49 2013
@@ -36,7 +36,7 @@ public class MapAdapter<K, V> implements
private static final long serialVersionUID = 4005649560306864969L;
private java.util.Map<K, V> map = null;
- private transient MapListenerList<K, V> mapListeners = new MapListenerList<K, V>();
+ private transient MapListenerList<K, V> mapListeners = new MapListenerList<>();
public MapAdapter(java.util.Map<K, V> map) {
if (map == null) {
@@ -104,7 +104,6 @@ public class MapAdapter<K, V> implements
return map.size();
}
- @SuppressWarnings("unchecked")
@Override
public Comparator<K> getComparator() {
if (this.map instanceof SortedMap<?, ?>) {
@@ -113,7 +112,6 @@ public class MapAdapter<K, V> implements
return null;
}
- @SuppressWarnings("unchecked")
@Override
public void setComparator(Comparator<K> comparator) {
Comparator<K> previousComparator = getComparator();
@@ -147,7 +145,7 @@ public class MapAdapter<K, V> implements
@Override
public Iterator<K> iterator() {
- return new ImmutableIterator<K>(map.keySet().iterator());
+ return new ImmutableIterator<>(map.keySet().iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java Mon Sep 2 12:39:49 2013
@@ -35,7 +35,7 @@ public class SetAdapter<E> implements Se
private static final long serialVersionUID = -816891924416727900L;
private java.util.Set<E> set = null;
- private transient SetListenerList<E> setListeners = new SetListenerList<E>();
+ private transient SetListenerList<E> setListeners = new SetListenerList<>();
public SetAdapter(java.util.Set<E> set) {
if (set == null) {
@@ -100,7 +100,6 @@ public class SetAdapter<E> implements Se
return set.size();
}
- @SuppressWarnings("unchecked")
@Override
public Comparator<E> getComparator() {
if (this.set instanceof java.util.SortedSet<?>) {
@@ -109,7 +108,6 @@ public class SetAdapter<E> implements Se
return null;
}
- @SuppressWarnings("unchecked")
@Override
public void setComparator(Comparator<E> comparator) {
Comparator<E> previousComparator = getComparator();
@@ -143,7 +141,7 @@ public class SetAdapter<E> implements Se
@Override
public Iterator<E> iterator() {
- return new ImmutableIterator<E>(set.iterator());
+ return new ImmutableIterator<>(set.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedList.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedList.java Mon Sep 2 12:39:49 2013
@@ -68,7 +68,7 @@ public class SynchronizedList<T> impleme
}
private List<T> list;
- private SynchronizedListListenerList<T> listListeners = new SynchronizedListListenerList<T>();
+ private SynchronizedListListenerList<T> listListeners = new SynchronizedListListenerList<>();
public SynchronizedList(List<T> list) {
if (list == null) {
@@ -168,7 +168,7 @@ public class SynchronizedList<T> impleme
*/
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(list.iterator());
+ return new ImmutableIterator<>(list.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedMap.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedMap.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedMap.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedMap.java Mon Sep 2 12:39:49 2013
@@ -67,7 +67,7 @@ public class SynchronizedMap<K, V> imple
}
private Map<K, V> map;
- private SynchronizedMapListenerList<K, V> mapListeners = new SynchronizedMapListenerList<K, V>();
+ private SynchronizedMapListenerList<K, V> mapListeners = new SynchronizedMapListenerList<>();
public SynchronizedMap(Map<K, V> map) {
if (map == null) {
@@ -150,7 +150,7 @@ public class SynchronizedMap<K, V> imple
*/
@Override
public Iterator<K> iterator() {
- return new ImmutableIterator<K>(map.iterator());
+ return new ImmutableIterator<>(map.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedQueue.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedQueue.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedQueue.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedQueue.java Mon Sep 2 12:39:49 2013
@@ -52,7 +52,7 @@ public class SynchronizedQueue<T> implem
}
private Queue<T> queue;
- private SynchronizedQueueListenerList<T> queueListeners = new SynchronizedQueueListenerList<T>();
+ private SynchronizedQueueListenerList<T> queueListeners = new SynchronizedQueueListenerList<>();
public SynchronizedQueue(Queue<T> queue) {
if (queue == null) {
@@ -128,7 +128,7 @@ public class SynchronizedQueue<T> implem
*/
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(queue.iterator());
+ return new ImmutableIterator<>(queue.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedSet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedSet.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedSet.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedSet.java Mon Sep 2 12:39:49 2013
@@ -62,7 +62,7 @@ public class SynchronizedSet<E> implemen
}
private Set<E> set;
- private SynchronizedSetListenerList<E> setListeners = new SynchronizedSetListenerList<E>();
+ private SynchronizedSetListenerList<E> setListeners = new SynchronizedSetListenerList<>();
public SynchronizedSet(Set<E> set) {
if (set == null) {
@@ -141,7 +141,7 @@ public class SynchronizedSet<E> implemen
*/
@Override
public Iterator<E> iterator() {
- return new ImmutableIterator<E>(set.iterator());
+ return new ImmutableIterator<>(set.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedStack.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedStack.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedStack.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/concurrent/SynchronizedStack.java Mon Sep 2 12:39:49 2013
@@ -52,7 +52,7 @@ public class SynchronizedStack<T> implem
}
private Stack<T> stack;
- private SynchronizedStackListenerList<T> stackListeners = new SynchronizedStackListenerList<T>();
+ private SynchronizedStackListenerList<T> stackListeners = new SynchronizedStackListenerList<>();
public SynchronizedStack(Stack<T> stack) {
if (stack == null) {
@@ -129,7 +129,7 @@ public class SynchronizedStack<T> implem
*/
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(stack.iterator());
+ return new ImmutableIterator<>(stack.iterator());
}
@Override
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=1519421&r1=1519420&r2=1519421&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 Mon Sep 2 12:39:49 2013
@@ -31,7 +31,7 @@ import org.apache.pivot.util.ListenerLis
public final class ImmutableList<T> implements List<T> {
private List<T> list = null;
- private ListListenerList<T> listListeners = new ListListenerList<T>();
+ private ListListenerList<T> listListeners = new ListListenerList<>();
public ImmutableList(List<T> list) {
if (list == null) {
@@ -102,7 +102,7 @@ public final class ImmutableList<T> impl
@Override
public Iterator<T> iterator() {
- return new ImmutableIterator<T>(list.iterator());
+ return new ImmutableIterator<>(list.iterator());
}
@Override
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=1519421&r1=1519420&r2=1519421&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 Mon Sep 2 12:39:49 2013
@@ -30,7 +30,7 @@ import org.apache.pivot.util.ListenerLis
public class ImmutableMap<K, V> implements Map<K, V> {
private Map<K, V> map = null;
- private MapListenerList<K, V> mapListeners = new MapListenerList<K, V>();
+ private MapListenerList<K, V> mapListeners = new MapListenerList<>();
public ImmutableMap(Map<K, V> map) {
if (map == null) {
@@ -88,7 +88,7 @@ public class ImmutableMap<K, V> implemen
@Override
public Iterator<K> iterator() {
- return new ImmutableIterator<K>(map.iterator());
+ return new ImmutableIterator<>(map.iterator());
}
@Override
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=1519421&r1=1519420&r2=1519421&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 Mon Sep 2 12:39:49 2013
@@ -30,7 +30,7 @@ import org.apache.pivot.util.ListenerLis
public class ImmutableSet<E> implements Set<E> {
private Set<E> set = null;
- private SetListenerList<E> setListeners = new SetListenerList<E>();
+ private SetListenerList<E> setListeners = new SetListenerList<>();
public ImmutableSet(Set<E> set) {
if (set == null) {
@@ -82,7 +82,7 @@ public class ImmutableSet<E> implements
@Override
public Iterator<E> iterator() {
- return new ImmutableIterator<E>(set.iterator());
+ return new ImmutableIterator<>(set.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/json/JSON.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/json/JSON.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/json/JSON.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/json/JSON.java Mon Sep 2 12:39:49 2013
@@ -86,7 +86,7 @@ public class JSON {
String key = keys.get(i);
- Map<String, T> adapter = (Map<String, T>) (value instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) value) :
+ Map<String, T> adapter = (Map<String, T>) (value instanceof java.util.Map ? new MapAdapter<>((java.util.Map<String, T>) value) :
(value instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) value): new BeanAdapter(value)));
if (adapter.containsKey(key)) {
value = adapter.get(key);
@@ -161,7 +161,7 @@ public class JSON {
throw new IllegalArgumentException("Invalid path.");
}
- Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) :
+ Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<>((java.util.Map<String, T>) parent) :
(parent instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) parent): new BeanAdapter(parent)));
Object previousValue;
@@ -247,7 +247,7 @@ public class JSON {
if (parent == null) {
containsKey = false;
} else {
- Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) :
+ Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<>((java.util.Map<String, T>) parent) :
(parent instanceof org.apache.pivot.collections.Map ? ((org.apache.pivot.collections.Map<String, T>) parent): new BeanAdapter(parent)));
containsKey = adapter.containsKey(key);
Modified: pivot/trunk/core/src/org/apache/pivot/json/JSONSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/json/JSONSerializer.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/json/JSONSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/json/JSONSerializer.java Mon Sep 2 12:39:49 2013
@@ -541,7 +541,6 @@ public class JSONSerializer implements S
return BeanAdapter.coerce(value, (Class<?>)typeArgument);
}
- @SuppressWarnings("unchecked")
private Object readListValue(Reader reader, Type typeArgument)
throws IOException, SerializationException {
Sequence<Object> sequence = null;
@@ -653,7 +652,6 @@ public class JSONSerializer implements S
return sequence;
}
- @SuppressWarnings("unchecked")
private Object readMapValue(Reader reader, Type typeArgument)
throws IOException, SerializationException {
Dictionary<String, Object> dictionary = null;
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java Mon Sep 2 12:39:49 2013
@@ -146,7 +146,7 @@ public class CSVSerializer implements Se
throw new IllegalArgumentException();
}
- this.keys = new ArrayList<String>(keys);
+ this.keys = new ArrayList<>(keys);
}
/**
@@ -159,7 +159,7 @@ public class CSVSerializer implements Se
throw new IllegalArgumentException();
}
- setKeys(new ArrayAdapter<String>(keys));
+ setKeys(new ArrayAdapter<>(keys));
}
/**
@@ -251,7 +251,7 @@ public class CSVSerializer implements Se
}
String[] keysLocal = line.split(",");
- this.keys = new ArrayList<String>(keysLocal.length);
+ this.keys = new ArrayList<>(keysLocal.length);
for (int i = 0; i < keysLocal.length; i++) {
String key = keysLocal[i];
Modified: pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/PropertiesSerializer.java Mon Sep 2 12:39:49 2013
@@ -54,7 +54,7 @@ public class PropertiesSerializer implem
Properties properties = new Properties();
properties.load(inputStream);
- return new MapAdapter<Object, Object>(properties);
+ return new MapAdapter<>(properties);
}
/**
Modified: pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/sql/ResultList.java Mon Sep 2 12:39:49 2013
@@ -208,7 +208,7 @@ public class ResultList implements List<
throw new IllegalArgumentException();
}
- this.fields = new ArrayList<Field>(fields);
+ this.fields = new ArrayList<>(fields);
}
public void setFields(Field... fields) {
@@ -216,7 +216,7 @@ public class ResultList implements List<
throw new IllegalArgumentException();
}
- setFields(new ArrayAdapter<Field>(fields));
+ setFields(new ArrayAdapter<>(fields));
}
public boolean getIncludeNullValues() {
Modified: pivot/trunk/core/src/org/apache/pivot/util/MIMEType.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/MIMEType.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/MIMEType.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/MIMEType.java Mon Sep 2 12:39:49 2013
@@ -62,7 +62,7 @@ public class MIMEType implements Diction
@Override
public Iterator<String> iterator() {
- return new ImmutableIterator<String>(this.parameters.iterator());
+ return new ImmutableIterator<>(this.parameters.iterator());
}
@Override
Modified: pivot/trunk/core/src/org/apache/pivot/util/Resources.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Resources.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Resources.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Resources.java Mon Sep 2 12:39:49 2013
@@ -188,7 +188,7 @@ public class Resources implements Dictio
@Override
public Iterator<String> iterator() {
- return new ImmutableIterator<String>(this.resourceMap.iterator());
+ return new ImmutableIterator<>(this.resourceMap.iterator());
}
@SuppressWarnings("unchecked")
@@ -208,7 +208,6 @@ public class Resources implements Dictio
}
}
- @SuppressWarnings("unchecked")
private Map<String, Object> readJSONResource(String name)
throws IOException, SerializationException {
Map<String, Object> resourceMapFromResource = null;
Modified: pivot/trunk/core/src/org/apache/pivot/util/Service.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Service.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Service.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Service.java Mon Sep 2 12:39:49 2013
@@ -38,6 +38,7 @@ public class Service {
* resource is expected to be a text file containing a single line that is
* the name of the provider class.
*/
+ @SuppressWarnings("resource")
public static Object getProvider(String providerName) {
String providerClassName = null;
Modified: pivot/trunk/core/src/org/apache/pivot/util/TypeLiteral.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/TypeLiteral.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/TypeLiteral.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/TypeLiteral.java Mon Sep 2 12:39:49 2013
@@ -33,6 +33,7 @@ import java.lang.reflect.Type;
* <a href="http://code.google.com/p/google-guice/">Google Guice</a>'s
* {@code TypeLiteral} class, written by Bob Lee and Jesse Wilson.
*/
+@SuppressWarnings("unused")
public class TypeLiteral<T> {
private final Type type;
Modified: pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskGroup.java Mon Sep 2 12:39:49 2013
@@ -123,6 +123,6 @@ public class TaskGroup extends Task<Void
@Override
public Iterator<Task<?>> iterator() {
- return new ImmutableIterator<Task<?>>(tasks.iterator());
+ return new ImmutableIterator<>(tasks.iterator());
}
}
Modified: pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java Mon Sep 2 12:39:49 2013
@@ -138,6 +138,6 @@ public class TaskSequence extends Task<V
@Override
public Iterator<Task<?>> iterator() {
- return new ImmutableIterator<Task<?>>(tasks.iterator());
+ return new ImmutableIterator<>(tasks.iterator());
}
}
Modified: pivot/trunk/core/src/org/apache/pivot/xml/Element.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/xml/Element.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/xml/Element.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/xml/Element.java Mon Sep 2 12:39:49 2013
@@ -302,7 +302,7 @@ public class Element extends Node implem
*/
@Override
public Iterator<Attribute> iterator() {
- return new ImmutableIterator<Attribute>(attributes.iterator());
+ return new ImmutableIterator<>(attributes.iterator());
}
}
@@ -397,7 +397,7 @@ public class Element extends Node implem
*/
@Override
public Iterator<String> iterator() {
- return new ImmutableIterator<String>(namespaces.iterator());
+ return new ImmutableIterator<>(namespaces.iterator());
}
}
@@ -843,7 +843,7 @@ public class Element extends Node implem
*/
@Override
public Iterator<Node> iterator() {
- return new ImmutableIterator<Node>(nodes.iterator());
+ return new ImmutableIterator<>(nodes.iterator());
}
/**
Modified: pivot/trunk/core/src/org/apache/pivot/xml/XML.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/xml/XML.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/xml/XML.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/xml/XML.java Mon Sep 2 12:39:49 2013
@@ -55,7 +55,7 @@ public class XML {
throw new IllegalArgumentException("path is empty.");
}
- ArrayList<String> pathComponents = new ArrayList<String>(path.split("/"));
+ ArrayList<String> pathComponents = new ArrayList<>(path.split("/"));
Element current = root;
for (int i = 0, n = pathComponents.getLength(); i < n; i++) {
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/ArrayListTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/ArrayListTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/ArrayListTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/ArrayListTest.java Mon Sep 2 12:39:49 2013
@@ -55,11 +55,11 @@ public class ArrayListTest {
assertNotNull(list.get(1));
assertTrue(list.get(1).equals("E"));
- assertTrue(list.equals(new ArrayList<String>("B", "E", "D")));
- assertFalse(list.equals(new ArrayList<String>("B", "E", "D", "C")));
- assertFalse(list.equals(new ArrayList<String>("E", "C", "D")));
+ assertTrue(list.equals(new ArrayList<>("B", "E", "D")));
+ assertFalse(list.equals(new ArrayList<>("B", "E", "D", "C")));
+ assertFalse(list.equals(new ArrayList<>("E", "C", "D")));
- ArrayList<String> copy = new ArrayList<String>("B", "E", "D");
+ ArrayList<String> copy = new ArrayList<>("B", "E", "D");
int i = 0;
for (String item : list) {
assertEquals(item, copy.get(i++));
@@ -87,11 +87,11 @@ public class ArrayListTest {
iterator = list.iterator();
iterator.insert("M");
- assertEquals(list, new ArrayList<String>("M", "B", "E", "D"));
+ assertEquals(list, new ArrayList<>("M", "B", "E", "D"));
assertEquals(iterator.next(), "M");
iterator.insert("N");
- assertEquals(list, new ArrayList<String>("M", "N", "B", "E", "D"));
+ assertEquals(list, new ArrayList<>("M", "N", "B", "E", "D"));
iterator = list.iterator();
iterator.toEnd();
@@ -107,7 +107,7 @@ public class ArrayListTest {
ArrayList<Object> list = new ArrayList<Object>("a", "b", "c");
Sequence<?> sequence = list;
- list = new ArrayList<Object>((Sequence<Object>)sequence);
+ list = new ArrayList<>((Sequence<Object>)sequence);
assertEquals(list.getLength(), 3);
assertEquals(list.get(0), "a");
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/EnumListTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/EnumListTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/EnumListTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/EnumListTest.java Mon Sep 2 12:39:49 2013
@@ -31,7 +31,7 @@ public class EnumListTest {
@Test
public void basicTest() {
- EnumList<TestEnum> enumList = new EnumList<TestEnum>(TestEnum.class);
+ EnumList<TestEnum> enumList = new EnumList<>(TestEnum.class);
assertEquals(enumList.get(0), TestEnum.A);
assertEquals(enumList.get(1), TestEnum.B);
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/EnumMapTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/EnumMapTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/EnumMapTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/EnumMapTest.java Mon Sep 2 12:39:49 2013
@@ -32,7 +32,7 @@ public class EnumMapTest {
@Test
public void basicTest() {
- EnumMap<TestEnum, String> enumMap = new EnumMap<TestEnum, String>(TestEnum.class);
+ EnumMap<TestEnum, String> enumMap = new EnumMap<>(TestEnum.class);
enumMap.put(TestEnum.A, "a");
assertTrue(enumMap.containsKey(TestEnum.A));
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/HashMapTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/HashMapTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/HashMapTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/HashMapTest.java Mon Sep 2 12:39:49 2013
@@ -102,17 +102,16 @@ public class HashMapTest {
}
@Test
- @SuppressWarnings("unchecked")
public void constructorTests() {
// TODO Verify that this does not generate a warning under JDK 7
- HashMap<String, Integer> map = new HashMap<String, Integer>(new Map.Pair<String, Integer>(
- "a", 1), new Map.Pair<String, Integer>("b", 2));
+ HashMap<String, Integer> map = new HashMap<>(new Map.Pair<>(
+ "a", 1), new Map.Pair<>("b", 2));
assertEquals(2, map.getCount());
- map = new HashMap<String, Integer>(map);
+ map = new HashMap<>(map);
assertEquals(2, map.getCount());
- map = new HashMap<String, Integer>(map);
+ map = new HashMap<>(map);
assertEquals(2, map.getCount());
}
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/LinkedListTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/LinkedListTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/LinkedListTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/LinkedListTest.java Mon Sep 2 12:39:49 2013
@@ -57,9 +57,9 @@ public class LinkedListTest {
assertTrue(list.get(1).equals("F"));
list.insert("G", 0);
- assertTrue(list.equals(new LinkedList<String>("G", "B", "F", "D")));
- assertFalse(list.equals(new LinkedList<String>("G", "B", "F", "D", "E")));
- assertFalse(list.equals(new LinkedList<String>("B", "F", "E")));
+ assertTrue(list.equals(new LinkedList<>("G", "B", "F", "D")));
+ assertFalse(list.equals(new LinkedList<>("G", "B", "F", "D", "E")));
+ assertFalse(list.equals(new LinkedList<>("B", "F", "E")));
assertEquals(4, list.getLength());
@@ -90,11 +90,11 @@ public class LinkedListTest {
iterator = list.iterator();
iterator.insert("M");
- assertEquals(list, new LinkedList<String>("M", "G", "B", "F", "D"));
+ assertEquals(list, new LinkedList<>("M", "G", "B", "F", "D"));
assertEquals(iterator.next(), "M");
iterator.insert("N");
- assertEquals(list, new LinkedList<String>("M", "N", "G", "B", "F", "D"));
+ assertEquals(list, new LinkedList<>("M", "N", "G", "B", "F", "D"));
iterator = list.iterator();
iterator.toEnd();
@@ -120,7 +120,7 @@ public class LinkedListTest {
linkedList.add("A");
linkedList.add("z");
- assertEquals(linkedList, new LinkedList<String>("A", "d", "N", "P", "z"));
+ assertEquals(linkedList, new LinkedList<>("A", "d", "N", "P", "z"));
}
@Test
@@ -140,7 +140,7 @@ public class LinkedListTest {
}
});
- assertEquals(linkedList, new LinkedList<String>("A", "d", "N", "P", "z"));
+ assertEquals(linkedList, new LinkedList<>("A", "d", "N", "P", "z"));
}
@Test(expected=ConcurrentModificationException.class)
Modified: pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/collections/test/SynchronizedQueueTest.java Mon Sep 2 12:39:49 2013
@@ -36,7 +36,7 @@ public class SynchronizedQueueTest {
private static void testSynchronizedQueue(Queue<String> queue) {
final SynchronizedQueue<String> synchronizedQueue =
- new SynchronizedQueue<String>(queue);
+ new SynchronizedQueue<>(queue);
Task<Void> testTask = new Task<Void>() {
@Override
Modified: pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java Mon Sep 2 12:39:49 2013
@@ -52,7 +52,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testTypedList() throws IOException, SerializationException {
JSONSerializer listSerializer = new JSONSerializer();
List<Object> list =
@@ -77,7 +76,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testListSubclass() throws IOException, SerializationException {
JSONSerializer listSerializer = new JSONSerializer();
List<Object> list =
@@ -99,7 +97,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testSequence() throws IOException, SerializationException {
JSONSerializer listSerializer = new JSONSerializer();
List<Object> list =
@@ -122,7 +119,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testUntypedMap() throws IOException, SerializationException {
JSONSerializer mapSerializer = new JSONSerializer(HashMap.class);
HashMap<String, ?> map = (HashMap<String, ?>)mapSerializer.readObject(new StringReader("{a:1, b:2, c:'3'}"));
@@ -136,7 +132,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testTypedMap() throws IOException, SerializationException {
JSONSerializer typedMapSerializer =
new JSONSerializer((new TypeLiteral<HashMap<String, SampleBean2>>() {
@@ -191,7 +186,6 @@ public class BindTest {
* @throws SerializationException
*/
@Test
- @SuppressWarnings("unchecked")
public void testBean() throws IOException, SerializationException {
JSONSerializer mapSerializer = new JSONSerializer();
Map<String, Object> map =
Modified: pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java Mon Sep 2 12:39:49 2013
@@ -34,7 +34,6 @@ import static org.junit.Assert.assertEqu
public class CSVSerializerTest {
@Test
- @SuppressWarnings("unchecked")
public void testBasicReadObject() throws IOException, SerializationException {
// Test multiple line break formats
StringBuilder buf = new StringBuilder();
@@ -94,7 +93,6 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedCommaReadObject() throws IOException, SerializationException {
StringBuilder buf = new StringBuilder();
buf.append("a,\",b,\",c\r\n");
@@ -113,7 +111,6 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedQuoteReadObject() throws IOException, SerializationException {
StringBuilder buf = new StringBuilder();
buf.append("a,\"\"\"b\"\"\",c\r\n");
@@ -132,7 +129,6 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedNewlineReadObject() throws IOException, SerializationException {
StringBuilder buf = new StringBuilder();
buf.append("a,\"b\nb \",c\r\n");
@@ -151,15 +147,14 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testBasicWriteObject() throws IOException {
List<Object> items = new ArrayList<>();
- items.add(new HashMap<String, Object>(
+ items.add(new HashMap<>(
new Dictionary.Pair<String, Object>("A", "a1"),
new Dictionary.Pair<String, Object>("B", "b1"),
new Dictionary.Pair<String, Object>("C", "c1")
));
- items.add(new HashMap<String, Object>(
+ items.add(new HashMap<>(
new Dictionary.Pair<String, Object>("A", "a2"),
new Dictionary.Pair<String, Object>("B", "b2"),
new Dictionary.Pair<String, Object>("C", "c2")
@@ -176,10 +171,9 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedCommaWriteObject() throws IOException {
List<Object> items = new ArrayList<>();
- items.add(new HashMap<String, Object>(
+ items.add(new HashMap<>(
new Dictionary.Pair<String, Object>("A", "a"),
new Dictionary.Pair<String, Object>("B", ",b,"),
new Dictionary.Pair<String, Object>("C", "c")
@@ -196,10 +190,9 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedQuoteWriteObject() throws IOException {
List<Object> items = new ArrayList<>();
- items.add(new HashMap<String, Object>(
+ items.add(new HashMap<>(
new Dictionary.Pair<String, Object>("A", "a"),
new Dictionary.Pair<String, Object>("B", "\"b\""),
new Dictionary.Pair<String, Object>("C", "c")
@@ -216,10 +209,9 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testQuotedNewlineWriteObject() throws IOException {
List<Object> items = new ArrayList<>();
- items.add(new HashMap<String, Object>(
+ items.add(new HashMap<>(
new Dictionary.Pair<String, Object>("A", "a"),
new Dictionary.Pair<String, Object>("B", "\nb\n"),
new Dictionary.Pair<String, Object>("C", "c")
@@ -241,7 +233,6 @@ public class CSVSerializerTest {
}
@Test
- @SuppressWarnings("unchecked")
public void testInlineKeys() throws IOException, SerializationException {
StringBuilder buf = new StringBuilder();
buf.append("A \t, B ,C \n");
Modified: pivot/trunk/core/test/org/apache/pivot/serialization/test/PropertiesSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/serialization/test/PropertiesSerializerTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/serialization/test/PropertiesSerializerTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/serialization/test/PropertiesSerializerTest.java Mon Sep 2 12:39:49 2013
@@ -100,7 +100,6 @@ public class PropertiesSerializerTest
log("serializer instance created: " + serializer);
ByteArrayInputStream inputStream = new ByteArrayInputStream(testBytes);
- @SuppressWarnings("unchecked")
Map<String, Object> readData = (Map<String, Object>) serializer.readObject(inputStream);
assertNotNull(readData);
Modified: pivot/trunk/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java (original)
+++ pivot/trunk/demos-server/src/org/apache/pivot/demos/rest/server/RESTDemoServlet.java Mon Sep 2 12:39:49 2013
@@ -34,6 +34,7 @@ import org.apache.pivot.web.server.Query
public class RESTDemoServlet extends QueryServlet {
private static final long serialVersionUID = 0;
+ @SuppressWarnings("resource")
@Override
protected Object doGet(Path path) throws QueryException {
if (path.getLength() != 1) {
@@ -60,6 +61,7 @@ public class RESTDemoServlet extends Que
return value;
}
+ @SuppressWarnings("resource")
@Override
protected URL doPost(Path path, Object value) throws QueryException {
if (path.getLength() > 0
@@ -92,6 +94,7 @@ public class RESTDemoServlet extends Que
return location;
}
+ @SuppressWarnings("resource")
@Override
protected boolean doPut(Path path, Object value) throws QueryException {
if (path.getLength() != 1
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java Mon Sep 2 12:39:49 2013
@@ -115,7 +115,6 @@ public class SearchDemo implements Appli
* @throws IllegalStateException
* If a query is already executing.
*/
- @SuppressWarnings("unchecked")
public void executeQuery(String term) {
if (term == null
|| term.length() == 0) {
@@ -140,7 +139,7 @@ public class SearchDemo implements Appli
statusLabel.setText("Searching...");
updateActivityState();
- getQuery.execute(new TaskAdapter<Object>(new TaskListener<Object>() {
+ getQuery.execute(new TaskAdapter<>(new TaskListener<Object>() {
@Override
public void taskExecuted(Task<Object> task) {
if (task == getQuery) {
@@ -223,7 +222,6 @@ public class SearchDemo implements Appli
/**
* Updates the artwork to reflect the current selection.
*/
- @SuppressWarnings("unchecked")
public void updateArtwork() {
Map<String, Object> result = (Map<String, Object>)resultsTableView.getSelectedRow();
@@ -239,7 +237,7 @@ public class SearchDemo implements Appli
if (artworkURL == null) {
artworkImageView.setImage((Image)null);
} else {
- Image.load(artworkURL, new TaskAdapter<Image>(new TaskListener<Image>() {
+ Image.load(artworkURL, new TaskAdapter<>(new TaskListener<Image>() {
@Override
public void taskExecuted(Task<Image> task) {
artworkImageView.setImage(task.getResult());
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java Mon Sep 2 12:39:49 2013
@@ -124,6 +124,7 @@ public class JSONViewer extends Applicat
File file = fileList.get(0);
JSONSerializer jsonSerializer = new JSONSerializer();
+ @SuppressWarnings("resource")
FileInputStream fileInputStream = null;
try {
try {
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java Mon Sep 2 12:39:49 2013
@@ -72,7 +72,7 @@ public class LargeData extends Applicati
CSVSerializer csvSerializer = new CSVSerializer();
csvSerializer.setKeys("c0", "c1", "c2", "c3");
csvSerializer.getCSVSerializerListeners().add(new CSVSerializerListener.Adapter() {
- private ArrayList<Object> page = new ArrayList<Object>(pageSize);
+ private ArrayList<Object> page = new ArrayList<>(pageSize);
@Override
public void endList(CSVSerializer csvSerializerArgument) {
@@ -87,7 +87,7 @@ public class LargeData extends Applicati
if (page.getLength() == pageSize) {
ApplicationContext.queueCallback(new AddRowsCallback(page));
- page = new ArrayList<Object>(pageSize);
+ page = new ArrayList<>(pageSize);
}
}
});
@@ -115,7 +115,6 @@ public class LargeData extends Applicati
this.page = page;
}
- @SuppressWarnings("unchecked")
@Override
public void run() {
List<Object> tableData = (List<Object>)tableView.getTableData();
@@ -198,7 +197,6 @@ public class LargeData extends Applicati
tableView.getTableViewSortListeners().add(new TableViewSortListener.Adapter() {
@Override
- @SuppressWarnings("unchecked")
public void sortChanged(TableView tableViewArgument) {
List<Object> tableData = (List<Object>)tableViewArgument.getTableData();
@@ -225,7 +223,7 @@ public class LargeData extends Applicati
private void loadData() {
int index = fileListButton.getSelectedIndex();
int capacity = (int)Math.pow(10, index + 1);
- tableView.setTableData(new ArrayList<Object>(capacity));
+ tableView.setTableData(new ArrayList<>(capacity));
pageSize = Math.max(capacity / 1000, 100);
@@ -245,7 +243,7 @@ public class LargeData extends Applicati
System.out.println("Loading \"" + fileURL + "\" ...");
loadDataTask = new LoadDataTask(fileURL);
- loadDataTask.execute(new TaskAdapter<Void>(new TaskListener<Void>() {
+ loadDataTask.execute(new TaskAdapter<>(new TaskListener<Void>() {
@Override
public void taskExecuted(Task<Void> task) {
long t1 = System.currentTimeMillis();
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java Mon Sep 2 12:39:49 2013
@@ -84,7 +84,7 @@ public class RSSFeedDemo extends Window
getQuery.setSerializer(new XMLSerializer());
getQuery.getParameters().put("format", "xml");
- getQuery.execute(new TaskAdapter<Object>(new TaskListener<Object>() {
+ getQuery.execute(new TaskAdapter<>(new TaskListener<Object>() {
@Override
public void taskExecuted(Task<Object> task) {
Element root = (Element)task.getResult();
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=1519421&r1=1519420&r2=1519421&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 Mon Sep 2 12:39:49 2013
@@ -232,7 +232,7 @@ public class ColorSchemeBuilderWindow ex
}
private void copyToClipboard() {
- ArrayList<String> colors = new ArrayList<String>(8);
+ ArrayList<String> colors = new ArrayList<>(8);
for (int i = 0; i < 8; i++) {
ColorChooserButton colorChooserButton = colorChooserButtons.get(i);
Color color = colorChooserButton.getSelectedColor();
@@ -254,7 +254,7 @@ public class ColorSchemeBuilderWindow ex
}
private void resetPalette() {
- ArrayList<String> colors = new ArrayList<String>(8);
+ ArrayList<String> colors = new ArrayList<>(8);
for (int i = 0; i < 8; i++) {
ColorChooserButton colorChooserButton = colorChooserButtons.get(i);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java Mon Sep 2 12:39:49 2013
@@ -96,7 +96,7 @@ public class SuggestionDemo extends Wind
suggestionQuery.getParameters().put("query", text);
suggestionQuery.getParameters().put("output", "json");
- suggestionQuery.execute(new TaskAdapter<Object>(new TaskListener<Object>() {
+ suggestionQuery.execute(new TaskAdapter<>(new TaskListener<Object>() {
@Override
public void taskExecuted(Task<Object> task) {
if (task == suggestionQuery) {
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java Mon Sep 2 12:39:49 2013
@@ -115,7 +115,6 @@ public class FixedColumnTableDemo extend
// Keep header state in sync
primaryTableView.getTableViewSortListeners().add(new TableViewSortListener.Adapter() {
@Override
- @SuppressWarnings("unchecked")
public void sortChanged(TableView tableView) {
if (!tableView.getSort().isEmpty()) {
fixedTableView.clearSort();
@@ -128,7 +127,6 @@ public class FixedColumnTableDemo extend
fixedTableView.getTableViewSortListeners().add(new TableViewSortListener.Adapter() {
@Override
- @SuppressWarnings("unchecked")
public void sortChanged(TableView tableView) {
if (!tableView.getSort().isEmpty()) {
primaryTableView.clearSort();
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/text/TextPaneDemo.java Mon Sep 2 12:39:49 2013
@@ -118,7 +118,7 @@ public class TextPaneDemo extends Applic
Font italicButtonFont = (Font)italicButton.getStyles().get("font");
italicButton.getStyles().put("font", italicButtonFont.deriveFont(Font.ITALIC));
- fontFamilyListButton.setListData(new ArrayList<String>(
+ fontFamilyListButton.setListData(new ArrayList<>(
GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames()));
fontSizeListButton.setSelectedItem(fontFamilyListButton.getListData().get(0));
fontFamilyListButton.setItemRenderer(new ListViewItemRenderer() {
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java Mon Sep 2 12:39:49 2013
@@ -132,6 +132,7 @@ public class XMLViewer extends Applicati
File file = fileList.get(0);
XMLSerializer xmlSerializer = new XMLSerializer();
+ @SuppressWarnings("resource")
FileInputStream fileInputStream = null;
try {
try {
Modified: pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java Mon Sep 2 12:39:49 2013
@@ -51,7 +51,7 @@ public class SheetSlideDirectionWindow e
public void initialize(Map<String, Object> namespace, URL location, Resources resources) {
// Populate the ListButton with values from the enum
- listButton.setListData(new ArrayList<SheetPlacement>(SheetPlacement.values()));
+ listButton.setListData(new ArrayList<>(SheetPlacement.values()));
listButton = null;
// Populate the form with data from the Sheet's styles
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=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java Mon Sep 2 12:39:49 2013
@@ -21,7 +21,6 @@ import org.apache.pivot.collections.Hash
import org.apache.pivot.json.JSONSerializer;
public class BXMLDictionaryTest {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
BXMLSerializer bxmlSerializer = new BXMLSerializer();
HashMap<String, Object> hashMap =
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java?rev=1519421&r1=1519420&r2=1519421&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java Mon Sep 2 12:39:49 2013
@@ -89,7 +89,7 @@ public class CalendarTest extends Applic
System.out.println("STARTING TASK");
- task.execute(new TaskAdapter<Void>(new TaskListener<Void>() {
+ task.execute(new TaskAdapter<>(new TaskListener<Void>() {
@Override
public void taskExecuted(Task<Void> taskArgument) {
System.out.println("EXECUTED");