Author: markt
Date: Fri Nov 21 01:36:09 2008
New Revision: 719550
URL: http://svn.apache.org/viewvc?rev=719550&view=rev
Log:
Make private / remove deprecated methods
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=719550&r1=719549&r2=719550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Fri Nov 21
01:36:09 2008
@@ -470,25 +470,9 @@
/**
* Replace ${NAME} with the property value
- *
- * @deprecated Use the explicit method
- */
- public static String replaceProperties(String value, Object getter) {
- if (getter instanceof Hashtable)
- return replaceProperties(value, (Hashtable) getter, null);
-
- if (getter instanceof PropertySource) {
- PropertySource src[] = new PropertySource[] { (PropertySource)
getter };
- return replaceProperties(value, null, src);
- }
- return value;
- }
-
- /**
- * Replace ${NAME} with the property value
*/
- public static String replaceProperties(String value, Hashtable staticProp,
- PropertySource dynamicProp[]) {
+ public static String replaceProperties(String value,
+ Hashtable<Object,Object> staticProp, PropertySource dynamicProp[])
{
if (value.indexOf("$") < 0) {
return value;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=719550&r1=719549&r2=719550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri Nov 21
01:36:09 2008
@@ -67,17 +67,6 @@
static final int BUFFER_SIZE=8192;
char result[]=new char[BUFFER_SIZE];
- /** Convert a buffer of bytes into a chars
- * @deprecated
- */
- public void convert( ByteChunk bb, CharChunk cb )
- throws IOException
- {
- // Set the ByteChunk as input to the Intermediate reader
- convert(bb, cb, cb.getBuffer().length - cb.getEnd());
- }
-
-
public void convert( ByteChunk bb, CharChunk cb, int limit)
throws IOException
{
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=719550&r1=719549&r2=719550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Fri Nov 21
01:36:09 2008
@@ -68,10 +68,10 @@
/**
* Creates a new, uninitialized MessageBytes object.
- * @deprecated Use static newInstance() in order to allow
+ * Use static newInstance() in order to allow
* future hooks.
*/
- public MessageBytes() {
+ private MessageBytes() {
}
/** Construct a new MessageBytes instance
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
