Author: markt
Date: Wed Aug 8 21:17:59 2012
New Revision: 1370972
URL: http://svn.apache.org/viewvc?rev=1370972&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/util/Strftime.java
tomcat/trunk/java/org/apache/catalina/util/StringParser.java
tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=1370972&r1=1370971&r2=1370972&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Wed Aug 8
21:17:59 2012
@@ -100,19 +100,6 @@ public class ManifestResource {
}
/**
- * Convenience method to check if this <code>ManifestResource</code>
- * has an requires extensions.
- *
- * @return true if required extensions are present
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public boolean requiresExtensions() {
- return (requiredExtensions != null) ? true : false;
- }
-
- /**
* Returns <code>true</code> if all required extension dependencies
* have been meet for this <code>ManifestResource</code> object.
*
Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1370972&r1=1370971&r2=1370972&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Wed Aug 8
21:17:59 2012
@@ -193,22 +193,6 @@ public final class RequestUtil {
* the string is not a query string.
*
* @param bytes The url-encoded byte array
- * @exception IllegalArgumentException if a '%' character is not followed
- * by a valid 2-digit hexadecimal number
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public static String URLDecode(byte[] bytes) {
- return URLDecode(bytes, null);
- }
-
-
- /**
- * Decode and return the specified URL-encoded byte array. It is assumed
- * the string is not a query string.
- *
- * @param bytes The url-encoded byte array
* @param enc The encoding to use; if null, the default encoding is used
* @exception IllegalArgumentException if a '%' character is not followed
* by a valid 2-digit hexadecimal number
Modified: tomcat/trunk/java/org/apache/catalina/util/Strftime.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Strftime.java?rev=1370972&r1=1370971&r2=1370972&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Strftime.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Strftime.java Wed Aug 8
21:17:59 2012
@@ -110,19 +110,6 @@ public class Strftime {
/**
* Create an instance of this date formatting class
*
- * @see #Strftime( String, Locale )
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public Strftime( String origFormat ) {
- String convertedFormat = convertDateFormat( origFormat );
- simpleDateFormat = new SimpleDateFormat( convertedFormat );
- }
-
- /**
- * Create an instance of this date formatting class
- *
* @param origFormat the strftime-style formatting string
* @param locale the locale to use for locale-specific conversions
*/
Modified: tomcat/trunk/java/org/apache/catalina/util/StringParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/StringParser.java?rev=1370972&r1=1370971&r2=1370972&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/StringParser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/StringParser.java Wed Aug 8
21:17:59 2012
@@ -114,22 +114,7 @@ public final class StringParser {
* Return the length of the string we are parsing.
*/
public int getLength() {
-
- return (this.length);
-
- }
-
-
- /**
- * Return the String we are currently parsing.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public String getString() {
-
- return (this.string);
-
+ return length;
}
@@ -150,7 +135,6 @@ public final class StringParser {
chars = new char[0];
}
reset();
-
}
@@ -165,27 +149,6 @@ public final class StringParser {
if (index < length)
index++;
-
- }
-
-
- /**
- * Extract and return a substring that starts at the specified position,
- * and extends to the end of the string being parsed. If this is not
- * possible, a zero-length string is returned.
- *
- * @param start Starting index, zero relative, inclusive
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public String extract(int start) {
-
- if ((start < 0) || (start >= length))
- return ("");
- else
- return (string.substring(start));
-
}
@@ -225,124 +188,10 @@ public final class StringParser {
/**
- * Return the index of the next occurrence of a non-whitespace character,
- * or the index of the character after the last position of the string
- * if no more non-whitespace characters are found. The current
- * parsing position is updated to the returned value.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public int findText() {
-
- while ((index < length) && isWhite(chars[index]))
- index++;
- return (index);
-
- }
-
-
- /**
- * Return the index of the next occurrence of a whitespace character,
- * or the index of the character after the last position of the string
- * if no more whitespace characters are found. The current parsing
- * position is updated to the returned value.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public int findWhite() {
-
- while ((index < length) && !isWhite(chars[index]))
- index++;
- return (index);
-
- }
-
-
- /**
* Reset the current state of the parser to the beginning of the
* current string being parsed.
*/
public void reset() {
-
index = 0;
-
- }
-
-
- /**
- * Advance the current parsing position while it is pointing at the
- * specified character, or until it moves past the end of the string.
- * Return the final value.
- *
- * @param ch Character to be skipped
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public int skipChar(char ch) {
-
- while ((index < length) && (ch == chars[index]))
- index++;
- return (index);
-
- }
-
-
- /**
- * Advance the current parsing position while it is pointing at a
- * non-whitespace character, or until it moves past the end of the string.
- * Return the final value.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public int skipText() {
-
- while ((index < length) && !isWhite(chars[index]))
- index++;
- return (index);
-
}
-
-
- /**
- * Advance the current parsing position while it is pointing at a
- * whitespace character, or until it moves past the end of the string.
- * Return the final value.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public int skipWhite() {
-
- while ((index < length) && isWhite(chars[index]))
- index++;
- return (index);
-
- }
-
-
- // ------------------------------------------------------ Protected Methods
-
-
- /**
- * Is the specified character considered to be whitespace?
- *
- * @param ch Character to be checked
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- protected boolean isWhite(char ch) {
-
- if ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n'))
- return (true);
- else
- return (false);
-
- }
-
-
}
Modified: tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java?rev=1370972&r1=1370971&r2=1370972&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java Wed Aug 8
21:17:59 2012
@@ -101,26 +101,6 @@ public class XMLWriter {
* Write property to the XML.
*
* @param namespace Namespace
- * @param namespaceInfo Namespace info
- * @param name Property name
- * @param value Property value
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public void writeProperty(String namespace, String namespaceInfo,
- String name, String value) {
- writeElement(namespace, namespaceInfo, name, OPENING);
- buffer.append(value);
- writeElement(namespace, namespaceInfo, name, CLOSING);
-
- }
-
-
- /**
- * Write property to the XML.
- *
- * @param namespace Namespace
* @param name Property name
* @param value Property value
*/
@@ -132,20 +112,6 @@ public class XMLWriter {
/**
- * Write property to the XML.
- *
- * @param namespace Namespace
- * @param name Property name
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- public void writeProperty(String namespace, String name) {
- writeElement(namespace, name, NO_CONTENT);
- }
-
-
- /**
* Write an element.
*
* @param name Element name
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
