You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/07/30 18:23:06 UTC
svn commit: r561031 - in /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker: DefaultTemplateEncoder.java TemplateEncoder.java TemplateRenderer.java

Author: mmarinschek
Date: Mon Jul 30 09:23:03 2007
New Revision: 561031

URL: http://svn.apache.org/viewvc?view=rev&rev=561031
Log:
https://issues.apache.org/jira/browse/TOMAHAWK-1065: DefaultTemplateEncoder used wrong class name to lookup templates.

Modified:
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateEncoder.java
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateRenderer.java

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java?view=diff&rev=561031&r1=561030&r2=561031
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/DefaultTemplateEncoder.java Mon Jul 30 09:23:03 2007
@@ -22,6 +22,7 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -40,10 +41,10 @@
 
     private static final Log log = LogFactory.getLog(DefaultTemplateEncoder.class);
 
-    public void encodeTemplate(FacesContext context, UIComponent component, String template, Object dataModel) throws IOException {
+    public void encodeTemplate(FacesContext context, UIComponent component, Renderer renderer, String template, Object dataModel) throws IOException {
             Configuration cfg = new Configuration();
         log.info("Encoding template : " + getClass().getResource(template));
-        TemplateLoader templateLoader = new ClassTemplateLoader(getClass(), template);
+        TemplateLoader templateLoader = new ClassTemplateLoader(renderer.getClass(), template);
         cfg.setTemplateLoader(templateLoader);
         cfg.setObjectWrapper(new DefaultObjectWrapper());
         Template temp = cfg.getTemplate(template);

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateEncoder.java?view=diff&rev=561031&r1=561030&r2=561031
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateEncoder.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateEncoder.java Mon Jul 30 09:23:03 2007
@@ -20,11 +20,12 @@
 
 import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.render.Renderer;
 import java.io.IOException;
 
 /**
  * @author Martin Marinschek
  */
 public interface TemplateEncoder {
-    public void encodeTemplate(FacesContext context, UIComponent component, String template, Object dataModel) throws IOException;
+    public void encodeTemplate(FacesContext context, UIComponent component, Renderer renderer, String template, Object dataModel) throws IOException;
 }

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateRenderer.java?view=diff&rev=561031&r1=561030&r2=561031
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/renderkit/freemarker/TemplateRenderer.java Mon Jul 30 09:23:03 2007
@@ -88,7 +88,7 @@
             }
         }
 
-        templateEncoder.encodeTemplate(context, component, template, getDatamodel(context, component));
+        templateEncoder.encodeTemplate(context, component, this, template, getDatamodel(context, component));
     }
     
     protected abstract Object getDatamodel(FacesContext context, UIComponent component);