cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/sitemap GenericProcessor.java LinkTranslator.java
Date Sun, 27 Feb 2000 17:49:42 GMT
pier        00/02/27 09:49:41

  Modified:    src/org/apache/cocoon/sitemap Tag: xml-cocoon2
                        GenericProcessor.java LinkTranslator.java
  Log:
  [Cocoon 2.0] Bugs-O-Land here I come :)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +7 -5      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/GenericProcessor.java
  
  Index: GenericProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/GenericProcessor.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- GenericProcessor.java	2000/02/27 14:57:26	1.1.2.6
  +++ GenericProcessor.java	2000/02/27 17:49:41	1.1.2.7
  @@ -35,7 +35,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/02/27 14:57:26 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/02/27 17:49:41 $
    */
   public class GenericProcessor
   implements Composer, Configurable, Processor, LinkResolver {
  @@ -115,8 +115,8 @@
           Enumeration e=conf.getConfigurations("filter");
           while (e.hasMoreElements()) {
               Configuration f=(Configuration)e.nextElement();
  -            this.filters.addElement("filter:"+c.getAttribute("name"));
  -            this.filtersParam.addElement(Parameters.fromConfiguration(c));
  +            this.filters.addElement("filter:"+f.getAttribute("name"));
  +            this.filtersParam.addElement(Parameters.fromConfiguration(f));
           }
       }
   
  @@ -159,8 +159,10 @@
        */
       public String resolve(String source, String partition) {
           if ((partition==null)||(this.partition.name.equals(partition))) {
  -            String translated=this.sourceTranslator.translate(source);
  -            if (translated!=null) return(translated);
  +            //if (source!=null) {
  +                String translated=this.sourceTranslator.translate(source);
  +                if (translated!=null) return(translated);
  +            //}
           }
           return(this.partition.resolve(source,partition,this));
       }
  
  
  
  1.1.2.2   +2 -2      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java
  
  Index: LinkTranslator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LinkTranslator.java	2000/02/27 14:57:26	1.1.2.1
  +++ LinkTranslator.java	2000/02/27 17:49:41	1.1.2.2
  @@ -21,7 +21,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/27 14:57:26 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/02/27 17:49:41 $
    */
   public class LinkTranslator extends AbstractXMLProducer implements XMLConsumer {
   
  @@ -122,7 +122,7 @@
               }
           }
           if (tran!=null) {
  -            int x=a.getIndex(tran);
  +            int x=a2.getIndex(tran);
               if (x>-1) {
                   String resolved=this.linkResolver.resolve(a2.getValue(x),part);
                   if (resolved!=null) a2.setValue(x,this.prepath+resolved);
  
  
  

Mime
View raw message