forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject svn commit: r279073 - /forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
Date Tue, 06 Sep 2005 19:20:56 GMT
Author: twilliams
Date: Tue Sep  6 12:20:48 2005
New Revision: 279073

URL: http://svn.apache.org/viewcvs?rev=279073&view=rev
Log:
fixed part of the src attribute problem with lm actions

Modified:
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java?rev=279073&r1=279072&r2=279073&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java Tue Sep  6 12:20:48
2005
@@ -51,7 +51,9 @@
     private String m_type;
     
     // the src of action for this node
-    private VariableResolver m_src;
+    private String m_src;
+    
+    private VariableResolver m_varResolver;
     
     // the locations to test against
     private AbstractNode[] m_nodes;
@@ -70,6 +72,14 @@
         
         // get the selector
         m_type = configuration.getAttribute("type",m_ln.getDefaultAction());
+        try
+        {
+                m_varResolver = VariableResolverFactory.getResolver(
+                    configuration.getAttribute("src"), super.m_manager);
+        }
+        catch (PatternException e) {
+            throw new ConfigurationException("unable to resolve action 'src' attribute");
+        }
 //        try {
 //            m_src = VariableResolverFactory.getResolver(
 //                    configuration.getAttribute("src"), super.m_manager);
@@ -117,17 +127,19 @@
         m_nodes = (AbstractNode[]) nodes.toArray(new AbstractNode[nodes.size()]);
     }
     public void service(ServiceManager manager) throws ServiceException {
+        //FIXME: Determine whether this is really necessary anymore.
         this.resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE);
     }
     /* (non-Javadoc)
      * @see org.apache.forrest.locationmap.lm.AbstractNode#locate(java.util.Map, org.apache.cocoon.components.treeprocessor.InvokeContext)
      */
     public String locate(Map objectModel, InvokeContext context) throws Exception {
+        this.resolver = (SourceResolver)m_manager.lookup(SourceResolver.ROLE);
         Parameters parameters = resolveParameters(context,objectModel);
         Redirector redirector = context.getRedirector();
-        String source;
-        source="";
-        Map substitutions = m_action.act(redirector, resolver, objectModel, source, parameters);
+        m_src = m_varResolver.resolve(context,objectModel);
+        
+        Map substitutions = m_action.act(redirector, resolver, objectModel, m_src, parameters);
         if (substitutions != null) {
             if (getLogger().isDebugEnabled()) {
              //   getLogger().debug("matched: " + m_pattern);



Mime
View raw message