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/27 10:29:11 UTC

[1/2] wicket git commit: Java 7 diamonds

Repository: wicket
Updated Branches:
  refs/heads/master ebc503324 -> 70deb7fd7


Java 7 diamonds


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7f92c972
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7f92c972
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7f92c972

Branch: refs/heads/master
Commit: 7f92c972c3fe7e7501eb09e28851e9970791be2c
Parents: ebc5033
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 27 12:28:44 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Oct 27 12:28:55 2016 +0200

----------------------------------------------------------------------
 .../apache/wicket/markup/parser/filter/WicketLinkTagHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7f92c972/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
index 9797dac..8244d25 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
@@ -127,7 +127,7 @@ public class WicketLinkTagHandler extends AbstractMarkupFilter implements ICompo
 					{
 						if (autolinkStatus == null)
 						{
-							autolinkStatus = new ArrayListStack<Boolean>();
+							autolinkStatus = new ArrayListStack<>();
 						}
 
 						// remember the current setting to be reset after the


[2/2] wicket git commit: WICKET-6262 IllegalArgumentException: Argument 'filterPrefix' may not be null or empty with WebSocketBehavior

Posted by mg...@apache.org.
WICKET-6262 IllegalArgumentException: Argument 'filterPrefix' may not be null or empty with WebSocketBehavior


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/70deb7fd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/70deb7fd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/70deb7fd

Branch: refs/heads/master
Commit: 70deb7fd78bcb4ecd917154075e0953fc67b39f4
Parents: 7f92c97
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 27 12:28:00 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Oct 27 12:29:04 2016 +0200

----------------------------------------------------------------------
 .../apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/70deb7fd/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
index 2442cef..7d1219f 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
@@ -97,18 +97,18 @@ public class BaseWebSocketBehavior extends Behavior
 		WebSocketSettings webSocketSettings = WebSocketSettings.Holder.get(component.getApplication());
 
 		CharSequence baseUrl = getBaseUrl(webSocketSettings);
-		Args.notEmpty(baseUrl, "baseUrl");
+		Args.notNull(baseUrl, "baseUrl");
 		variables.put("baseUrl", baseUrl);
 
 		CharSequence contextPath = getContextPath(webSocketSettings);
-		Args.notEmpty(contextPath, "contextPath");
+		Args.notNull(contextPath, "contextPath");
 		variables.put("contextPath", contextPath);
 
 		// preserve the application name for JSR356 based impl
 		variables.put("applicationName", component.getApplication().getName());
 
 		CharSequence filterPrefix = getFilterPrefix(webSocketSettings);
-		Args.notEmpty(filterPrefix, "filterPrefix");
+		Args.notNull(filterPrefix, "filterPrefix");
 		variables.put("filterPrefix", filterPrefix);
 
 		String webSocketSetupScript = webSocketSetupTemplate.asString(variables);