Author: markt
Date: Wed Feb 20 17:07:35 2013
New Revision: 1448300
URL: http://svn.apache.org/r1448300
Log:
Make parameter name consistent
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
Wed Feb 20 17:07:35 2013
@@ -34,7 +34,8 @@ public class PojoEndpointConfiguration e
public PojoEndpointConfiguration(Class<?> pojoClass,
- PojoMethodMapping methodMapping, Map<String,String>
pathParameters) {
+ PojoMethodMapping methodMapping,
+ Map<String,String> pathParameters) {
super(PojoEndpoint.class, methodMapping.getWsPath());
this.pojoClass = pojoClass;
this.methodMapping = methodMapping;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
Wed Feb 20 17:07:35 2013
@@ -36,8 +36,8 @@ public abstract class PojoMessageHandler
public PojoMessageHandlerAsyncBase(Object pojo, Method method,
Session session, Object[] params, int indexPayload,
- boolean wrap, int indexBoolean, int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap,
+ boolean unwrap, int indexBoolean, int indexSession) {
+ super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
this.indexBoolean = indexBoolean;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
Wed Feb 20 17:07:35 2013
@@ -28,9 +28,9 @@ public class PojoMessageHandlerAsyncBina
extends PojoMessageHandlerAsyncBase<ByteBuffer>{
public PojoMessageHandlerAsyncBinary(Object pojo, Method method,
- Session session, Object[] params, int indexPayload, boolean wrap,
+ Session session, Object[] params, int indexPayload, boolean unwrap,
int indexBoolean, int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap, indexBoolean,
+ super(pojo, method, session, params, indexPayload, unwrap,
indexBoolean,
indexSession);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
Wed Feb 20 17:07:35 2013
@@ -27,9 +27,9 @@ public class PojoMessageHandlerAsyncStri
extends PojoMessageHandlerAsyncBase<String>{
public PojoMessageHandlerAsyncString(Object pojo, Method method,
- Session session, Object[] params, int indexPayload, boolean wrap,
+ Session session, Object[] params, int indexPayload, boolean unwrap,
int indexBoolean, int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap, indexBoolean,
+ super(pojo, method, session, params, indexPayload, unwrap,
indexBoolean,
indexSession);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
Wed Feb 20 17:07:35 2013
@@ -34,8 +34,8 @@ public abstract class PojoMessageHandler
public PojoMessageHandlerBasicBase(Object pojo, Method method,
Session session, Object[] params, int indexPayload,
- boolean wrap, int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap,
+ boolean unwrap, int indexSession) {
+ super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
Wed Feb 20 17:07:35 2013
@@ -28,8 +28,8 @@ public class PojoMessageHandlerBasicBina
extends PojoMessageHandlerBasicBase<ByteBuffer> {
public PojoMessageHandlerBasicBinary(Object pojo, Method method,
- Session session, Object[] params, int indexPayload, boolean wrap,
+ Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap, indexSession);
+ super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
Wed Feb 20 17:07:35 2013
@@ -28,8 +28,8 @@ public class PojoMessageHandlerBasicPong
extends PojoMessageHandlerBasicBase<PongMessage> {
public PojoMessageHandlerBasicPong(Object pojo, Method method,
- Session session, Object[] params, int indexPayload, boolean wrap,
+ Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap, indexSession);
+ super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java?rev=1448300&r1=1448299&r2=1448300&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
Wed Feb 20 17:07:35 2013
@@ -27,8 +27,9 @@ public class PojoMessageHandlerBasicStri
extends PojoMessageHandlerBasicBase<String> {
public PojoMessageHandlerBasicString(Object pojo, Method method,
- Session session, Object[] params, int indexPayload, boolean wrap,
+ Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
- super(pojo, method, session, params, indexPayload, wrap, indexSession);
+ super(pojo, method, session, params, indexPayload, unwrap,
+ indexSession);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
