Author: violetagg Date: Wed Sep 17 13:27:37 2014 New Revision: 1625580 URL: http://svn.apache.org/r1625580 Log: Merged revision 1623236 from tomcat/trunk: Fix some checkstyle GenericWhitespace issues.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestUtil.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1623236 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Wed Sep 17 13:27:37 2014 @@ -349,7 +349,7 @@ public class WsWebSocketContainer WsSession wsSession = new WsSession(endpoint, wsRemoteEndpointClient, this, null, null, null, null, null, subProtocol, - Collections.<String, String> emptyMap(), secure, + Collections.<String,String>emptyMap(), secure, clientEndpointConfiguration); WsFrameClient wsFrameClient = new WsFrameClient(response, channel, Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java Wed Sep 17 13:27:37 2014 @@ -36,7 +36,7 @@ public class PojoEndpointClient extends setPojo(pojo); setMethodMapping( new PojoMethodMapping(pojo.getClass(), decoders, null)); - setPathParameters(Collections.<String, String> emptyMap()); + setPathParameters(Collections.<String,String>emptyMap()); } @Override Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java Wed Sep 17 13:27:37 2014 @@ -25,7 +25,7 @@ import javax.websocket.Session; * ByteBuffer specific concrete implementation for handling partial messages. */ public class PojoMessageHandlerPartialBinary - extends PojoMessageHandlerPartialBase<ByteBuffer>{ + extends PojoMessageHandlerPartialBase<ByteBuffer> { public PojoMessageHandlerPartialBinary(Object pojo, Method method, Session session, Object[] params, int indexPayload, boolean convert, Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java Wed Sep 17 13:27:37 2014 @@ -24,7 +24,7 @@ import javax.websocket.Session; * Text specific concrete implementation for handling partial messages. */ public class PojoMessageHandlerPartialText - extends PojoMessageHandlerPartialBase<String>{ + extends PojoMessageHandlerPartialBase<String> { public PojoMessageHandlerPartialText(Object pojo, Method method, Session session, Object[] params, int indexPayload, boolean convert, Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Wed Sep 17 13:27:37 2014 @@ -339,8 +339,7 @@ public class WsServerContainer extends W // Check an exact match. Simple case as there are no templates. ServerEndpointConfig sec = configExactMatchMap.get(path); if (sec != null) { - return new WsMappingResult(sec, - Collections.<String, String> emptyMap()); + return new WsMappingResult(sec, Collections.<String, String>emptyMap()); } // No exact match. Need to look for template matches. Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestUtil.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestUtil.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestUtil.java Wed Sep 17 13:27:37 2014 @@ -140,14 +140,11 @@ public class TestUtil { } - private abstract static class GenericMessageHandler<T> - implements MessageHandler.Whole<T> { + private abstract static class GenericMessageHandler<T> implements MessageHandler.Whole<T> { } - private static class GenericSubMessageHandler - extends GenericMessageHandler<String>{ - + private static class GenericSubMessageHandler extends GenericMessageHandler<String> { @Override public void onMessage(String message) { // NO-OP @@ -242,8 +239,7 @@ public class TestUtil { } - private static class GenericSubEncoder - extends GenericEncoder<String>{ + private static class GenericSubEncoder extends GenericEncoder<String> { @Override public String encode(String object) throws EncodeException { Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1625580&r1=1625579&r2=1625580&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Wed Sep 17 13:27:37 2014 @@ -69,15 +69,13 @@ public class TestEncodingDecoding extend public void testProgrammaticEndPoints() throws Exception{ Tomcat tomcat = getTomcatInstance(); // Must have a real docBase - just use temp - Context ctx = - tomcat.addContext("", System.getProperty("java.io.tmpdir")); + Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); ctx.addApplicationListener( ProgramaticServerEndpointConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); - WebSocketContainer wsContainer = - ContainerProvider.getWebSocketContainer(); + WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer(); tomcat.start(); @@ -344,8 +342,7 @@ public class TestEncodingDecoding extend } - public static class MsgStringMessageHandler - implements MessageHandler.Whole<MsgString>{ + public static class MsgStringMessageHandler implements MessageHandler.Whole<MsgString> { public static Queue<Object> received = new ConcurrentLinkedQueue<Object>(); private final Session session; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org