You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2012/11/02 18:16:24 UTC
[2/4] git commit: Make JSONArray.from() not care about what values
are stored in Iterable - Iterable> is universal; Iterable
Make JSONArray.from() not care about what values are stored in Iterable
- Iterable<?> is universal; Iterable<Object> is not
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6d03b160
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6d03b160
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6d03b160
Branch: refs/heads/5.4-js-rewrite
Commit: 6d03b1600ad78b199fc106d87cf8821398ae4085
Parents: fdeec35
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Nov 2 10:15:52 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Nov 2 10:15:52 2012 -0700
----------------------------------------------------------------------
.../java/org/apache/tapestry5/json/JSONArray.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6d03b160/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
index 8b08290..055ae43 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
@@ -112,7 +112,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
* collection ot value to include, or null
* @since 5.4
*/
- public static JSONArray from(Iterable<Object> iterable)
+ public static JSONArray from(Iterable<?> iterable)
{
return new JSONArray().putAll(iterable);
}