Author: markt
Date: Sun Jan 8 19:21:21 2012
New Revision: 1228925
URL: http://svn.apache.org/viewvc?rev=1228925&view=rev
Log:
Mark unused code as deprecated. It has been removed for 8.0.x onwards.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 8 19:21:21 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228922
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java Sun Jan 8
19:21:21 2012
@@ -75,8 +75,9 @@ public final class Ascii {
/**
* Returns the upper case equivalent of the specified ASCII character.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
-
+ @Deprecated
public static int toUpper(int c) {
return toUpper[c & 0xff] & 0xff;
}
@@ -91,32 +92,36 @@ public final class Ascii {
/**
* Returns true if the specified ASCII character is upper or lower case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
-
+ @Deprecated
public static boolean isAlpha(int c) {
return isAlpha[c & 0xff];
}
/**
* Returns true if the specified ASCII character is upper case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
-
+ @Deprecated
public static boolean isUpper(int c) {
return isUpper[c & 0xff];
}
/**
* Returns true if the specified ASCII character is lower case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
-
+ @Deprecated
public static boolean isLower(int c) {
return isLower[c & 0xff];
}
/**
* Returns true if the specified ASCII character is white space.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
-
+ @Deprecated
public static boolean isWhite(int c) {
return isWhite[c & 0xff];
}
@@ -135,7 +140,9 @@ public final class Ascii {
* @param off the start offset of the bytes
* @param len the length of the bytes
* @exception NumberFormatException if the integer format was invalid
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public static int parseInt(byte[] b, int off, int len)
throws NumberFormatException
{
@@ -157,6 +164,10 @@ public final class Ascii {
return n;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public static int parseInt(char[] b, int off, int len)
throws NumberFormatException
{
@@ -214,6 +225,10 @@ public final class Ascii {
return n;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public static long parseLong(char[] b, int off, int len)
throws NumberFormatException
{
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun
Jan 8 19:21:21 2012
@@ -81,6 +81,10 @@ public class B2CConverter {
private ReadConvertor conv;
private String encoding;
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
protected B2CConverter() {
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sun Jan
8 19:21:21 2012
@@ -141,7 +141,10 @@ public final class ByteChunk implements
allocate( initial, -1 );
}
- //--------------------
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public ByteChunk getClone() {
try {
return (ByteChunk)this.clone();
@@ -195,6 +198,10 @@ public final class ByteChunk implements
isSet=true;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public void setOptimizedWrite(boolean optimizedWrite) {
this.optimizedWrite = optimizedWrite;
}
@@ -295,7 +302,9 @@ public final class ByteChunk implements
*
* @param c
* @throws IOException
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void append( char c )
throws IOException
{
@@ -399,6 +408,10 @@ public final class ByteChunk implements
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int substract(ByteChunk src)
throws IOException {
@@ -538,6 +551,10 @@ public final class ByteChunk implements
return new String(cb.array(), cb.arrayOffset(), cb.length());
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int getInt()
{
return Ascii.parseInt(buff, start,end-start);
@@ -646,7 +663,9 @@ public final class ByteChunk implements
/**
* Returns true if the message bytes starts with the specified string.
* @param s the string
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public boolean startsWith(String s) {
// Works only if enc==UTF
byte[] b = buff;
@@ -663,7 +682,11 @@ public final class ByteChunk implements
return true;
}
- /* Returns true if the message bytes start with the specified byte array */
+ /**
+ * Returns true if the message bytes start with the specified byte array.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public boolean startsWith(byte[] b2) {
byte[] b1 = buff;
if (b1 == null && b2 == null) {
@@ -732,7 +755,10 @@ public final class ByteChunk implements
return hashBytes( buff, start, end-start);
}
- // hash ignoring case
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int hashIgnoreCase() {
return hashBytesIC( buff, start, end-start );
}
@@ -860,7 +886,9 @@ public final class ByteChunk implements
* @return The position of the first instance a byte that is not
* in the list of bytes to search for or -1 if no such
byte
* is found.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public static int findNotBytes(byte bytes[], int start, int end, byte b[])
{
int blen = b.length;
int offset = start;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Sun
Jan 8 19:21:21 2012
@@ -47,20 +47,35 @@ public final class C2BConverter {
this.enc=encoding;
}
- /** Create a converter
+ /**
+ * Create a converter
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public C2BConverter(String encoding) throws IOException {
this( new ByteChunk(1024), encoding );
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public ByteChunk getByteChunk() {
return bb;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public String getEncoding() {
return enc;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public void setByteChunk(ByteChunk bb) {
this.bb=bb;
ios.setByteChunk( bb );
@@ -98,8 +113,11 @@ public final class C2BConverter {
conv.write( c );
}
- /** Convert a message bytes chars to bytes
+ /**
+ * Convert a message bytes chars to bytes
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public final void convert(MessageBytes mb ) throws IOException {
int type=mb.getType();
if( type==MessageBytes.T_BYTES ) {
@@ -255,6 +273,10 @@ final class IntermediateOutputStream ext
// -------------------- Internal methods --------------------
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
void setByteChunk( ByteChunk bb ) {
tbuff=bb;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Sun Jan
8 19:21:21 2012
@@ -86,6 +86,10 @@ public final class CharChunk implements
// --------------------
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public CharChunk getClone() {
try {
return (CharChunk)this.clone();
@@ -111,6 +115,10 @@ public final class CharChunk implements
end=0;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public void reset() {
buff=null;
}
@@ -306,8 +314,11 @@ public final class CharChunk implements
}
- /** Add data to the buffer
+ /**
+ * Add data to the buffer.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void append( StringBuilder sb )
throws IOException
{
@@ -394,6 +405,10 @@ public final class CharChunk implements
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int substract(CharChunk src)
throws IOException {
@@ -517,6 +532,10 @@ public final class CharChunk implements
return new String(buff, start, end-start);
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int getInt()
{
return Ascii.parseInt(buff, start,
@@ -588,6 +607,10 @@ public final class CharChunk implements
return true;
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public boolean equals(byte b2[], int off2, int len2) {
char b1[]=buff;
if( b2==null && b1==null ) {
@@ -658,7 +681,10 @@ public final class CharChunk implements
return code;
}
- // hash ignoring case
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int hashIgnoreCase() {
int code=0;
for (int i = start; i < end; i++) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java Sun Jan
8 19:21:21 2012
@@ -72,7 +72,9 @@ public final class HexUtils {
/**
* Provide a mechanism for ensuring this class is loaded.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public static void load() {
// Nothing to do
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Sun
Jan 8 19:21:21 2012
@@ -78,6 +78,10 @@ public final class MessageBytes implemen
return factory.newInstance();
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public MessageBytes getClone() {
try {
return (MessageBytes)this.clone();
@@ -128,7 +132,9 @@ public final class MessageBytes implemen
/** Set the encoding. If the object was constructed from bytes[]. any
* previous conversion is reset.
* If no encoding is set, we'll use 8859-1.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void setCharset(Charset charset) {
if( !byteC.isNull() ) {
// if the encoding changes we need to reset the conversion results
@@ -365,7 +371,9 @@ public final class MessageBytes implemen
/**
* Returns true if the message bytes starts with the specified string.
* @param s the string
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public boolean startsWith(String s) {
switch (type) {
case T_STR:
@@ -444,6 +452,10 @@ public final class MessageBytes implemen
}
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public int indexOf(char c) {
return indexOf( c, 0);
}
@@ -472,7 +484,9 @@ public final class MessageBytes implemen
* Returns true if the message bytes starts with the specified string.
* @param c the character
* @param starting The start position
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public int indexOf(char c, int starting) {
switch (type) {
case T_STR:
@@ -521,8 +535,11 @@ public final class MessageBytes implemen
private long longValue;
private boolean hasLongValue=false;
- /** Set the buffer to the representation of an int
+ /**
+ * Set the buffer to the representation of an int
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void setInt(int i) {
byteC.allocate(16, 32);
int current = i;
@@ -606,8 +623,11 @@ public final class MessageBytes implemen
}
// Used for headers conversion
- /** Convert the buffer to an int, cache the value
+ /**
+ * Convert the buffer to an int, cache the value
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public int getInt()
{
if( hasIntValue ) {
@@ -650,6 +670,10 @@ public final class MessageBytes implemen
private static MessageBytesFactory factory=new MessageBytesFactory();
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public static void setFactory( MessageBytesFactory mbf ) {
factory=mbf;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Sun Jan
8 19:21:21 2012
@@ -62,7 +62,9 @@ public final class UDecoder {
/** URLDecode, will modify the source. Includes converting
* '+' to ' '.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void convert( ByteChunk mb )
throws IOException
{
@@ -129,7 +131,9 @@ public final class UDecoder {
/** In-buffer processing - the buffer will be modified
* Includes converting '+' to ' '.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void convert( CharChunk mb )
throws IOException
{
@@ -192,7 +196,9 @@ public final class UDecoder {
/** URLDecode, will modify the source
* Includes converting '+' to ' '.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
+ @Deprecated
public void convert(MessageBytes mb)
throws IOException
{
@@ -230,6 +236,10 @@ public final class UDecoder {
// XXX Old code, needs to be replaced !!!!
//
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public final String convert(String str)
{
return convert(str, true);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1228925&r1=1228924&r2=1228925&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Sun Jan
8 19:21:21 2012
@@ -48,6 +48,10 @@ public final class UEncoder {
initSafeChars();
}
+ /**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+ @Deprecated
public void setEncoding( String s ) {
encoding=s;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
