Author: markt
Date: Mon Feb 25 12:30:22 2013
New Revision: 1449682
URL: http://svn.apache.org/r1449682
Log:
Pull up duplicate code to new abstract base class
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java?rev=1449682&r1=1449681&r2=1449682&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
Mon Feb 25 12:30:22 2013
@@ -16,53 +16,17 @@
*/
package org.apache.tomcat.websocket;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.Future;
import javax.websocket.RemoteEndpoint;
import javax.websocket.SendHandler;
-// TODO Use a common base class
-public class WsRemoteEndpointAsync implements RemoteEndpoint.Async {
-
- private final WsRemoteEndpointImplBase base;
-
+public class WsRemoteEndpointAsync extends WsRemoteEndpointBase
+ implements RemoteEndpoint.Async {
WsRemoteEndpointAsync(WsRemoteEndpointImplBase base) {
- this.base = base;
- }
-
-
- @Override
- public void setBatchingAllowed(boolean batchingAllowed) throws IOException
{
- base.setBatchingAllowed(batchingAllowed);
- }
-
-
- @Override
- public boolean getBatchingAllowed() {
- return base.getBatchingAllowed();
- }
-
-
- @Override
- public void flushBatch() throws IOException {
- base.flushBatch();
- }
-
-
- @Override
- public void sendPing(ByteBuffer applicationData) throws IOException,
- IllegalArgumentException {
- base.sendPing(applicationData);
- }
-
-
- @Override
- public void sendPong(ByteBuffer applicationData) throws IOException,
- IllegalArgumentException {
- base.sendPong(applicationData);
+ super(base);
}
Added: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1449682&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Mon
Feb 25 12:30:22 2013
@@ -0,0 +1,64 @@
+/*
+ * 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.tomcat.websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import javax.websocket.RemoteEndpoint;
+
+public abstract class WsRemoteEndpointBase implements RemoteEndpoint {
+
+ protected final WsRemoteEndpointImplBase base;
+
+
+ WsRemoteEndpointBase(WsRemoteEndpointImplBase base) {
+ this.base = base;
+ }
+
+
+ @Override
+ public final void setBatchingAllowed(boolean batchingAllowed) throws
IOException {
+ base.setBatchingAllowed(batchingAllowed);
+ }
+
+
+ @Override
+ public final boolean getBatchingAllowed() {
+ return base.getBatchingAllowed();
+ }
+
+
+ @Override
+ public final void flushBatch() throws IOException {
+ base.flushBatch();
+ }
+
+
+ @Override
+ public final void sendPing(ByteBuffer applicationData) throws IOException,
+ IllegalArgumentException {
+ base.sendPing(applicationData);
+ }
+
+
+ @Override
+ public final void sendPong(ByteBuffer applicationData) throws IOException,
+ IllegalArgumentException {
+ base.sendPong(applicationData);
+ }
+}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java?rev=1449682&r1=1449681&r2=1449682&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
Mon Feb 25 12:30:22 2013
@@ -24,46 +24,11 @@ import java.nio.ByteBuffer;
import javax.websocket.EncodeException;
import javax.websocket.RemoteEndpoint;
-//TODO Use a common base class
-public class WsRemoteEndpointBasic implements RemoteEndpoint.Basic {
-
- private final WsRemoteEndpointImplBase base;
-
+public class WsRemoteEndpointBasic extends WsRemoteEndpointBase
+ implements RemoteEndpoint.Basic {
WsRemoteEndpointBasic(WsRemoteEndpointImplBase base) {
- this.base = base;
- }
-
-
- @Override
- public void setBatchingAllowed(boolean batchingAllowed) throws IOException
{
- base.setBatchingAllowed(batchingAllowed);
- }
-
-
- @Override
- public boolean getBatchingAllowed() {
- return base.getBatchingAllowed();
- }
-
-
- @Override
- public void flushBatch() throws IOException {
- base.flushBatch();
- }
-
-
- @Override
- public void sendPing(ByteBuffer applicationData) throws IOException,
- IllegalArgumentException {
- base.sendPing(applicationData);
- }
-
-
- @Override
- public void sendPong(ByteBuffer applicationData) throws IOException,
- IllegalArgumentException {
- base.sendPong(applicationData);
+ super(base);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
