skitching    2004/04/07 02:34:24

  Modified:    digester/src/java/org/apache/commons/digester/plugins Tag:
                        DIGESTER_PLUGIN_REFACTORING_BRANCH PluginRules.java
  Log:
  PerDigesterResources->PluginContext
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.12.2.2  +26 -21    
jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java
  
  Index: PluginRules.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- PluginRules.java  28 Mar 2004 06:16:17 -0000      1.12.2.1
  +++ PluginRules.java  7 Apr 2004 09:34:24 -0000       1.12.2.2
  @@ -86,7 +86,7 @@
        * A reference to the object that holds all data which should only
        * exist once per digester instance.
        */
  -    private PerDigesterResources perDigesterResources = null;
  +    private PluginContext pluginContext = null;
       
       // ------------------------------------------------------------- Constructor
       
  @@ -106,8 +106,8 @@
       public PluginRules(Rules decoratedRules) {
           this.decoratedRules = decoratedRules;
   
  -        perDigesterResources = new PerDigesterResources();
  -        pluginManager = new PluginManager(perDigesterResources);
  +        pluginContext = new PluginContext();
  +        pluginManager = new PluginManager(pluginContext);
       }
   
       /**
  @@ -117,6 +117,11 @@
        * One of these is created each time a PluginCreateRule's begin method 
        * fires, in order to manage the custom rules associated with whatever 
        * concrete plugin class the user has specified.
  +     *
  +     * @param mountPoint is the digester match path for the element 
  +     * matching a PluginCreateRule which caused this "nested parsing scope"
  +     * to begin.
  +     * @param parent must be non-null.
        */
        PluginRules(String mountPoint, PluginRules parent) {
           // no need to set digester or decoratedRules.digester,
  @@ -124,8 +129,8 @@
           // method on this object will be called.
           
           decoratedRules = new RulesBase();
  -        perDigesterResources = parent.perDigesterResources;
  -        pluginManager = new PluginManager(perDigesterResources, 
parent.pluginManager);
  +        pluginContext = parent.pluginContext;
  +        pluginManager = new PluginManager(parent.pluginManager);
           
           this.mountPoint = mountPoint;
           this.parent = parent;
  @@ -187,17 +192,17 @@
       }
       
       /**
  -     * See [EMAIL PROTECTED] PerDigesterResources#getRuleFinders}.
  +     * See [EMAIL PROTECTED] PluginContext#getRuleFinders}.
        */
       public List getRuleFinders() {
  -        return perDigesterResources.getRuleFinders();
  +        return pluginContext.getRuleFinders();
       }
       
       /**
  -     * See [EMAIL PROTECTED] PerDigesterResources#setRuleFinders}.
  +     * See [EMAIL PROTECTED] PluginContext#setRuleFinders}.
        */
       public void setRuleFinders(List ruleFinders) {
  -        perDigesterResources.setRuleFinders(ruleFinders);
  +        pluginContext.setRuleFinders(ruleFinders);
       }
       
       // --------------------------------------------------------- Public Methods
  @@ -358,35 +363,35 @@
           return matches;
       }
   
  -    /** See [EMAIL PROTECTED] PerDigesterResources#setPluginClassAttribute}. */
  +    /** See [EMAIL PROTECTED] PluginContext#setPluginClassAttribute}. */
       public void setPluginClassAttribute(String namespaceUri, 
                                           String attrName) {
  -        perDigesterResources.setPluginClassAttribute(namespaceUri, attrName);
  +        pluginContext.setPluginClassAttribute(namespaceUri, attrName);
       }
   
  -    /** See [EMAIL PROTECTED] PerDigesterResources#setPluginIdAttribute}. */
  +    /** See [EMAIL PROTECTED] PluginContext#setPluginIdAttribute}. */
       public void setPluginIdAttribute(String namespaceUri, 
                                        String attrName) {
  -        perDigesterResources.setPluginIdAttribute(namespaceUri, attrName);
  +        pluginContext.setPluginIdAttribute(namespaceUri, attrName);
       }
       
  -    /** See [EMAIL PROTECTED] PerDigesterResources#getPluginClassAttrNs}. */
  +    /** See [EMAIL PROTECTED] PluginContext#getPluginClassAttrNs}. */
       public String getPluginClassAttrNs() {
  -        return perDigesterResources.getPluginClassAttrNs();
  +        return pluginContext.getPluginClassAttrNs();
       }
       
  -    /** See [EMAIL PROTECTED] PerDigesterResources#getPluginClassAttr}. */
  +    /** See [EMAIL PROTECTED] PluginContext#getPluginClassAttr}. */
       public String getPluginClassAttr() {
  -        return perDigesterResources.getPluginClassAttr();
  +        return pluginContext.getPluginClassAttr();
       }
       
  -    /** See [EMAIL PROTECTED] PerDigesterResources#getPluginIdAttrNs}. */
  +    /** See [EMAIL PROTECTED] PluginContext#getPluginIdAttrNs}. */
       public String getPluginIdAttrNs() {
  -        return perDigesterResources.getPluginIdAttrNs();
  +        return pluginContext.getPluginIdAttrNs();
       }
       
  -    /** See [EMAIL PROTECTED] PerDigesterResources#getPluginIdAttr}. */
  +    /** See [EMAIL PROTECTED] PluginContext#getPluginIdAttr}. */
       public String getPluginIdAttr() {
  -        return perDigesterResources.getPluginIdAttr();
  +        return pluginContext.getPluginIdAttr();
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to