Author: markt
Date: Mon Feb 18 09:50:46 2013
New Revision: 1447173
URL: http://svn.apache.org/r1447173
Log:
Fix checkstyle warnings (sorry new laptop)
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Mon
Feb 18 09:50:46 2013
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
public class RewriteCond {
- public static abstract class Condition {
+ public abstract static class Condition {
public abstract boolean evaluate(String value, Resolver resolver);
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Mon Feb 18
09:50:46 2013
@@ -331,7 +331,7 @@ public class JspWriterImpl extends JspWr
private static final String lineSeparator =
- System.getProperty("line.separator");
+ System.getProperty("line.separator");
/**
* Write a line separator. The line separator string is defined by the
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Mon Feb 18
09:50:46 2013
@@ -52,7 +52,7 @@ public class Util {
private static final int HIGHEST_SPECIAL = '>';
private static final char[][] specialCharactersRepresentation =
- new char[HIGHEST_SPECIAL + 1][];
+ new char[HIGHEST_SPECIAL + 1][];
static {
specialCharactersRepresentation['&'] = "&".toCharArray();
@@ -273,14 +273,14 @@ public class Util {
@Override
public boolean isReady() {
- // Non-blocking IO not supported
+ // Non-blocking IO not supported
return false;
}
@Override
public void setWriteListener(WriteListener listener) {
- // Non-blocking IO not supported
- throw new UnsupportedOperationException();
+ // Non-blocking IO not supported
+ throw new UnsupportedOperationException();
}
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Mon
Feb 18 09:50:46 2013
@@ -960,7 +960,7 @@ public class XMLEncodingDetector {
// read characters
int count = fCurrentEntity.reader.read(fCurrentEntity.ch, offset,
- DEFAULT_XMLDECL_BUFFER_SIZE);
+ DEFAULT_XMLDECL_BUFFER_SIZE);
// reset count and position
boolean entityChanged = false;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Mon
Feb 18 09:50:46 2013
@@ -667,7 +667,7 @@ public abstract class WsRemoteEndpointBa
@Override
public SendResult get() throws InterruptedException,
- ExecutionException {
+ ExecutionException {
latch.await();
return result;
}
@@ -678,7 +678,7 @@ public abstract class WsRemoteEndpointBa
TimeoutException {
boolean retval = latch.await(timeout, unit);
if (retval == false) {
- throw new TimeoutException();
+ throw new TimeoutException();
}
return result;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Feb 18
09:50:46 2013
@@ -398,7 +398,7 @@ public class WsSession implements Sessio
close(new CloseReason(CloseCodes.GOING_AWAY,
sm.getString("wsSession.timeout")));
} catch (IOException e) {
- log.warn(sm.getString("wsSession.expireFailed"), e);
+ log.warn(sm.getString("wsSession.expireFailed"), e);
}
}
}
@@ -450,7 +450,7 @@ public class WsSession implements Sessio
superClassType.getActualTypeArguments()[
((Integer) result).intValue()]);
} else {
- // Error will be logged further up the call stack
+ // Error will be logged further up the call stack
return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
