You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2001/07/04 10:42:08 UTC

cvs commit: xml-cocoon2/src/org/apache/cocoon/sitemap SitemapComponentSelector.java

cziegeler    01/07/04 01:42:06

  Modified:    src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
                        SitemapComponentSelector.java
  Log:
  Fixed setting of contentType in subsitemaps
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.6   +10 -4     xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java
  
  Index: SitemapComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- SitemapComponentSelector.java	2001/06/08 20:21:26	1.2.2.5
  +++ SitemapComponentSelector.java	2001/07/04 08:41:58	1.2.2.6
  @@ -23,11 +23,11 @@
   /** Default component manager for Cocoon's sitemap components.
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  - * @version CVS $Id: SitemapComponentSelector.java,v 1.2.2.5 2001/06/08 20:21:26 bloritsch Exp $
  + * @version CVS $Id: SitemapComponentSelector.java,v 1.2.2.6 2001/07/04 08:41:58 cziegeler Exp $
    */
   public class SitemapComponentSelector extends ExcaliburComponentSelector {
       private Map mime_types;
  -    private ComponentSelector parentSelector;
  +    private SitemapComponentSelector parentSelector;
   
       /** The conctructors (same as the Avalon ComponentManager)
        */
  @@ -36,7 +36,7 @@
           this.mime_types = new HashMap();
       }
   
  -    public void setParentSelector(ComponentSelector newSelector) {
  +    public void setParentSelector(SitemapComponentSelector newSelector) {
           if (this.parentSelector == null) {
               this.parentSelector = newSelector;
           }
  @@ -64,7 +64,13 @@
       }
   
       public String getMimeTypeForRole(String role) {
  -        return (String)this.mime_types.get(role);
  +        if (this.mime_types.containsKey(role) == true) {
  +            return (String)this.mime_types.get(role);
  +        }
  +        if (this.parentSelector != null) {
  +            return this.parentSelector.getMimeTypeForRole(role);
  +        }
  +        return null;
       }
   
       protected void addSitemapComponent(Object hint, Class component, Configuration conf, String mime_type) throws ComponentException,
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org