Author: markt Date: Wed Aug 4 22:50:52 2010 New Revision: 982428 URL: http://svn.apache.org/viewvc?rev=982428&view=rev Log: Couple more whitespace checks. In both cases went with the nospace option since that is what the majority of the current code uses
Modified: tomcat/trunk/checkstyle.xml tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/checkstyle.xml (original) +++ tomcat/trunk/checkstyle.xml Wed Aug 4 22:50:52 2010 @@ -53,5 +53,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078 <module name="GenericWhitespace"/> --> + <module name="EmptyForInitializerPad"/> + <module name="EmptyForIteratorPad"/> </module> </module> \ No newline at end of file Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed Aug 4 22:50:52 2010 @@ -673,7 +673,7 @@ public class Tomcat { ctx.setSessionTimeout(30); // MIME mappings - for (int i = 0; i < DEFAULT_MIME_MAPPINGS.length; ) { + for (int i = 0; i < DEFAULT_MIME_MAPPINGS.length;) { ctx.addMimeMapping(DEFAULT_MIME_MAPPINGS[i++], DEFAULT_MIME_MAPPINGS[i++]); } Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Wed Aug 4 22:50:52 2010 @@ -202,7 +202,7 @@ public class NioReceiver extends Receive Selector tmpsel = selector; Set<SelectionKey> keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null; if ( keys == null ) return; - for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext(); ) { + for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext();) { SelectionKey key = iter.next(); try { // if (key.interestOps() == SelectionKey.OP_READ) { Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java Wed Aug 4 22:50:52 2010 @@ -288,7 +288,7 @@ public class ParallelNioSender extends A @Override public boolean keepalive() { boolean result = false; - for ( Iterator<Entry<Member, NioSender>> i = nioSenders.entrySet().iterator(); i.hasNext(); ) { + for ( Iterator<Entry<Member, NioSender>> i = nioSenders.entrySet().iterator(); i.hasNext();) { Map.Entry<Member, NioSender> entry = i.next(); NioSender sender = entry.getValue(); if ( sender.keepalive() ) { Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed Aug 4 22:50:52 2010 @@ -708,7 +708,7 @@ public abstract class AbstractHttp11Proc if (Ascii.toLower(buff[i]) != first) continue; // found first char, now look for a match int myPos = i+1; - for (int srcPos = 1; srcPos < srcEnd; ) { + for (int srcPos = 1; srcPos < srcEnd;) { if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) break; if (srcPos == srcEnd) return i - start; // found it Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Aug 4 22:50:52 2010 @@ -1212,7 +1212,7 @@ public class Http11NioProcessor extends if (Ascii.toLower(buff[i]) != first) continue; // found first char, now look for a match int myPos = i+1; - for (int srcPos = 1; srcPos < srcEnd; ) { + for (int srcPos = 1; srcPos < srcEnd;) { if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) break; if (srcPos == srcEnd) return i - start; // found it Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Wed Aug 4 22:50:52 2010 @@ -652,7 +652,7 @@ public final class ByteChunk implements if (b1 == null || b2 == null || b2.length > len) { return false; } - for (int i = start, j = 0; i < end && j < b2.length; ) { + for (int i = start, j = 0; i < end && j < b2.length;) { if (b1[i++] != b2[j++]) return false; } @@ -690,7 +690,7 @@ public final class ByteChunk implements if( buff[i] != first ) continue; // found first char, now look for a match int myPos=i+1; - for( int srcPos=srcOff + 1; srcPos< srcEnd; ) { + for( int srcPos=srcOff + 1; srcPos< srcEnd;) { if( buff[myPos++] != src.charAt( srcPos++ )) continue mainLoop; } Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Wed Aug 4 22:50:52 2010 @@ -678,7 +678,7 @@ public final class CharChunk implements if( buff[i] != first ) continue; // found first char, now look for a match int myPos=i+1; - for( int srcPos=srcOff + 1; srcPos< srcEnd; ) { + for( int srcPos=srcOff + 1; srcPos< srcEnd;) { if( buff[myPos++] != src.charAt( srcPos++ )) break; if( srcPos==srcEnd ) return i-start; // found it Modified: tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java Wed Aug 4 22:50:52 2010 @@ -374,7 +374,7 @@ class NamesEnumerator implements Enumera private void findNext() { next=null; - for( ; pos< size; pos++ ) { + for(; pos< size; pos++ ) { next=headers.getName( pos ).toString(); for( int j=0; j<pos ; j++ ) { if( headers.getName( j ).equalsIgnoreCase( next )) { @@ -424,7 +424,7 @@ class ValuesEnumerator implements Enumer private void findNext() { next=null; - for( ; pos< size; pos++ ) { + for(; pos< size; pos++ ) { MessageBytes n1=headers.getName( pos ); if( n1.equalsIgnoreCase( name )) { next=headers.getValue( pos ); Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=982428&r1=982427&r2=982428&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Aug 4 22:50:52 2010 @@ -1328,7 +1328,7 @@ public class NioEndpoint extends Abstrac //timeout Set<SelectionKey> keys = selector.keys(); int keycount = 0; - for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext(); ) { + for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext();) { SelectionKey key = iter.next(); keycount++; try { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org