You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/07/15 17:30:16 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper TemplateBaseLayoutMapper.java TemplateBaseMapper.java TemplateClassMapper.java TemplateDirectMapper.java TemplateLayoutMapper.java TemplateMapper.java TemplateScreenDefaultMapper.java TemplateScreenMapper.java
henning 2003/07/15 08:30:16
Modified: src/java/org/apache/turbine/services/template
TurbineTemplateService.java
src/java/org/apache/turbine/services/template/mapper
TemplateBaseLayoutMapper.java
TemplateBaseMapper.java TemplateClassMapper.java
TemplateDirectMapper.java TemplateLayoutMapper.java
TemplateMapper.java
TemplateScreenDefaultMapper.java
TemplateScreenMapper.java
Log:
Move the separator from String to char. This is a small performance penalty
now, because we must use String.valueOf(separator) in some places, but will be
a huge win, once the next commons-lang release is out which has join and
split methods using a char as separator. If we don't do this yet, we're doomed
to pull the then published method signatures over the whole 2.4 cycle.
Revision Changes Path
1.14 +2 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineTemplateService.java 15 Jul 2003 15:14:15 -0000 1.13
+++ TurbineTemplateService.java 15 Jul 2003 15:30:15 -0000 1.14
@@ -747,8 +747,7 @@
TemplateEngineService.DEFAULT_SCREEN_TEMPLATE
};
- String [] mapperSeparator =
- new String [] { ".", ".", ".", ".", "/", "/" };
+ char [] mapperSeparator = new char [] { '.', '.', '.', '.', '/', '/' };
Loader [] mapperLoader = new Loader [] {
null,
1.4 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseLayoutMapper.java
Index: TemplateBaseLayoutMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseLayoutMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateBaseLayoutMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateBaseLayoutMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -92,7 +92,7 @@
* @param defaultProperty The name of the default property to pull from the TemplateEngine
* @param separator The separator for this mapper.
*/
- public TemplateBaseLayoutMapper(boolean useCache, int cacheSize, String defaultProperty, String separator, String prefix)
+ public TemplateBaseLayoutMapper(boolean useCache, int cacheSize, String defaultProperty, char separator, String prefix)
{
super(useCache, cacheSize, defaultProperty, separator);
setPrefix(prefix);
@@ -133,7 +133,7 @@
// Does the Template Name component have an extension?
String [] components
- = StringUtils.split(res, separator);
+ = StringUtils.split(res, String.valueOf(separator));
if (components[components.length -1 ].indexOf(TemplateService.EXTENSION_SEPARATOR) < 0)
{
1.4 +5 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseMapper.java
Index: TemplateBaseMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateBaseMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateBaseMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -85,7 +85,7 @@
protected String defaultProperty;
/** The separator used to concatenate the result parts for this mapper. */
- protected String separator;
+ protected char separator;
// Note: You might _not_ use TurbineTemplate.<xxx> in the C'tor and the init method.
// The service isn't configured yet and if you do, the Broker will try to reinit the
@@ -108,7 +108,7 @@
* @param defaultProperty The name of the default property to pull from the TemplateEngine
* @param separator The separator for this mapper.
*/
- public TemplateBaseMapper(boolean useCache, int cacheSize, String defaultProperty, String separator)
+ public TemplateBaseMapper(boolean useCache, int cacheSize, String defaultProperty, char separator)
{
setCacheSize(cacheSize);
setUseCache(useCache);
@@ -174,7 +174,7 @@
* Get the Separator value.
* @return the Separator value.
*/
- public String getSeparator()
+ public char getSeparator()
{
return separator;
}
@@ -183,7 +183,7 @@
* Set the Separator value.
* @param separator The new Separator value.
*/
- public void setSeparator(String separator)
+ public void setSeparator(char separator)
{
this.separator = separator;
}
1.5 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateClassMapper.java
Index: TemplateClassMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateClassMapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TemplateClassMapper.java 15 Jul 2003 15:10:44 -0000 1.4
+++ TemplateClassMapper.java 15 Jul 2003 15:30:16 -0000 1.5
@@ -117,7 +117,7 @@
public TemplateClassMapper(boolean useCache,
int cacheSize,
String defaultProperty,
- String separator,
+ char separator,
Loader loader)
{
super(useCache, cacheSize, defaultProperty, separator);
@@ -179,7 +179,7 @@
for(;;)
{
- String pkg = StringUtils.join(components.iterator(), separator);
+ String pkg = StringUtils.join(components.iterator(), String.valueOf(separator));
StringBuffer testName = new StringBuffer();
log.debug("classPackage is now: " + pkg);
1.4 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateDirectMapper.java
Index: TemplateDirectMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateDirectMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateDirectMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateDirectMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -84,7 +84,7 @@
* @param defaultProperty The name of the default property to pull from the TemplateEngine
* @param separator The separator for this Mapper.
*/
- public TemplateDirectMapper(String defaultProperty, String separator)
+ public TemplateDirectMapper(String defaultProperty, char separator)
{
// Never cache, cacheSize isn't used.
super(false, 0, defaultProperty, separator);
@@ -111,6 +111,6 @@
components[components.length -1] = className;
// Class names are always separated by "."
- return StringUtils.join(components, separator);
+ return StringUtils.join(components, String.valueOf(separator));
}
}
1.4 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateLayoutMapper.java
Index: TemplateLayoutMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateLayoutMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateLayoutMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateLayoutMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -110,7 +110,7 @@
public TemplateLayoutMapper(boolean useCache,
int cacheSize,
String defaultProperty,
- String separator,
+ char separator,
String prefix)
{
super(useCache, cacheSize, defaultProperty, separator, prefix);
@@ -158,7 +158,7 @@
for(;;)
{
- String templatePackage = StringUtils.join(components.iterator(), separator);
+ String templatePackage = StringUtils.join(components.iterator(), String.valueOf(separator));
log.debug("templatePackage is now: " + templatePackage);
1.4 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateMapper.java
Index: TemplateMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -110,13 +110,13 @@
* Get the Separator value.
* @return the Separator value.
*/
- String getSeparator();
+ char getSeparator();
/**
* Set the Separator value.
* @param separator The new Separator value.
*/
- void setSeparator(String separator);
+ void setSeparator(char separator);
/**
1.2 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenDefaultMapper.java
Index: TemplateScreenDefaultMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenDefaultMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateScreenDefaultMapper.java 15 Jul 2003 15:16:39 -0000 1.1
+++ TemplateScreenDefaultMapper.java 15 Jul 2003 15:30:16 -0000 1.2
@@ -106,7 +106,7 @@
public TemplateScreenDefaultMapper(boolean useCache,
int cacheSize,
String defaultProperty,
- String separator,
+ char separator,
String prefix)
{
super(useCache, cacheSize, defaultProperty, separator, prefix);
@@ -153,7 +153,7 @@
for(;;)
{
- String templatePackage = StringUtils.join(components.iterator(), separator);
+ String templatePackage = StringUtils.join(components.iterator(), String.valueOf(separator));
log.debug("templatePackage is now: " + templatePackage);
1.4 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenMapper.java
Index: TemplateScreenMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateScreenMapper.java 15 Jul 2003 15:10:44 -0000 1.3
+++ TemplateScreenMapper.java 15 Jul 2003 15:30:16 -0000 1.4
@@ -94,7 +94,7 @@
public TemplateScreenMapper(boolean useCache,
int cacheSize,
String defaultProperty,
- String separator,
+ char separator,
String prefix)
{
super(useCache, cacheSize, defaultProperty, separator, prefix);
@@ -115,7 +115,7 @@
TemplateEngineService tes =
TurbineTemplate.getTemplateEngineService(components[components.length - 1]);
- String templatePackage = StringUtils.join(components, separator);
+ String templatePackage = StringUtils.join(components, String.valueOf(separator));
// But the Templating service must look for the name with prefix
StringBuffer testPath = new StringBuffer();
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org