You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/07/09 01:31:06 UTC
[2/2] git commit: Change generics signature for JSONArray.putAll()
and JSONObject.putAll() Use the new methods in a few places
Change generics signature for JSONArray.putAll() and JSONObject.putAll()
Use the new methods in a few places
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5b9c814e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5b9c814e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5b9c814e
Branch: refs/heads/5.4-js-rewrite
Commit: 5b9c814e3008c597a1bdb638b7f4ff0d44032b59
Parents: 649dd1a
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sun Jul 8 16:29:21 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sun Jul 8 16:29:21 2012 -0700
----------------------------------------------------------------------
.../internal/services/DocumentLinkerImpl.java | 8 +-------
.../services/PartialMarkupDocumentLinker.java | 13 +------------
.../services/javascript/ModuleManagerImpl.java | 9 +--------
.../java/org/apache/tapestry5/json/JSONArray.java | 2 +-
.../java/org/apache/tapestry5/json/JSONObject.java | 4 ++--
5 files changed, 6 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b9c814e/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
index 02e0a79..12b6875 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
@@ -87,13 +87,7 @@ public class DocumentLinkerImpl implements DocumentLinker
init.put(name);
- if (arguments != null)
- {
- for (Object o : arguments)
- {
- init.put(o);
- }
- }
+ init.putAll(arguments);
InternalUtils.addToMapList(priorityToModuleInit, priority, init);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b9c814e/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java
index 8205e5d..710e2a5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java
@@ -61,22 +61,11 @@ public class PartialMarkupDocumentLinker implements DocumentLinker
JSONArray init = new JSONArray().put(qualifiedName);
- addAll(init, arguments);
+ init.putAll(arguments);
InternalUtils.addToMapList(initsByPriority, priority, init);
}
- private static void addAll(JSONArray target, JSONArray other)
- {
- if (other != null)
- {
- for (Object o : other)
- {
- target.put(o);
- }
- }
- }
-
/**
* Commits changes, adding one or more keys to the reply.
*
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b9c814e/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
index d1fc891..5571fdd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
@@ -156,14 +156,7 @@ public class ModuleManagerImpl implements ModuleManager
private String convert(List<?> input)
{
- JSONArray array = new JSONArray();
-
- for (Object o : input)
- {
- array.put(o);
- }
-
- return array.toString(compactJSON);
+ return new JSONArray().putAll(input).toString(compactJSON);
}
@Override
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b9c814e/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 eaa268e..6454e89 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
@@ -467,7 +467,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
* @return this JSONArray
* @since 5.4
*/
- public JSONArray putAll(Iterable<Object> collection)
+ public JSONArray putAll(Iterable<?> collection)
{
if (collection != null)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b9c814e/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
index c765bb4..a8aa45d 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
@@ -963,11 +963,11 @@ public final class JSONObject extends JSONCollection
* @return this JSONObject
* @since 5.4
*/
- public JSONObject putAll(Map<String, Object> newProperties)
+ public JSONObject putAll(Map<String, ?> newProperties)
{
assert newProperties != null;
- for (Map.Entry<String, Object> e : newProperties.entrySet())
+ for (Map.Entry<String, ?> e : newProperties.entrySet())
{
put(e.getKey(), e.getValue());
}