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/21 09:38:57 UTC
git commit: WICKET-4611 Rename WebSocketConnection to
IWebSocketConnection
Updated Branches:
refs/heads/master f54a2046b -> 7b3c80df9
WICKET-4611 Rename WebSocketConnection to IWebSocketConnection
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7b3c80df
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7b3c80df
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7b3c80df
Branch: refs/heads/master
Commit: 7b3c80df99d27747a56e1ea2eb021313682d44dc
Parents: f54a204
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 21 10:38:03 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 21 10:38:03 2012 +0300
----------------------------------------------------------------------
.../wicket/ajax/WebSocketRequestHandler.java | 6 +-
.../ws/api/AbstractWebSocketProcessor.java | 4 +-
.../protocol/ws/api/IWebSocketConnection.java | 67 +++++++++++++++
.../ws/api/IWebSocketConnectionRegistry.java | 4 +-
.../ws/api/SimpleWebSocketConnectionRegistry.java | 18 ++--
.../protocol/ws/api/WebSocketConnection.java | 67 ---------------
.../wicket/protocol/ws/api/WebSocketResponse.java | 8 +-
.../ws/util/tester/TestWebSocketConnection.java | 8 +-
.../ws/jetty/JettyWebSocketConnection.java | 8 +-
.../ws/tomcat7/TomcatWebSocketConnection.java | 6 +-
10 files changed, 98 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/ajax/WebSocketRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/ajax/WebSocketRequestHandler.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/ajax/WebSocketRequestHandler.java
index 1974ef4..178022b 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/ajax/WebSocketRequestHandler.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/ajax/WebSocketRequestHandler.java
@@ -24,7 +24,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.core.request.handler.logger.PageLogData;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.protocol.ws.api.WebSocketConnection;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.request.ILogData;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.Response;
@@ -50,13 +50,13 @@ public class WebSocketRequestHandler implements AjaxRequestTarget, IWebSocketReq
private final Page page;
- private final WebSocketConnection connection;
+ private final IWebSocketConnection connection;
private final AbstractAjaxResponse ajaxResponse;
private PageLogData logData;
- public WebSocketRequestHandler(final Component component, final WebSocketConnection connection)
+ public WebSocketRequestHandler(final Component component, final IWebSocketConnection connection)
{
this.page = Args.notNull(component, "component").getPage();
this.connection = Args.notNull(connection, "connection");
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
index 94dceca..07c4fd3 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
@@ -104,7 +104,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
* the web socket connection to use to communicate with the client
* @see #onOpen(Object)
*/
- protected final void onConnect(final WebSocketConnection connection)
+ protected final void onConnect(final IWebSocketConnection connection)
{
connectionRegistry.setConnection(getApplication(), getSessionId(), pageId, connection);
broadcastMessage(new ConnectedMessage(getApplication(), getSessionId(), pageId));
@@ -131,7 +131,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
*/
protected final void broadcastMessage(final IWebSocketMessage message)
{
- WebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageId);
+ IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageId);
if (connection != null && connection.isOpen())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnection.java
new file mode 100644
index 0000000..37a91bf
--- /dev/null
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnection.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.protocol.ws.api;
+
+import java.io.IOException;
+
+/**
+ * Common interface for native WebSocket connections
+ *
+ * @since 6.0
+ */
+public interface IWebSocketConnection
+{
+ /**
+ * @return {@code true} when the underlying native web socket
+ * connection is still open.
+ */
+ boolean isOpen();
+
+ /**
+ * Closes the underlying web socket connection
+ *
+ * @param code
+ * the status code
+ * @param reason
+ * the reason to close the connection
+ */
+ void close(int code, String reason);
+
+ /**
+ * Sends a text message to the client.
+ *
+ * @param message
+ * the text message
+ * @return {@code this} object, for chaining methods
+ * @throws IOException when an IO error occurs during the write to the client
+ */
+ IWebSocketConnection sendMessage(String message) throws IOException;
+
+ /**
+ * Sends a binary message to the client.
+ *
+ * @param message
+ * the binary message
+ * @param offset
+ * the offset to read from
+ * @param length
+ * how much data to read
+ * @return {@code this} object, for chaining methods
+ * @throws IOException when an IO error occurs during the write to the client
+ */
+ IWebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnectionRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnectionRegistry.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnectionRegistry.java
index b5df5d2..30b08df 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnectionRegistry.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/IWebSocketConnectionRegistry.java
@@ -34,7 +34,7 @@ public interface IWebSocketConnectionRegistry
* the web socket client page id
* @return the web socket connection used by a client from the specified coordinates
*/
- WebSocketConnection getConnection(Application application, String sessionId, Integer pageId);
+ IWebSocketConnection getConnection(Application application, String sessionId, Integer pageId);
/**
* Adds a new connection into the registry at the specified coordinates (application+session+page)
@@ -48,7 +48,7 @@ public interface IWebSocketConnectionRegistry
* @param connection
* the web socket connection to add
*/
- void setConnection(Application application, String sessionId, Integer pageId, WebSocketConnection connection);
+ void setConnection(Application application, String sessionId, Integer pageId, IWebSocketConnection connection);
/**
* Removes a web socket connection from the registry at the specified coordinates (application+session+page)
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
index 5a43886..63242a6 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/SimpleWebSocketConnectionRegistry.java
@@ -33,23 +33,23 @@ import org.apache.wicket.util.lang.Generics;
*/
public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRegistry
{
- private static final MetaDataKey<ConcurrentMap<String, ConcurrentMap<Integer, WebSocketConnection>>> KEY =
- new MetaDataKey<ConcurrentMap<String, ConcurrentMap<Integer, WebSocketConnection>>>()
+ private static final MetaDataKey<ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>>> KEY =
+ new MetaDataKey<ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>>>()
{
};
@Override
- public WebSocketConnection getConnection(Application application, String sessionId, Integer pageId)
+ public IWebSocketConnection getConnection(Application application, String sessionId, Integer pageId)
{
Args.notNull(application, "application");
Args.notNull(sessionId, "sessionId");
Args.notNull(pageId, "pageId");
- WebSocketConnection connection = null;
- ConcurrentMap<String, ConcurrentMap<Integer, WebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
+ IWebSocketConnection connection = null;
+ ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
if (connectionsBySession != null)
{
- ConcurrentMap<Integer, WebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
+ ConcurrentMap<Integer, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
if (connectionsByPage != null)
{
connection = connectionsByPage.get(pageId);
@@ -59,13 +59,13 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
}
@Override
- public void setConnection(Application application, String sessionId, Integer pageId, WebSocketConnection connection)
+ public void setConnection(Application application, String sessionId, Integer pageId, IWebSocketConnection connection)
{
Args.notNull(application, "application");
Args.notNull(sessionId, "sessionId");
Args.notNull(pageId, "pageId");
- ConcurrentMap<String, ConcurrentMap<Integer, WebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
+ ConcurrentMap<String, ConcurrentMap<Integer, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
if (connectionsBySession == null)
{
synchronized (KEY)
@@ -79,7 +79,7 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
}
}
- ConcurrentMap<Integer, WebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
+ ConcurrentMap<Integer, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
if (connectionsByPage == null && connection != null)
{
synchronized (connectionsBySession)
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketConnection.java
deleted file mode 100644
index 1541dc7..0000000
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketConnection.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.protocol.ws.api;
-
-import java.io.IOException;
-
-/**
- * Common interface for native WebSocket connections
- *
- * @since 6.0
- */
-public interface WebSocketConnection
-{
- /**
- * @return {@code true} when the underlying native web socket
- * connection is still open.
- */
- boolean isOpen();
-
- /**
- * Closes the underlying web socket connection
- *
- * @param code
- * the status code
- * @param reason
- * the reason to close the connection
- */
- void close(int code, String reason);
-
- /**
- * Sends a text message to the client.
- *
- * @param message
- * the text message
- * @return {@code this} object, for chaining methods
- * @throws IOException when an IO error occurs during the write to the client
- */
- WebSocketConnection sendMessage(String message) throws IOException;
-
- /**
- * Sends a binary message to the client.
- *
- * @param message
- * the binary message
- * @param offset
- * the offset to read from
- * @param length
- * how much data to read
- * @return {@code this} object, for chaining methods
- * @throws IOException when an IO error occurs during the write to the client
- */
- WebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException;
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java
index c572436..8659936 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketResponse.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
* A {@link Response} used to cache the written data to the web socket client
* when Wicket thread locals are available.
*
- * When the thread locals are not available then you can write directly to the {@link WebSocketConnection}
+ * When the thread locals are not available then you can write directly to the {@link IWebSocketConnection}
* taken from {@link SimpleWebSocketConnectionRegistry}. In this case the response wont be cached.
*
* @since 6.0
@@ -36,13 +36,13 @@ public class WebSocketResponse extends Response
{
private static final Logger LOG = LoggerFactory.getLogger(WebSocketResponse.class);
- private final WebSocketConnection connection;
+ private final IWebSocketConnection connection;
private StringBuilder text;
private ByteArrayOutputStream binary;
- public WebSocketResponse(final WebSocketConnection conn)
+ public WebSocketResponse(final IWebSocketConnection conn)
{
this.connection = conn;
}
@@ -129,7 +129,7 @@ public class WebSocketResponse extends Response
}
@Override
- public final WebSocketConnection getContainerResponse()
+ public final IWebSocketConnection getContainerResponse()
{
return connection;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketConnection.java
index f530b48..a5c1544 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketConnection.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketConnection.java
@@ -18,14 +18,14 @@ package org.apache.wicket.protocol.ws.util.tester;
import java.io.IOException;
-import org.apache.wicket.protocol.ws.api.WebSocketConnection;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
/**
* A WebSocketConnection used for the testing.
*
* @since 6.0
*/
-abstract class TestWebSocketConnection implements WebSocketConnection
+abstract class TestWebSocketConnection implements IWebSocketConnection
{
private boolean isOpen = true;
@@ -42,7 +42,7 @@ abstract class TestWebSocketConnection implements WebSocketConnection
}
@Override
- public WebSocketConnection sendMessage(String message) throws IOException
+ public IWebSocketConnection sendMessage(String message) throws IOException
{
checkOpenness();
onOutMessage(message);
@@ -50,7 +50,7 @@ abstract class TestWebSocketConnection implements WebSocketConnection
}
@Override
- public WebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException
+ public IWebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException
{
checkOpenness();
onOutMessage(message, offset, length);
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
index d38652d..31eaca9 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
@@ -18,7 +18,7 @@ package org.apache.wicket.protocol.ws.jetty;
import java.io.IOException;
-import org.apache.wicket.protocol.ws.api.WebSocketConnection;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.util.lang.Args;
import org.eclipse.jetty.websocket.WebSocket;
@@ -27,7 +27,7 @@ import org.eclipse.jetty.websocket.WebSocket;
*
* @since 6.0
*/
-public class JettyWebSocketConnection implements WebSocketConnection
+public class JettyWebSocketConnection implements IWebSocketConnection
{
private WebSocket.Connection connection;
@@ -52,7 +52,7 @@ public class JettyWebSocketConnection implements WebSocketConnection
}
@Override
- public WebSocketConnection sendMessage(String message) throws IOException
+ public IWebSocketConnection sendMessage(String message) throws IOException
{
checkClosed();
@@ -61,7 +61,7 @@ public class JettyWebSocketConnection implements WebSocketConnection
}
@Override
- public WebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException
+ public IWebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException
{
checkClosed();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b3c80df/wicket-experimental/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/TomcatWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/TomcatWebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/TomcatWebSocketConnection.java
index ffd97a1..969ed03 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/TomcatWebSocketConnection.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/TomcatWebSocketConnection.java
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import org.apache.catalina.websocket.WsOutbound;
-import org.apache.wicket.protocol.ws.api.WebSocketConnection;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
*
* @since 6.0
*/
-public class TomcatWebSocketConnection implements WebSocketConnection
+public class TomcatWebSocketConnection implements IWebSocketConnection
{
private static final Logger LOG = LoggerFactory.getLogger(TomcatWebSocketConnection.class);
@@ -69,7 +69,7 @@ public class TomcatWebSocketConnection implements WebSocketConnection
}
@Override
- public WebSocketConnection sendMessage(String message) throws IOException
+ public IWebSocketConnection sendMessage(String message) throws IOException
{
checkClosed();