From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 3 Jan 2010 15:43:37 +0000 (+0000)
Subject: Mark the implementations of deprecated methods as deprecated
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7de590cc2f9d022b1ece876610eb88b8181b61f3;p=tomcat7.0

Mark the implementations of deprecated methods as deprecated

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

diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 705a9dab1..52c8e6c5e 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -303,6 +303,7 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 	}
 
 	@Override
+	@Deprecated
     public VariableResolver getVariableResolver() {
 		return this;
 	}
@@ -323,6 +324,7 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 	}
 
 	@Override
+	@Deprecated
     public ExpressionEvaluator getExpressionEvaluator() {
 		return invokingJspCtxt.getExpressionEvaluator();
 	}
@@ -344,6 +346,7 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 	/**
 	 * VariableResolver interface
 	 */
+	@Deprecated
 	public Object resolveVariable(String pName) throws ELException {
 		ELContext ctx = this.getELContext();
 		return ctx.getELResolver().getValue(ctx, null, pName);
diff --git a/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java b/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
index 725714fed..02d1713ab 100644
--- a/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
+++ b/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
@@ -186,6 +186,7 @@ public final class ProtectedFunctionMapper extends javax.el.FunctionMapper
      * @return the result of the method mapping. Null means no entry found.
      */
     @Override
+    @Deprecated
     public Method resolveFunction(String prefix, String localName) {
         if (this.fnmap != null) {
             return this.fnmap.get(prefix + ":" + localName);