dlr 01/07/23 18:25:51
Modified: src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
Log:
The default character set is now a constant class member (rather than
an instance variable like it used to be).
Revision Changes Path
1.57 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -u -r1.56 -r1.57
--- TurbineVelocityService.java 2001/07/17 11:37:32 1.56
+++ TurbineVelocityService.java 2001/07/24 01:25:51 1.57
@@ -89,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.56 2001/07/17 11:37:32 jvanzyl Exp
$
+ * @version $Id: TurbineVelocityService.java,v 1.57 2001/07/24 01:25:51 dlr Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -105,7 +105,7 @@
* Default character encoding to use if not specified in the
* RunData object.
*/
- private String defaultCharSet = "ISO-8859-1";
+ private static final String DEFAULT_CHAR_SET = "ISO-8859-1";
/**
* Performs early initialization of this Turbine service.
@@ -235,13 +235,13 @@
charset = ((RunData) data).getCharSet();
if (charset == null)
{
- charset = defaultCharSet;
+ charset = DEFAULT_CHAR_SET;
}
encoding = ((RunData) data).getTemplateEncoding();
}
else
{
- charset = defaultCharSet;
+ charset = DEFAULT_CHAR_SET;
encoding = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
