Author: markt
Date: Thu Mar 7 22:46:49 2013
New Revision: 1454145
URL: http://svn.apache.org/r1454145
Log:
Align pojo package with async->partial and basic->whole renaming in API
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
- copied, changed from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
Removed:
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/PojoMethodMapping.java
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
Thu Mar 7 22:46:49 2013
@@ -24,17 +24,17 @@ import javax.websocket.MessageHandler;
import javax.websocket.Session;
/**
- * Common implementation code for the POJO asynchronous message handlers. All
+ * Common implementation code for the POJO partial message handlers. All
* the real work is done in this class and in the superclass.
*
* @param <T> The type of message to handle
*/
-public abstract class PojoMessageHandlerAsyncBase<T>
+public abstract class PojoMessageHandlerPartialBase<T>
extends PojoMessageHandlerBase<T> implements MessageHandler.Partial<T>
{
private final int indexBoolean;
- public PojoMessageHandlerAsyncBase(Object pojo, Method method,
+ public PojoMessageHandlerPartialBase(Object pojo, Method method,
Session session, Object[] params, int indexPayload,
boolean unwrap, int indexBoolean, int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
Thu Mar 7 22:46:49 2013
@@ -22,12 +22,12 @@ import java.nio.ByteBuffer;
import javax.websocket.Session;
/**
- * ByteBuffer specific concrete asynchronous implementation.
+ * ByteBuffer specific concrete partial implementation.
*/
-public class PojoMessageHandlerAsyncBinary
- extends PojoMessageHandlerAsyncBase<ByteBuffer>{
+public class PojoMessageHandlerPartialBinary
+ extends PojoMessageHandlerPartialBase<ByteBuffer>{
- public PojoMessageHandlerAsyncBinary(Object pojo, Method method,
+ public PojoMessageHandlerPartialBinary(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean unwrap,
int indexBoolean, int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
indexBoolean,
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
Thu Mar 7 22:46:49 2013
@@ -21,12 +21,12 @@ import java.lang.reflect.Method;
import javax.websocket.Session;
/**
- * String specific concrete asynchronous implementation.
+ * String specific concrete partial implementation.
*/
-public class PojoMessageHandlerAsyncString
- extends PojoMessageHandlerAsyncBase<String>{
+public class PojoMessageHandlerPartialString
+ extends PojoMessageHandlerPartialBase<String>{
- public PojoMessageHandlerAsyncString(Object pojo, Method method,
+ public PojoMessageHandlerPartialString(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean unwrap,
int indexBoolean, int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
indexBoolean,
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
Thu Mar 7 22:46:49 2013
@@ -24,15 +24,15 @@ import javax.websocket.MessageHandler;
import javax.websocket.Session;
/**
- * Common implementation code for the POJO basic message handlers. All the real
+ * Common implementation code for the POJO whole message handlers. All the real
* work is done in this class and in the superclass.
*
* @param <T> The type of message to handle
*/
-public abstract class PojoMessageHandlerBasicBase<T>
+public abstract class PojoMessageHandlerWholeBase<T>
extends PojoMessageHandlerBase<T> implements MessageHandler.Whole<T> {
- public PojoMessageHandlerBasicBase(Object pojo, Method method,
+ public PojoMessageHandlerWholeBase(Object pojo, Method method,
Session session, Object[] params, int indexPayload,
boolean unwrap, int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
Thu Mar 7 22:46:49 2013
@@ -22,12 +22,12 @@ import java.nio.ByteBuffer;
import javax.websocket.Session;
/**
- * ByteBuffer specific concrete basic implementation.
+ * ByteBuffer specific concrete whole message implementation.
*/
-public class PojoMessageHandlerBasicBinary
- extends PojoMessageHandlerBasicBase<ByteBuffer> {
+public class PojoMessageHandlerWholeBinary
+ extends PojoMessageHandlerWholeBase<ByteBuffer> {
- public PojoMessageHandlerBasicBinary(Object pojo, Method method,
+ public PojoMessageHandlerWholeBinary(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
Thu Mar 7 22:46:49 2013
@@ -22,12 +22,12 @@ import javax.websocket.PongMessage;
import javax.websocket.Session;
/**
- * PongMessage specific concrete basic implementation.
+ * PongMessage specific concrete whole message implementation.
*/
-public class PojoMessageHandlerBasicPong
- extends PojoMessageHandlerBasicBase<PongMessage> {
+public class PojoMessageHandlerWholePong
+ extends PojoMessageHandlerWholeBase<PongMessage> {
- public PojoMessageHandlerBasicPong(Object pojo, Method method,
+ public PojoMessageHandlerWholePong(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
indexSession);
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
(from r1453502,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java&r1=1453502&r2=1454145&rev=1454145&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
Thu Mar 7 22:46:49 2013
@@ -21,12 +21,12 @@ import java.lang.reflect.Method;
import javax.websocket.Session;
/**
- * String specific concrete basic implementation.
+ * String specific concrete whole message implementation.
*/
-public class PojoMessageHandlerBasicString
- extends PojoMessageHandlerBasicBase<String> {
+public class PojoMessageHandlerWholeString
+ extends PojoMessageHandlerWholeBase<String> {
- public PojoMessageHandlerBasicString(Object pojo, Method method,
+ public PojoMessageHandlerWholeString(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean unwrap,
int indexSession) {
super(pojo, method, session, params, indexPayload, unwrap,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1454145&r1=1454144&r2=1454145&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Thu Mar 7 22:46:49 2013
@@ -348,30 +348,30 @@ public class PojoMethodMapping {
if (indexBoolean == -1) {
// Basic
if (indexString != -1) {
- mh = new PojoMessageHandlerBasicString(pojo, m, session,
+ mh = new PojoMessageHandlerWholeString(pojo, m, session,
params, indexString, false, indexSession);
} else if (indexByteArray != -1) {
- mh = new PojoMessageHandlerBasicBinary(pojo, m, session,
+ mh = new PojoMessageHandlerWholeBinary(pojo, m, session,
params, indexByteArray, true, indexSession);
} else if (indexByteBuffer != -1) {
- mh = new PojoMessageHandlerBasicBinary(pojo, m, session,
+ mh = new PojoMessageHandlerWholeBinary(pojo, m, session,
params, indexByteBuffer, false, indexSession);
} else {
- mh = new PojoMessageHandlerBasicPong(pojo, m, session,
+ mh = new PojoMessageHandlerWholePong(pojo, m, session,
params, indexPong, false, indexSession);
}
} else {
// ASync
if (indexString != -1) {
- mh = new PojoMessageHandlerAsyncString(pojo, m, session,
+ mh = new PojoMessageHandlerPartialString(pojo, m, session,
params, indexString, false, indexBoolean,
indexSession);
} else if (indexByteArray != -1) {
- mh = new PojoMessageHandlerAsyncBinary(pojo, m, session,
+ mh = new PojoMessageHandlerPartialBinary(pojo, m, session,
params, indexByteArray, true, indexBoolean,
indexSession);
} else {
- mh = new PojoMessageHandlerAsyncBinary(pojo, m, session,
+ mh = new PojoMessageHandlerPartialBinary(pojo, m, session,
params, indexByteBuffer, false, indexBoolean,
indexSession);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
