You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2008/11/21 19:57:55 UTC
svn commit: r719672 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Author: musachy
Date: Fri Nov 21 10:57:55 2008
New Revision: 719672
URL: http://svn.apache.org/viewvc?rev=719672&view=rev
Log:
WW-2882 Make fields protected
Thanks to Mathias Bogaert for patch
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=719672&r1=719671&r2=719672&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java Fri Nov 21 10:57:55 2008
@@ -107,10 +107,10 @@
public static final String KEY_EXCEPTION = "exception";
// coppied from freemarker servlet - since they are private
- private static final String ATTR_APPLICATION_MODEL = ".freemarker.Application";
- private static final String ATTR_JSP_TAGLIBS_MODEL = ".freemarker.JspTaglibs";
- private static final String ATTR_REQUEST_MODEL = ".freemarker.Request";
- private static final String ATTR_REQUEST_PARAMETERS_MODEL = ".freemarker.RequestParameters";
+ protected static final String ATTR_APPLICATION_MODEL = ".freemarker.Application";
+ protected static final String ATTR_JSP_TAGLIBS_MODEL = ".freemarker.JspTaglibs";
+ protected static final String ATTR_REQUEST_MODEL = ".freemarker.Request";
+ protected static final String ATTR_REQUEST_PARAMETERS_MODEL = ".freemarker.RequestParameters";
// coppied from freemarker servlet - so that there is no dependency on it
public static final String KEY_APPLICATION = "Application";
@@ -119,11 +119,11 @@
public static final String KEY_JSP_TAGLIBS = "JspTaglibs";
public static final String KEY_REQUEST_PARAMETER_MODEL = "Parameters";
- private String encoding;
- private boolean altMapWrapper;
- private boolean cacheBeanWrapper;
- private int mruMaxStrongSize;
- private Map<String,TagLibrary> tagLibraries;
+ protected String encoding;
+ protected boolean altMapWrapper;
+ protected boolean cacheBeanWrapper;
+ protected int mruMaxStrongSize;
+ protected Map<String,TagLibrary> tagLibraries;
@Inject(StrutsConstants.STRUTS_I18N_ENCODING)
public void setEncoding(String encoding) {