You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2017/01/26 01:26:27 UTC
svn commit: r1780303 - in /velocity/engine/trunk:
velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/
velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/
velocity-engine-scripting/src/main/java/org/ap...
Author: cbrisson
Date: Thu Jan 26 01:26:27 2017
New Revision: 1780303
URL: http://svn.apache.org/viewvc?rev=1780303&view=rev
Log:
[engine] fixed \n ocurrences
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java?rev=1780303&r1=1780302&r2=1780303&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/PrintExceptions.java Thu Jan 26 01:26:27 2017
@@ -81,7 +81,7 @@ public class PrintExceptions implements
}
if (showStackTrace)
{
- st.append("\n").append(getStackTrace(e));
+ st.append(System.lineSeparator()).append(getStackTrace(e));
}
return st.toString();
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=1780303&r1=1780302&r2=1780303&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java Thu Jan 26 01:26:27 2017
@@ -52,9 +52,9 @@ public class ResourceLoaderFactory
// The ugly three strike again: ClassNotFoundException,IllegalAccessException,InstantiationException
catch(Exception e)
{
- String msg = "Problem instantiating the template loader: "+loaderClassName+".\n" +
- "Look at your properties file and make sure the\n" +
- "name of the template loader is correct.";
+ String msg = "Problem instantiating the template loader: "+loaderClassName+"." + System.lineSeparator() +
+ "Look at your properties file and make sure the" + System.lineSeparator() +
+ "name of the template loader is correct.";
rs.getLog().error(msg, e);
throw new VelocityException(msg, e);
}
Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java?rev=1780303&r1=1780302&r2=1780303&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java (original)
+++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java Thu Jan 26 01:26:27 2017
@@ -201,7 +201,7 @@ public class VelocityScriptEngineFactory
for (int i = 0; i < statements.length; i++)
{
buf.append(statements[i]);
- buf.append("\n");
+ buf.append(System.lineSeparator());
}
return buf.toString();
}