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 2016/12/09 15:16:13 UTC
svn commit: r1773411 - in
/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource:
loader/StringResourceLoader.java util/StringResourceRepositoryImpl.java
Author: cbrisson
Date: Fri Dec 9 15:16:13 2016
New Revision: 1773411
URL: http://svn.apache.org/viewvc?rev=1773411&view=rev
Log:
[engine] remove duplicate 'UTF-8' constant
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java?rev=1773411&r1=1773410&r2=1773411&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java Fri Dec 9 15:16:13 2016
@@ -22,6 +22,7 @@ package org.apache.velocity.runtime.reso
import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
+import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.util.StringResource;
import org.apache.velocity.runtime.resource.util.StringResourceRepository;
@@ -150,10 +151,6 @@ public class StringResourceLoader extend
/** Key to look up the repository char encoding. */
public static final String REPOSITORY_ENCODING = "repository.encoding";
- /** The default repository encoding. */
- public static final String REPOSITORY_ENCODING_DEFAULT = "UTF-8";
-
-
protected static final Map STATIC_REPOSITORIES =
Collections.synchronizedMap(new HashMap());
@@ -317,7 +314,7 @@ public class StringResourceLoader extend
}
else
{
- repo.setEncoding(REPOSITORY_ENCODING_DEFAULT);
+ repo.setEncoding(RuntimeConstants.ENCODING_DEFAULT);
}
if (log.isDebugEnabled())
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java?rev=1773411&r1=1773410&r2=1773411&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/util/StringResourceRepositoryImpl.java Fri Dec 9 15:16:13 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.runtime.reso
* under the License.
*/
+import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
import java.util.Collections;
@@ -44,7 +45,7 @@ public class StringResourceRepositoryImp
/**
* Current Repository encoding.
*/
- private String encoding = StringResourceLoader.REPOSITORY_ENCODING_DEFAULT;
+ private String encoding = RuntimeConstants.ENCODING_DEFAULT;
/**
* @see StringResourceRepository#getStringResource(java.lang.String)