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 2011/09/09 00:38:06 UTC
svn commit: r1166932 - in /pivot/trunk:
core/src/org/apache/pivot/collections/ core/src/org/apache/pivot/json/
tests/src/org/apache/pivot/tests/issues/
tutorials/src/org/apache/pivot/tutorials/webqueries/
Author: smartini
Date: Thu Sep 8 22:38:06 2011
New Revision: 1166932
URL: http://svn.apache.org/viewvc?rev=1166932&view=rev
Log:
fix warnings on raw data types (from eclipse 3.6.2)
Modified:
pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java
pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java
pivot/trunk/core/src/org/apache/pivot/json/JSON.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
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=1166932&r1=1166931&r2=1166932&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java Thu Sep 8 22:38:06 2011
@@ -465,7 +465,7 @@ public class ArrayList<T> implements Lis
if (this == o) {
equals = true;
} else if (o instanceof List) {
- List<T> list = (List)o;
+ List<T> list = (List<T>)o;
if (length == list.getLength()) {
Iterator<T> iterator = list.iterator();
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=1166932&r1=1166931&r2=1166932&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/collections/LinkedList.java Thu Sep 8 22:38:06 2011
@@ -605,7 +605,7 @@ public class LinkedList<T> implements Li
if (this == o) {
equals = true;
} else if (o instanceof List) {
- List<T> otherList = (List) o;
+ List<T> otherList = (List<T>) o;
if (length == otherList.getLength()) {
Iterator<T> iterator = otherList.iterator();
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=1166932&r1=1166931&r2=1166932&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/json/JSON.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/json/JSON.java Thu Sep 8 22:38:06 2011
@@ -73,7 +73,7 @@ public class JSON {
String key = keys.get(i);
- Map adapter = value instanceof java.util.Map ? new MapAdapter((java.util.Map) value) : new BeanAdapter(value);
+ Map<String, T> adapter = (Map<String, T>) (value instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) value) : new BeanAdapter(value));
if (adapter.containsKey(key)) {
value = adapter.get(key);
} else if (value instanceof Sequence<?>) {
@@ -147,7 +147,7 @@ public class JSON {
throw new IllegalArgumentException("Invalid path.");
}
- Map adapter = parent instanceof java.util.Map ? new MapAdapter((java.util.Map) parent) : new BeanAdapter(parent);
+ Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : new BeanAdapter(parent));
Object previousValue;
if (adapter.containsKey(key)) {
@@ -215,7 +215,7 @@ public class JSON {
* <tt>true</tt> if the path exists; <tt>false</tt>, otherwise.
*/
@SuppressWarnings("unchecked")
- public static boolean containsKey(Object root, String path) {
+ public static <T> boolean containsKey(Object root, String path) {
if (root == null) {
throw new IllegalArgumentException("root is null.");
}
@@ -232,7 +232,7 @@ public class JSON {
if (parent == null) {
containsKey = false;
} else {
- Map adapter = parent instanceof java.util.Map ? new MapAdapter((java.util.Map) parent) : new BeanAdapter(parent);
+ Map<String, T> adapter = (Map<String, T>) (parent instanceof java.util.Map ? new MapAdapter<String, T>((java.util.Map<String, T>) parent) : new BeanAdapter(parent));
containsKey = adapter.containsKey(key);
if (!containsKey) {
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java?rev=1166932&r1=1166931&r2=1166932&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot718.java Thu Sep 8 22:38:06 2011
@@ -87,7 +87,8 @@ public class Pivot718 implements Applica
public void buttonPressed(Button button) {
Object x = list.getSelectedItem();
System.out.println("delete :: " + x);
- List data = list.getListData();
+ // List data = list.getListData();
+ List<Object> data = (List<Object>) list.getListData();
data.remove(x);
}
});
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java?rev=1166932&r1=1166931&r2=1166932&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java Thu Sep 8 22:38:06 2011
@@ -114,7 +114,6 @@ public class ExpensesWindow extends Wind
}
@Override
- @SuppressWarnings("unchecked")
public void initialize(Map<String, Object> namespace, URL location, Resources resources) {
expenseTableView = (TableView)namespace.get("expenseTableView");
activityIndicator = (ActivityIndicator)namespace.get("activityIndicator");
@@ -132,7 +131,7 @@ public class ExpensesWindow extends Wind
}
// Create the delete confirmation prompt
- ArrayList<String> options = new ArrayList(resources.get("cancel"), resources.get("ok"));
+ ArrayList<String> options = new ArrayList<String>((String) resources.get("cancel"), (String) resources.get("ok"));
deleteConfirmationPrompt = new Prompt(MessageType.QUESTION, (String)resources.get("confirmDelete"),
options);