You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@locus.apache.org on 2000/12/04 20:42:00 UTC

cvs commit: xml-cocoon/webapp sitemap.xmap

dims        00/12/04 11:41:58

  Modified:    src/org/apache/cocoon/selection Tag: xml-cocoon2
                        CodedSelectorFactory.java
               webapp   Tag: xml-cocoon2 sitemap.xmap
  Log:
  Patches from Marcus Crafter for CodedSelectorFactory
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java
  
  Index: CodedSelectorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- CodedSelectorFactory.java	2000/12/04 12:06:59	1.1.2.1
  +++ CodedSelectorFactory.java	2000/12/04 19:41:49	1.1.2.2
  @@ -17,7 +17,7 @@
    * embedded java code within the 'test' clause of the select.
    *
    * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/12/04 12:06:59 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/12/04 19:41:49 $
    */
   public class CodedSelectorFactory implements CodeFactory
   {
  @@ -41,7 +41,7 @@
           .append("_expr = new org.apache.cocoon.selection.helpers.CodedSelectorHelper() {")
           .append("public boolean evaluate(Map objectModel) {")
           .append("initialize(objectModel);")
  -        .append("return (" + test + ") ? true : false;")
  +        .append("return (" + test + ");")
           .append("}")
           .append("};");
           return sb.toString();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.24  +1 -1      xml-cocoon/webapp/Attic/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/Attic/sitemap.xmap,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -r1.1.2.23 -r1.1.2.24
  --- sitemap.xmap	2000/11/30 21:42:41	1.1.2.23
  +++ sitemap.xmap	2000/12/04 19:41:56	1.1.2.24
  @@ -70,7 +70,7 @@
       <browser name="mozilla5" useragent="Netscape6/"/>
       <browser name="netscape" useragent="Mozilla"/>
      </map:selector>
  -
  +   <map:selector name="coded" factory="org.apache.cocoon.selection.CodedSelectorFactory"/>
     </map:selectors>
   
     <map:matchers default="wildcard">