bloritsch 01/10/25 12:32:59
Modified: src/org/apache/cocoon/acting
DatabaseAuthenticatorAction.java
src/org/apache/cocoon/caching CompositeCacheValidity.java
src/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup/xsp
EsqlQuery.java XSPObjectHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
xsp.xsl
src/org/apache/cocoon/components/language/programming
AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
JavaLanguage.java Javac.java Jikes.java
src/org/apache/cocoon/components/language/programming/javascript
JavascriptLanguage.java
src/org/apache/cocoon/components/source SitemapSource.java
src/org/apache/cocoon/components/xscript
StringBufferContentHandler.java
XScriptManagerImpl.java XScriptObjectFromURL.java
src/org/apache/cocoon/components/xslt XSLTProcessorImpl.java
src/org/apache/cocoon/environment AbstractEnvironment.java
src/org/apache/cocoon/environment/commandline
CommandlineContext.java
src/org/apache/cocoon/generation HTMLGenerator.java
ImageDirectoryGenerator.java
src/org/apache/cocoon/i18n XMLResourceBundle.java
Log:
Optimize critical path
Revision Changes Path
1.16 +4 -4
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DatabaseAuthenticatorAction.java 2001/10/11 07:28:15 1.15
+++ DatabaseAuthenticatorAction.java 2001/10/25 19:32:58 1.16
@@ -1,4 +1,4 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.15 2001/10/11 07:28:15 cziegeler Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.16 2001/10/25 19:32:58 bloritsch Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
@@ -54,7 +54,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.15 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/10/25 19:32:58 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements
ThreadSafe
{
@@ -206,7 +206,7 @@
} else {
if (!first_constraint)
queryBufferEnd.append (" AND ");
- queryBufferEnd.append (dbcol + "='" + request_value + "'");
+ queryBufferEnd.append
(dbcol).append("='").append(request_value).append("'");
first_constraint = false;
}
}
@@ -272,5 +272,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.15 2001/10/11 07:28:15 cziegeler Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.16 2001/10/25 19:32:58 bloritsch Exp $
// vim: set et ts=4 sw=4:
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java
Index: CompositeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeCacheValidity.java 2001/08/20 13:55:10 1.2
+++ CompositeCacheValidity.java 2001/10/25 19:32:58 1.3
@@ -13,7 +13,7 @@
* A validation object using a Hashmap.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/25 19:32:58 $
*/
public final class CompositeCacheValidity
implements CacheValidity {
@@ -43,7 +43,7 @@
}
public String toString() {
- return "CompositeCacheValidity: " + v1.toString() + ":" + v2.toString();
+ return new StringBuffer("CompositeCacheValidity:
").append(v1).append(":").append(v2).toString();
}
}
1.22 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ProgramGeneratorImpl.java 2001/10/11 07:20:25 1.21
+++ ProgramGeneratorImpl.java 2001/10/25 19:32:58 1.22
@@ -39,7 +39,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.21 $ $Date: 2001/10/11 07:20:25 $
+ * @version CVS $Revision: 1.22 $ $Date: 2001/10/25 19:32:58 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -314,7 +314,8 @@
code = codeFormatter.format(code, encoding);
}
// Store generated code
- String sourceFilename = normalizedName + "." +
programmingLanguage.getSourceExtension();
+ String sourceFilename = new StringBuffer(normalizedName).append(".")
+
.append(programmingLanguage.getSourceExtension()).toString();
repository.store(sourceFilename, code);
// [Compile]/Load generated program
Class program = programmingLanguage.load(normalizedName, this.workDir,
markupLanguage.getEncoding());
1.2 +5 -5
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/EsqlQuery.java
Index: EsqlQuery.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/EsqlQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EsqlQuery.java 2001/10/17 14:12:14 1.1
+++ EsqlQuery.java 2001/10/25 19:32:58 1.2
@@ -68,15 +68,15 @@
case EsqlConnection.LIMIT_METHOD_POSTGRESQL:
if (skipRows > 0) {
if (maxRows > -1) {
- return(query + " LIMIT " + maxRows + "," + skipRows);
+ return(new StringBuffer(query).append(" LIMIT
").append(maxRows).append(",").append(skipRows).toString());
}
else {
- return(query + " OFFSET " + skipRows);
+ return(new StringBuffer(query).append(" OFFSET
").append(skipRows).toString());
}
}
else {
if (maxRows > -1) {
- return(query + " LIMIT " + maxRows);
+ return(new StringBuffer(query).append(" LIMIT
").append(maxRows).toString());
}
else {
return(query);
@@ -85,7 +85,7 @@
case EsqlConnection.LIMIT_METHOD_MYSQL:
if (skipRows > 0) {
if (maxRows > -1) {
- return(query + " LIMIT " + skipRows + "," + maxRows);
+ return(new StringBuffer(query).append(" LIMIT
").append(skipRows).append(",").append(maxRows).toString());
}
else {
throw new RuntimeException("MySQL does not support a skip of rows
only");
@@ -93,7 +93,7 @@
}
else {
if (maxRows > -1) {
- return(query + " LIMIT " + maxRows);
+ return(new StringBuffer(query).append(" LIMIT
").append(maxRows).toString());
}
else {
return(query);
1.9 +4 -4
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Index: XSPObjectHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSPObjectHelper.java 2001/10/15 13:40:55 1.8
+++ XSPObjectHelper.java 2001/10/25 19:32:58 1.9
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* (Cocoon1 <code>xspExpr()</code> methods port)
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/15 13:40:55 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/25 19:32:58 $
*/
public class XSPObjectHelper {
/**
@@ -85,7 +85,7 @@
)
throws SAXException
{
- contentHandler.startElement(uri, name, prefix + ":" + name, emptyAttr);
+ contentHandler.startElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString(), emptyAttr);
}
/**
@@ -103,7 +103,7 @@
)
throws SAXException
{
- contentHandler.startElement(uri, name, prefix + ":" + name, attr);
+ contentHandler.startElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString(), attr);
}
/**
@@ -118,7 +118,7 @@
)
throws SAXException
{
- contentHandler.endElement(uri, name, prefix + ":" + name);
+ contentHandler.endElement(uri, name, new
StringBuffer(prefix).append(":").append(name).toString());
}
/**
1.10 +3 -4
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xsp.xsl 2001/09/19 14:46:37 1.9
+++ xsp.xsl 2001/10/25 19:32:58 1.10
@@ -12,7 +12,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/25 19:32:58 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -190,7 +190,7 @@
<xsl:copy-of select="$name"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="$prefix"/> + ":" + <xsl:copy-of select="$name"/>
+ new StringBuffer(<xsl:copy-of
select="$prefix"/>).append(":").append(<xsl:copy-of select="$name"/>).toString()
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -279,8 +279,7 @@
<xsl:copy-of select="$name"/>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="$prefix"/> + ":" + <xsl:copy-of select="$name"/>
- </xsl:otherwise>
+ new StringBuffer(<xsl:copy-of
select="$prefix"/>).append(":").append(<xsl:copy-of select="$name"/>).toString()
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
1.5 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractProgrammingLanguage.java 2001/10/11 07:20:26 1.4
+++ AbstractProgrammingLanguage.java 2001/10/25 19:32:58 1.5
@@ -23,7 +23,7 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/25 19:32:58 $
*/
public abstract class AbstractProgrammingLanguage extends AbstractLoggable
implements ProgrammingLanguage, Configurable
@@ -102,7 +102,7 @@
throws LanguageException
{
File file = new File (
- baseDirectory, filename + "." + this.getSourceExtension()
+ baseDirectory, new
StringBuffer(filename).append(".").append(this.getSourceExtension()).toString()
);
file.delete();
1.9 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CompiledProgrammingLanguage.java 2001/10/11 07:20:26 1.8
+++ CompiledProgrammingLanguage.java 2001/10/25 19:32:58 1.9
@@ -22,7 +22,7 @@
* A compiled programming language. This class extends
<code>AbstractProgrammingLanguage</code> adding support for compilation
* and object program files
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/11 07:20:26 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/25 19:32:58 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
@@ -122,12 +122,12 @@
*/
public Class load(String filename, File baseDirectory, String encoding) throws
LanguageException {
// Does object file exist? Load and return instance
- File objectFile = new File(baseDirectory, filename + "." +
this.getObjectExtension());
+ File objectFile = new File(baseDirectory, new
StringBuffer(filename).append(".").append(this.getObjectExtension()).toString());
if (objectFile.exists() && objectFile.isFile() && objectFile.canRead()) {
return this.loadProgram(filename, baseDirectory);
}
// Does source file exist?
- File sourceFile = new File(baseDirectory, filename + "." +
this.getSourceExtension());
+ File sourceFile = new File(baseDirectory, new
StringBuffer(filename).append(".").append(this.getSourceExtension()).toString());
if (!sourceFile.exists()) {
throw new LanguageException("Can't load program - File doesn't exist: "
+ IOUtils.getFullFilename(sourceFile));
}
1.11 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JavaLanguage.java 2001/10/11 07:20:26 1.10
+++ JavaLanguage.java 2001/10/25 19:32:58 1.11
@@ -31,7 +31,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/10/11 07:20:26 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/25 19:32:58 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
@@ -150,7 +150,8 @@
baseDirectory.getCanonicalPath() + File.separator +
name.substring(0, pos).replace(File.separatorChar, '/');
String filename_abs =
- pathname + File.separator + filename + "." + this.getSourceExtension();
+ new StringBuffer(pathname).append(File.separator).append(filename)
+ .append(".").append(this.getSourceExtension()).toString();
compiler.setFile(filename_abs);
1.10 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Javac.java 2001/10/10 09:30:51 1.9
+++ Javac.java 2001/10/25 19:32:58 1.10
@@ -22,7 +22,7 @@
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.9 $ $Date: 2001/10/10 09:30:51 $
+ * @version $Revision: 1.10 $ $Date: 2001/10/25 19:32:58 $
* @since 2.0
*/
@@ -130,7 +130,7 @@
StringTokenizer tokens = new StringTokenizer(error, ":");
try {
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
int line = Integer.parseInt(tokens.nextToken());
String message = tokens.nextToken("\n").substring(1);
@@ -191,7 +191,7 @@
StringTokenizer tokens = new StringTokenizer(error, ":");
try {
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
int line = Integer.parseInt(tokens.nextToken());
String last = tokens.nextToken();
1.9 +8 -8
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Jikes.java 2001/10/11 07:20:26 1.8
+++ Jikes.java 2001/10/25 19:32:58 1.9
@@ -19,7 +19,7 @@
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.8 $ $Date: 2001/10/11 07:20:26 $
+ * @version $Revision: 1.9 $ $Date: 2001/10/25 19:32:58 $
* @since 2.0
*/
@@ -197,8 +197,8 @@
private CompilerError parseError(String error) {
StringTokenizer tokens = new StringTokenizer(error, ":");
String file = tokens.nextToken();
- if (file.length() == 1) file += ":" + tokens.nextToken();
- String message = "";
+ if (file.length() == 1) file = new
StringBuffer(file).append(":").append(tokens.nextToken()).toString();
+ StringBuffer message = new StringBuffer();
String type = "";
int startline = 0;
int startcolumn = 0;
@@ -212,20 +212,20 @@
endcolumn = Integer.parseInt(tokens.nextToken());
} catch (Exception e) {
// FIXME: VG: This is not needed anymore?
- message = "Please ensure that you have your JDK's rt.jar listed in your
classpath. Jikes needs it to operate.";
+ message.append("Please ensure that you have your JDK's rt.jar listed in
your classpath. Jikes needs it to operate.");
type="error";
- getLogger().error(message, e);
+ getLogger().error(message.toString(), e);
}
if ("".equals(message)) {
type = tokens.nextToken().trim().toLowerCase();
- message = tokens.nextToken("\n").substring(1).trim();
+ message.append(tokens.nextToken("\n").substring(1).trim());
while (tokens.hasMoreTokens())
- message += "\n" + tokens.nextToken();
+ message.append("\n").append(tokens.nextToken());
}
- return new CompilerError(file, type.equals("error"), startline,
startcolumn, endline, endcolumn, message);
+ return new CompilerError(file, type.equals("error"), startline,
startcolumn, endline, endcolumn, message.toString());
}
public String toString() {
1.5 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
Index: JavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavascriptLanguage.java 2001/10/11 07:20:26 1.4
+++ JavascriptLanguage.java 2001/10/25 19:32:58 1.5
@@ -17,7 +17,7 @@
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/11 07:20:26 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/25 19:32:58 $
*/
public class JavascriptLanguage extends JavaLanguage
{
@@ -68,7 +68,8 @@
"-nosource",
"-O", "9",
"-package", packageName,
- pathname + File.separator + filename + "." + this.getSourceExtension()
+ new StringBuffer(pathname).append(File.separator)
+
.append(filename).append(".").append(this.getSourceExtension()).toString()
};
compiler.main(args);
1.25 +9 -5
xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SitemapSource.java 2001/10/11 07:28:19 1.24
+++ SitemapSource.java 2001/10/25 19:32:59 1.25
@@ -46,7 +46,7 @@
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.24 $ $Date: 2001/10/11 07:28:19 $
+ * @version CVS $Revision: 1.25 $ $Date: 2001/10/25 19:32:59 $
*/
public final class SitemapSource
@@ -135,10 +135,14 @@
}
Request request=
(Request)env.getObjectModel().get(Constants.REQUEST_OBJECT);
boolean isDefaultPort = "http".equalsIgnoreCase(request.getScheme()) && 80
== request.getServerPort();
- this.systemId = request.getScheme() + "://" +
- request.getServerName() +
- (isDefaultPort ? "" : ":" + request.getServerPort()) +
- request.getContextPath() + '/' + requestURI;
+ StringBuffer sysID = new StringBuffer(request.getScheme()).append("://")
+ .append(request.getServerName());
+
+ if ( ! isDefaultPort ) {
+ sysID.append(":").append(request.getServerPort());
+ }
+ sysID.append(request.getContextPath()).append('/').append(requestURI);
+ this.systemId = sysID.toString();
this.environment = new EnvironmentWrapper(env, requestURI, queryString,
logger);
queryStringPos = uri.indexOf('?');
if (queryStringPos != -1) {
1.2 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/xscript/StringBufferContentHandler.java
Index: StringBufferContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xscript/StringBufferContentHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringBufferContentHandler.java 2001/10/10 20:53:56 1.1
+++ StringBufferContentHandler.java 2001/10/25 19:32:59 1.2
@@ -72,7 +72,7 @@
namespaces.push(marker);
- stringBuffer.append("<" + qName);
+ stringBuffer.append("<").append(qName);
for (int i = 0, len = a.getLength(); i < len; i++) {
// Check if the attribute is a namespace declaration. Some
@@ -107,8 +107,8 @@
}
else {
// Normal attribute
- stringBuffer.append(" " + a.getQName(i)
- + "=\"" + a.getValue(i) + "\"");
+ stringBuffer.append(" ").append(a.getQName(i))
+ .append("=\"").append(a.getValue(i)).append("\"");
}
}
@@ -118,7 +118,7 @@
if (obj == marker)
continue;
NPU npu = (NPU)obj;
- stringBuffer.append(" xmlns:" + npu.prefix + "=\"" + npu.uri + "\"");
+ stringBuffer.append("
xmlns:").append(npu.prefix).append("=\"").append(npu.uri).append("\"");
}
}
stringBuffer.append(">");
@@ -127,7 +127,7 @@
public void endElement(String uri, String loc, String qName)
throws SAXException
{
- stringBuffer.append("</" + qName + ">");
+ stringBuffer.append("</").append(qName).append(">");
Object obj;
do {
@@ -155,7 +155,7 @@
public String toString()
{
- return this.prefix + "=" + this.uri;
+ return new StringBuffer(this.prefix).append("=").append(this.uri).toString();
}
}
1.2 +9 -8
xml-cocoon2/src/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
Index: XScriptManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xscript/XScriptManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XScriptManagerImpl.java 2001/10/10 20:53:56 1.1
+++ XScriptManagerImpl.java 2001/10/25 19:32:59 1.2
@@ -94,20 +94,21 @@
private IllegalArgumentException
createAccessException(String msg, String name, int scope, String context)
{
- String message = "Cannot " + msg + " variable named '"
- + name + "' in ";
+ StringBuffer message = new StringBuffer("Cannot ").append(msg)
+ .append(" variable named '").append(name)
+ .append("' in ");
if (scope == XScriptManager.GLOBAL_SCOPE)
- message += "global scope";
+ message.append("global scope");
else if (scope == XScriptManager.SESSION_SCOPE)
- message += "session scope";
+ message.append("session scope");
else if (scope == XScriptManager.PAGE_SCOPE)
- message += "page scope";
+ message.append("page scope");
else
- message += "unknown scope (" + scope + ")";
+ message.append("unknown scope (").append(scope).append(")");
- message += " with context '" + context + "'";
- return new IllegalArgumentException(message);
+ message.append(" with context '").append(context).append("'");
+ return new IllegalArgumentException(message.toString());
}
public XScriptObject get(String name, int scope, String context)
1.2 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java
Index: XScriptObjectFromURL.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XScriptObjectFromURL.java 2001/10/10 20:53:56 1.1
+++ XScriptObjectFromURL.java 2001/10/25 19:32:59 1.2
@@ -89,6 +89,6 @@
public String toString()
{
- return "XScriptObjectFromURL(systemId = " + systemId + ")";
+ return new StringBuffer("XScriptObjectFromURL(systemId =
").append(systemId).append(")").toString();
}
}
1.10 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSLTProcessorImpl.java 2001/10/15 10:21:36 1.9
+++ XSLTProcessorImpl.java 2001/10/25 19:32:59 1.10
@@ -360,8 +360,8 @@
return null; // we can't resolve this
}
else {
- xslSource = resolver.resolve(base.substring(0, lastPathElementPos)
- + "/" + href);
+ xslSource = resolver.resolve(new StringBuffer(base.substring(0,
lastPathElementPos))
+ .append("/").append(href).toString());
}
}
else {
1.24 +5 -3
xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractEnvironment.java 2001/10/11 07:28:20 1.23
+++ AbstractEnvironment.java 2001/10/25 19:32:59 1.24
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.23 $ $Date: 2001/10/11 07:28:20 $
+ * @version CVS $Revision: 1.24 $ $Date: 2001/10/25 19:32:59 $
*/
public abstract class AbstractEnvironment extends AbstractLoggable implements
Environment {
@@ -274,10 +274,12 @@
} else if (systemId.indexOf(":") > 1) {
source = this.sourceHandler.getSource(this, systemId);
} else if (systemId.charAt(0) == '/') {
- source = this.sourceHandler.getSource(this, this.context.getProtocol()
+ ":" + systemId);
+ source = this.sourceHandler.getSource(this, new
StringBuffer(this.context.getProtocol())
+
.append(":").append(systemId).toString());
// windows: absolute paths can start with drive letter
} else if (systemId.length() > 1 && systemId.charAt(1) == ':') {
- source = this.sourceHandler.getSource(this, this.context.getProtocol()
+ ":/" + systemId);
+ source = this.sourceHandler.getSource(this, new
StringBuffer(this.context.getProtocol())
+
.append(":/").append(systemId).toString());
} else {
source = this.sourceHandler.getSource(this, this.context, systemId);
}
1.8 +1 -1
xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java
Index: CommandlineContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommandlineContext.java 2001/10/17 09:19:04 1.7
+++ CommandlineContext.java 2001/10/25 19:32:59 1.8
@@ -61,7 +61,7 @@
public URL getResource(String path) throws MalformedURLException {
getLogger().debug("CommandlineContext: getResource=" + path);
//return servletContext.getResource(path);
- return new URL("file:" + this.contextDir + path);
+ return new URL(new
StringBuffer("file:").append(this.contextDir).append(path).toString());
}
public String getRealPath(String path) {
1.16 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HTMLGenerator.java 2001/10/11 07:28:21 1.15
+++ HTMLGenerator.java 2001/10/25 19:32:59 1.16
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/10/11 07:28:21 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/10/25 19:32:59 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable, Composable, Disposable {
@@ -103,7 +103,7 @@
}
if (query.length() > 0) {
- super.source += "?" + query.substring( 0, query.length() - 1 );
+ super.source = new
StringBuffer(super.source).append("?").append(query.substring( 0, query.length() - 1
)).toString();
}
}
1.11 +3 -3
xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ImageDirectoryGenerator.java 2001/10/11 07:28:21 1.10
+++ ImageDirectoryGenerator.java 2001/10/25 19:32:59 1.11
@@ -17,7 +17,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald A. Ball Jr.</a>
- * @version $Revision: 1.10 $ $Date: 2001/10/11 07:28:21 $
+ * @version $Revision: 1.11 $ $Date: 2001/10/25 19:32:59 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
@@ -37,8 +37,8 @@
try {
int dim[] = getSize(path);
getLogger().debug("getSize(path) = " + dim);
-
attributes.addAttribute("",IMAGE_WIDTH_ATTR_NAME,IMAGE_WIDTH_ATTR_NAME,"CDATA",""+dim[0]);
-
attributes.addAttribute("",IMAGE_HEIGHT_ATTR_NAME,IMAGE_HEIGHT_ATTR_NAME,"CDATA",""+dim[1]);
+
attributes.addAttribute("",IMAGE_WIDTH_ATTR_NAME,IMAGE_WIDTH_ATTR_NAME,"CDATA",String.valueOf(dim[0]));
+
attributes.addAttribute("",IMAGE_HEIGHT_ATTR_NAME,IMAGE_HEIGHT_ATTR_NAME,"CDATA",String.valueOf(dim[1]));
} catch (RuntimeException e) {
getLogger().debug("ImageDirectoryGenerator.setNodeAttributes", e);
} catch (Exception e) {
1.6 +6 -5 xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLResourceBundle.java 2001/10/11 07:28:22 1.5
+++ XMLResourceBundle.java 2001/10/25 19:32:59 1.6
@@ -32,7 +32,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Oleg Podolsky</a>
- * @version $Id: XMLResourceBundle.java,v 1.5 2001/10/11 07:28:22 cziegeler Exp $
+ * @version $Id: XMLResourceBundle.java,v 1.6 2001/10/25 19:32:59 bloritsch Exp $
*/
public class XMLResourceBundle
extends ResourceBundle
@@ -226,7 +226,7 @@
if(child.getNodeType() == Node.ELEMENT_NODE)
{
- String pathToChild = pathToParent + '/' + child.getNodeName();
+ StringBuffer pathToChild = new
StringBuffer(pathToParent).append('/').append(child.getNodeName());
NamedNodeMap attrs = child.getAttributes();
if(attrs != null)
@@ -238,15 +238,16 @@
{
temp = attrs.item(j);
if (!temp.getNodeName().equalsIgnoreCase("xml:lang"))
- pathToChild += "[@" + temp.getNodeName() + "='" +
temp.getNodeValue() + "']";
+ pathToChild.append("[@").append(temp.getNodeName())
+
.append("='").append(temp.getNodeValue()).append("']");
}
}
String childValue = getTextValue(child);
if(childValue != null)
- cacheKey(pathToChild, childValue);
+ cacheKey(pathToChild.toString(), childValue);
else
- cacheAll(child, pathToChild);
+ cacheAll(child, pathToChild.toString());
}
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
