forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: xml-forrest/src/java/org/apache/cocoon/components/modules/input/lm AbstractNode.java LocatorNode.java
Date Wed, 22 Oct 2003 16:56:05 GMT
unico       2003/10/22 09:56:05

  Modified:    src/java/org/apache/cocoon/components/modules/input/lm
                        AbstractNode.java LocatorNode.java
  Log:
  use constants
  
  Revision  Changes    Path
  1.2       +6 -6      xml-forrest/src/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java
  
  Index: AbstractNode.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractNode.java	21 Oct 2003 08:33:36 -0000	1.1
  +++ AbstractNode.java	22 Oct 2003 16:56:05 -0000	1.2
  @@ -74,8 +74,7 @@
       
       protected final ComponentManager m_manager;
       
  -    // optional parameters defined 
  -    // by the node's configuration
  +    // optional parameters defined by the node's configuration
       private Map m_parameters;
       
       
  @@ -140,13 +139,14 @@
           else {
               parameters = new Parameters();
           }
  -        // also pass the anchor map as parameters
  -        // for use by components
  -        Map anchorMap = context.getMapByAnchor("lm");
  +        // also pass the anchor map as parameters directly into the components
  +        Map anchorMap = context.getMapByAnchor(LocationMap.ANCHOR_NAME);
           Iterator entries = anchorMap.entrySet().iterator();
           while (entries.hasNext()) {
               Map.Entry entry = (Map.Entry) entries.next();
  -            parameters.setParameter("#lm:"+entry.getKey(),entry.getValue().toString());
  +            parameters.setParameter(
  +                "#"+LocationMap.ANCHOR_NAME+":"+entry.getKey(),
  +                entry.getValue().toString());
           }
           return parameters;
       }
  
  
  
  1.2       +1 -1      xml-forrest/src/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java
  
  Index: LocatorNode.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocatorNode.java	21 Oct 2003 08:33:36 -0000	1.1
  +++ LocatorNode.java	22 Oct 2003 16:56:05 -0000	1.2
  @@ -118,7 +118,7 @@
       public String locate(Map om, InvokeContext context) throws Exception {
           
           // resolve the base location and put it in the anchor map
  -        Map anchorMap = context.getMapByAnchor("lm");
  +        Map anchorMap = context.getMapByAnchor(LocationMap.ANCHOR_NAME);
           anchorMap.put("base",m_baseLocation.resolve(context,om));
           
           for (int i = 0; i < m_nodes.length; i++) {
  
  
  

Mime
View raw message