Author: markt
Date: Thu Mar 7 22:51:52 2013
New Revision: 1454150
URL: http://svn.apache.org/r1454150
Log:
Align pojo package with String->Text renaming in API
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
- copied, changed from r1454145,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
- copied, changed from r1454145,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
(from r1454145,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java&r1=1454145&r2=1454150&rev=1454150&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
Thu Mar 7 22:51:52 2013
@@ -21,12 +21,12 @@ import java.lang.reflect.Method;
import javax.websocket.Session;
/**
- * String specific concrete partial implementation.
+ * Text specific concrete partial implementation.
*/
-public class PojoMessageHandlerPartialString
+public class PojoMessageHandlerPartialText
extends PojoMessageHandlerPartialBase<String>{
- public PojoMessageHandlerPartialString(Object pojo, Method method,
+ public PojoMessageHandlerPartialText(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/PojoMessageHandlerWholeText.java
(from r1454145,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java&r1=1454145&r2=1454150&rev=1454150&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
Thu Mar 7 22:51:52 2013
@@ -21,12 +21,12 @@ import java.lang.reflect.Method;
import javax.websocket.Session;
/**
- * String specific concrete whole message implementation.
+ * Text specific concrete whole message implementation.
*/
-public class PojoMessageHandlerWholeString
+public class PojoMessageHandlerWholeText
extends PojoMessageHandlerWholeBase<String> {
- public PojoMessageHandlerWholeString(Object pojo, Method method,
+ public PojoMessageHandlerWholeText(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=1454150&r1=1454149&r2=1454150&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:51:52 2013
@@ -348,7 +348,7 @@ public class PojoMethodMapping {
if (indexBoolean == -1) {
// Basic
if (indexString != -1) {
- mh = new PojoMessageHandlerWholeString(pojo, m, session,
+ mh = new PojoMessageHandlerWholeText(pojo, m, session,
params, indexString, false, indexSession);
} else if (indexByteArray != -1) {
mh = new PojoMessageHandlerWholeBinary(pojo, m, session,
@@ -363,7 +363,7 @@ public class PojoMethodMapping {
} else {
// ASync
if (indexString != -1) {
- mh = new PojoMessageHandlerPartialString(pojo, m, session,
+ mh = new PojoMessageHandlerPartialText(pojo, m, session,
params, indexString, false, indexBoolean,
indexSession);
} else if (indexByteArray != -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]