You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/09/22 03:13:17 UTC

svn commit: rev 47011 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/variables

Author: vgritsenko
Date: Tue Sep 21 18:13:17 2004
New Revision: 47011

Modified:
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
Log:
deprecate ComponentManager version (as in 2.2)


Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java	Tue Sep 21 18:13:17 2004
@@ -100,14 +100,8 @@
     /**
      * Get a resolver for a given expression. Chooses the most efficient implementation
      * depending on <code>expression</code>.
-     */
-    public static VariableResolver getResolver(String expression, ServiceManager manager) throws PatternException {
-        return getResolver(expression, new WrapperComponentManager(manager));
-    }
-
-    /**
-     * Get a resolver for a given expression. Chooses the most efficient implementation
-     * depending on <code>expression</code>.
+     *
+     * @deprecated use the version with <code>ServiceManager</service>
      */
     public static VariableResolver getResolver(String expression, ComponentManager manager) throws PatternException {
         if (needsResolve(expression)) {
@@ -121,5 +115,14 @@
         } else {
             return new NOPVariableResolver(expression);
         }
+    }
+
+
+    /**
+     * Get a resolver for a given expression. Chooses the most efficient implementation
+     * depending on <code>expression</code>.
+     */
+    public static VariableResolver getResolver(String expression, ServiceManager manager) throws PatternException {
+        return getResolver(expression, new WrapperComponentManager(manager));
     }
 }