Author: jleroux
Date: Thu Jan 12 13:20:42 2017
New Revision: 1778433
URL: http://svn.apache.org/viewvc?rev=1778433&view=rev
Log:
No functional change, removes unused local delegator variables
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=1778433&r1=1778432&r2=1778433&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
(original)
+++
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
Thu Jan 12 13:20:42 2017
@@ -33,7 +33,6 @@ import org.apache.ofbiz.base.util.UtilVa
import org.apache.ofbiz.base.util.collections.MapStack;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.content.content.ContentWorker;
-import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.service.LocalDispatcher;
import freemarker.core.Environment;
@@ -51,7 +50,6 @@ public class RenderContentAndSubContent
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
final LocalDispatcher dispatcher =
FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator =
FreeMarkerWorker.getWrappedObject("delegator", env);
final HttpServletRequest request =
FreeMarkerWorker.getWrappedObject("request", env);
final Map<String, Object> envMap =
FreeMarkerWorker.createEnvironmentMap(env);
final MapStack<String> templateRoot = MapStack.create();
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1778433&r1=1778432&r2=1778433&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
(original)
+++
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
Thu Jan 12 13:20:42 2017
@@ -39,7 +39,6 @@ import org.apache.ofbiz.base.util.UtilPr
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.content.content.ContentWorker;
-import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.webapp.control.RequestHandler;
@@ -60,7 +59,6 @@ public class RenderContentAsText impleme
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
final LocalDispatcher dispatcher =
FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator =
FreeMarkerWorker.getWrappedObject("delegator", env);
final HttpServletRequest request =
FreeMarkerWorker.getWrappedObject("request", env);
final HttpServletResponse response =
FreeMarkerWorker.getWrappedObject("response", env);
final Map<String, Object> templateRoot =
FreeMarkerWorker.createEnvironmentMap(env);
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=1778433&r1=1778432&r2=1778433&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
(original)
+++
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
Thu Jan 12 13:20:42 2017
@@ -37,7 +37,6 @@ import org.apache.ofbiz.base.util.UtilVa
import org.apache.ofbiz.base.util.collections.MapStack;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.content.content.ContentWorker;
-import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.webapp.control.RequestHandler;
@@ -55,7 +54,6 @@ public class RenderContentTransform impl
@SuppressWarnings("unchecked")
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final Delegator delegator =
FreeMarkerWorker.getWrappedObject("delegator", env);
final LocalDispatcher dispatcher =
FreeMarkerWorker.getWrappedObject("dispatcher", env);
final HttpServletRequest request =
FreeMarkerWorker.getWrappedObject("request", env);
final HttpServletResponse response =
FreeMarkerWorker.getWrappedObject("response", env);
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1778433&r1=1778432&r2=1778433&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
(original)
+++
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
Thu Jan 12 13:20:42 2017
@@ -37,7 +37,6 @@ import org.apache.ofbiz.base.util.UtilPr
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.content.content.ContentWorker;
-import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.service.LocalDispatcher;
import freemarker.core.Environment;
@@ -56,7 +55,6 @@ public class RenderSubContentAsText impl
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
final LocalDispatcher dispatcher =
FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator =
FreeMarkerWorker.getWrappedObject("delegator", env);
final HttpServletRequest request =
FreeMarkerWorker.getWrappedObject("request", env);
final Map<String, Object> templateRoot =
FreeMarkerWorker.createEnvironmentMap(env);
if (Debug.infoOn()) {