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 2012/06/20 11:25:29 UTC
[2/3] git commit: Rename TextMessage#getMessage() to #getText().
Rename TextMessage#getMessage() to #getText().
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/68c97c26
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/68c97c26
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/68c97c26
Branch: refs/heads/master
Commit: 68c97c26d62183deb8ab2ce718090bd6211d8e4a
Parents: 6db37f3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 20 10:34:11 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 20 10:34:11 2012 +0300
----------------------------------------------------------------------
.../protocol/ws/api/message/TextMessage.java | 12 +++++++-----
.../protocol/ws/util/tester/WebSocketTestPage.java | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/68c97c26/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/TextMessage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/TextMessage.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/TextMessage.java
index dec988e..5893b05 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/TextMessage.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/TextMessage.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.ws.api.message;
+import org.apache.wicket.util.lang.Args;
+
/**
* A {@link IWebSocketMessage message} with text data
*
@@ -23,15 +25,15 @@ package org.apache.wicket.protocol.ws.api.message;
*/
public class TextMessage implements IWebSocketMessage
{
- private final CharSequence message;
+ private final CharSequence text;
- public TextMessage(final CharSequence message)
+ public TextMessage(final CharSequence text)
{
- this.message = message;
+ this.text = Args.notEmpty(text, "text");
}
- public final String getMessage()
+ public final String getText()
{
- return message.toString();
+ return text.toString();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/68c97c26/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTestPage.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTestPage.java
index e99da41..8fe55e7 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTestPage.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTestPage.java
@@ -43,7 +43,7 @@ class WebSocketTestPage extends WebPage implements IMarkupResourceStreamProvider
protected void onMessage(WebSocketRequestHandler handler, TextMessage message)
{
// assert the inbould message
- Assert.assertEquals(expectedMessage, message.getMessage());
+ Assert.assertEquals(expectedMessage, message.getText());
// now send an outbound message
handler.push(Strings.capitalize(expectedMessage));