[WebMacro-cvs] webmacro/src/org/webmacro/engine BuildContext.java,1.27,1.28

[<ke...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv9122

Modified Files:
	BuildContext.java 
Log Message:
Removing the remnants of the old Filter mechanism



Index: BuildContext.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/BuildContext.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BuildContext.java	16 Jul 2003 06:45:00 -0000	1.27
--- BuildContext.java	21 Jul 2003 21:25:40 -0000	1.28
***************
*** 45,49 ****
      private final Map _types = new HashMap();
      private final Map _macros = new HashMap();
-     private final FilterManager _filters = new FilterManager();
  
      public BuildContext (Broker b)
--- 45,48 ----
***************
*** 100,134 ****
  
      /**
-      * Register a new filter, adding it to the chain for the supplied name.
-      * The name is either a top level property name or * to mean "all".
-      * @param var the top level property name that is being filtered
-      * @param ft the Filter which will handle this property
-      */
-     public void addFilter (Variable var, Filter ft)
-     {
-         _filters.addFilter(var, ft);
-     }
- 
-     /**
-      * Clear all the filtered for the supplied name. Cleaing * clears
-      * only global filters, leaving filters for specific properties.
-      */
-     public void clearFilters (Variable var)
-     {
-         _filters.clearFilters(var);
-     }
- 
-     /**
-      * Get the filter that applies to a specific variable. Returning
-      * null from this method means that the entire variable should
-      * be dropped from the output since it's been filtered to null.
-      * @return the Macro to be used to filter it, or null
-      */
-     public Macro getFilterMacro (Variable v)
-     {
-         return _filters.getMacro(v);
-     }
- 
-     /**
       * Add a MacroDefinition to the build context
       */
--- 99,102 ----
***************
*** 172,176 ****
       * Used by various build() routines
       */
!     Object resolveVariableReference (Object names[], boolean filtered)
              throws BuildException
      {
--- 140,144 ----
       * Used by various build() routines
       */
!     Object resolveVariableReference (Object names[])
              throws BuildException
      {
***************
*** 231,237 ****
              throw new BuildException("Unrecognized Variable Type: " + type);
          }
! 
!         return (filtered && v instanceof Variable)
!                 ? getFilterMacro((Variable) v) : v;
      }
  
--- 199,203 ----
              throw new BuildException("Unrecognized Variable Type: " + type);
          }
!         return v;
      }