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 2016/10/15 19:44:25 UTC
[1/2] wicket git commit: Fix typos in javadoc. Remove unnecessary cast
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 1236f50ad -> cf43a060d
Fix typos in javadoc. Remove unnecessary cast
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf7ff6d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf7ff6d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf7ff6d3
Branch: refs/heads/wicket-7.x
Commit: bf7ff6d3d2f64eaf07817508b55a51071ecd6973
Parents: 1236f50
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 15 21:43:25 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Oct 15 21:43:25 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/protocol/https/HttpsMapper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf7ff6d3/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
index 391aab0..54195ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
@@ -27,7 +27,6 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.IRequestMapperDelegate;
import org.apache.wicket.util.collections.ClassMetaCache;
@@ -134,7 +133,7 @@ public class HttpsMapper implements IRequestMapperDelegate
}
/**
- * Construts a redirect url that should switch the user to the specified {@code scheme}
+ * Constructs a redirect url that should switch the user to the specified {@code scheme}
*
* @param handler
* request handler being accessed
@@ -146,7 +145,7 @@ public class HttpsMapper implements IRequestMapperDelegate
*/
protected String createRedirectUrl(IRequestHandler handler, Request request, Scheme scheme)
{
- HttpServletRequest req = (HttpServletRequest)((WebRequest)request).getContainerRequest();
+ HttpServletRequest req = (HttpServletRequest)request.getContainerRequest();
String url = scheme.urlName() + "://";
url += req.getServerName();
if (!scheme.usesStandardPort(config))
[2/2] wicket git commit: Improve the error message to mention the
full type for better diagnosis
Posted by mg...@apache.org.
Improve the error message to mention the full type for better diagnosis
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cf43a060
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cf43a060
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cf43a060
Branch: refs/heads/wicket-7.x
Commit: cf43a060dfc55c637da737cf716d9fbdb9f94fb4
Parents: bf7ff6d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 15 21:43:47 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Oct 15 21:43:47 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/util/tester/BaseWicketTester.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cf43a060/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index fd60c60..2f972e9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1642,8 +1642,8 @@ public class BaseWicketTester
{
Component component = assertExists(path);
- return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" +
- Classes.simpleName(expectedComponentClass),
+ return isTrue("component '" + Classes.name(component.getClass()) + "' is not of type: " +
+ Classes.name(expectedComponentClass),
expectedComponentClass.isAssignableFrom(component.getClass()));
}