You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/29 08:17:35 UTC
git commit: Java 7 diamond operator. Remove unused method
Updated Branches:
refs/heads/master 724402db1 -> a93748195
Java 7 diamond operator. Remove unused method
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a9374819
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9374819
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9374819
Branch: refs/heads/master
Commit: a93748195009a096c7b2e09292ca67b669d7e4a4
Parents: 724402d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 29 09:17:03 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 29 09:17:03 2013 +0300
----------------------------------------------------------------------
.../protocol/http/servlet/ServletWebRequest.java | 13 +++----------
.../CombinedRequestParametersAdapter.java | 4 ++--
2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a9374819/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
index 24947bb..ecd0f22 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
@@ -27,7 +27,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -277,15 +276,9 @@ public class ServletWebRequest extends WebRequest
private Map<String, List<StringValue>> postParameters = null;
- private static boolean isMultiPart(ServletRequest request)
- {
- String contentType = request.getContentType();
- return contentType != null && contentType.toLowerCase().contains("multipart");
- }
-
protected Map<String, List<StringValue>> generatePostParameters()
{
- Map<String, List<StringValue>> postParameters = new HashMap<String, List<StringValue>>();
+ Map<String, List<StringValue>> postParameters = new HashMap<>();
IRequestParameters queryParams = getQueryParameters();
@@ -306,11 +299,11 @@ public class ServletWebRequest extends WebRequest
}
else
{
- queryValues = new ArrayList<StringValue>(queryValues);
+ queryValues = new ArrayList<>(queryValues);
}
// the list that will contain accepted post param values
- List<StringValue> postValues = new ArrayList<StringValue>();
+ List<StringValue> postValues = new ArrayList<>();
for (String value : values)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/a9374819/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
index 34e55d6..87451ed 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
@@ -51,7 +51,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
@Override
public Set<String> getParameterNames()
{
- Set<String> result = new LinkedHashSet<String>();
+ Set<String> result = new LinkedHashSet<>();
for (IRequestParameters p : parameters)
{
result.addAll(p.getParameterNames());
@@ -82,7 +82,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
@Override
public List<StringValue> getParameterValues(final String name)
{
- List<StringValue> result = new ArrayList<StringValue>();
+ List<StringValue> result = new ArrayList<>();
for (IRequestParameters p : parameters)
{
List<StringValue> values = p.getParameterValues(name);