Author: markt
Date: Tue Feb 19 19:48:47 2013
New Revision: 1447883
URL: http://svn.apache.org/r1447883
Log:
UCDetector
- use final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Tue Feb 19
19:48:47 2013
@@ -28,28 +28,14 @@ import java.nio.charset.CodingErrorActio
*/
public final class C2BConverter {
- /**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
- @Deprecated
- protected CharsetEncoder encoder = null;
- /**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
- @Deprecated
- protected ByteBuffer bb = null;
- /**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
- @Deprecated
- protected CharBuffer cb = null;
+ private final CharsetEncoder encoder;
+ private ByteBuffer bb = null;
+ private CharBuffer cb = null;
/**
* Leftover buffer used for multi-characters characters.
- * @deprecated Will be made private in Tomcat 8.0.x
*/
- @Deprecated
- protected CharBuffer leftovers = null;
+ private final CharBuffer leftovers;
public C2BConverter(String encoding) throws IOException {
encoder = B2CConverter.getCharset(encoding).newEncoder();
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Tue Feb 19
19:48:47 2013
@@ -519,7 +519,7 @@ public final class MessageBytes implemen
private static final MessageBytesFactory factory=new MessageBytesFactory();
- public static class MessageBytesFactory {
+ private static class MessageBytesFactory {
protected MessageBytesFactory() {
}
public MessageBytes newInstance() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Tue Feb 19
19:48:47 2013
@@ -29,7 +29,7 @@ import java.io.IOException;
*/
public final class UDecoder {
- protected static final boolean ALLOW_ENCODED_SLASH =
+ private static final boolean ALLOW_ENCODED_SLASH =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false")).booleanValue();
private static class DecodeException extends CharConversionException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
