Author: tmjee
Date: Sun Jun 18 07:39:56 2006
New Revision: 415143
URL: http://svn.apache.org/viewvc?rev=415143&view=rev
Log:
WW-1355
- make method not exposed to other classes protected instead of public
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=415143&r1=415142&r2=415143&view=diff
==============================================================================
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Sun Jun 18 07:39:56 2006
@@ -156,7 +156,7 @@
return config;
}
- public ScopesHashModel buildScopesHashModel(ServletContext servletContext,
HttpServletRequest request, HttpServletResponse response, ObjectWrapper
wrapper, OgnlValueStack stack) {
+ protected ScopesHashModel buildScopesHashModel(ServletContext
servletContext, HttpServletRequest request, HttpServletResponse response,
ObjectWrapper wrapper, OgnlValueStack stack) {
ScopesHashModel model = new ScopesHashModel(wrapper, servletContext,
request, stack);
// Create hash model wrapper for servlet context (the application)
@@ -215,7 +215,7 @@
return model;
}
- public void populateContext(ScopesHashModel model, OgnlValueStack stack,
Object action, HttpServletRequest request, HttpServletResponse response) {
+ protected void populateContext(ScopesHashModel model, OgnlValueStack
stack, Object action, HttpServletRequest request, HttpServletResponse response)
{
// put the same objects into the context that the velocity result uses
Map standard = ContextUtil.getStandardContext(stack, request,
response);
model.putAll(standard);