Make private / remove deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719550 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 8bc3fe6..2a46bcb 100644 (file)
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -470,25 +470,9 @@ public final class IntrospectionUtils {
 
     /**
      * 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;
         }

diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java
index 995476b..c71e06b 100644 (file)
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -67,17 +67,6 @@ public class B2CConverter {
     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
     {

diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 4e35b43..42db3c5 100644 (file)
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -68,10 +68,10 @@ public final class MessageBytes implements Cloneable, Serializable {
 
     /**
      * 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