You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/02/17 17:45:10 UTC
[2/2] incubator-freemarker git commit: Removed unnecessary "this."-s
Removed unnecessary "this."-s
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ee8e2096
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ee8e2096
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ee8e2096
Branch: refs/heads/3
Commit: ee8e209676e5c5689493ac4b4804003bb02e0ab3
Parents: 18843c0
Author: ddekany <dd...@apache.org>
Authored: Fri Feb 17 18:45:05 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Feb 17 18:45:05 2017 +0100
----------------------------------------------------------------------
.../org/apache/freemarker/core/Template.java | 32 ++++----
.../org/apache/freemarker/core/Version.java | 20 ++---
.../core/ast/AddConcatExpression.java | 4 +-
.../ast/AliasTemplateDateFormatFactory.java | 4 +-
.../ast/AliasTemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/ast/BoundedRangeModel.java | 2 +-
.../ast/BuiltInWithParseTimeParameters.java | 2 +-
.../freemarker/core/ast/BuiltInsForDates.java | 4 +-
.../core/ast/BuiltInsForMultipleTypes.java | 4 +-
.../core/ast/BuiltInsForStringsEncoding.java | 4 +-
.../core/ast/BuiltInsForStringsRegexp.java | 4 +-
.../org/apache/freemarker/core/ast/Case.java | 2 +-
.../core/ast/CollectionAndSequence.java | 2 +-
.../core/ast/CommonMarkupOutputFormat.java | 2 +-
.../ast/CommonTemplateMarkupOutputModel.java | 10 +--
.../freemarker/core/ast/Configurable.java | 8 +-
.../apache/freemarker/core/ast/DebugBreak.java | 2 +-
.../freemarker/core/ast/DollarVariable.java | 2 +-
.../apache/freemarker/core/ast/Environment.java | 82 ++++++++++----------
.../apache/freemarker/core/ast/EscapeBlock.java | 2 +-
.../apache/freemarker/core/ast/Expression.java | 2 +-
.../core/ast/ExtendedDecimalFormatParser.java | 2 +-
.../freemarker/core/ast/FreeMarkerTree.java | 4 +-
.../apache/freemarker/core/ast/HashLiteral.java | 2 +-
.../apache/freemarker/core/ast/Identifier.java | 4 +-
.../org/apache/freemarker/core/ast/Include.java | 10 +--
.../freemarker/core/ast/IteratorBlock.java | 20 ++---
.../apache/freemarker/core/ast/LibraryLoad.java | 6 +-
.../org/apache/freemarker/core/ast/Macro.java | 18 ++---
.../freemarker/core/ast/NumericalOutput.java | 4 +-
.../freemarker/core/ast/ParseException.java | 2 +-
.../freemarker/core/ast/StopException.java | 4 +-
.../freemarker/core/ast/StringLiteral.java | 4 +-
.../freemarker/core/ast/TemplateElement.java | 10 +--
.../apache/freemarker/core/ast/TextBlock.java | 42 +++++-----
.../freemarker/core/ast/TokenMgrError.java | 20 ++---
.../core/ast/_DelayedConversionToString.java | 4 +-
.../core/ast/_ErrorDescriptionBuilder.java | 8 +-
.../core/debug/EnvironmentSuspendedEvent.java | 6 +-
.../core/debug/impl/DebuggerServer.java | 2 +-
.../debug/impl/RmiDebuggedEnvironmentImpl.java | 2 +-
.../core/debug/impl/RmiDebuggerService.java | 2 +-
.../impl/DefaultObjectWrapperConfiguration.java | 4 +-
.../freemarker/core/model/impl/SimpleHash.java | 4 +-
.../core/model/impl/SimpleNumber.java | 12 +--
.../core/model/impl/beans/BeansWrapper.java | 18 ++---
.../model/impl/beans/ClassIntrospector.java | 12 +--
.../model/impl/beans/MemberAndArguments.java | 4 +-
.../core/model/impl/beans/ModelCache.java | 2 +-
.../model/impl/beans/OverloadedNumberUtil.java | 2 +-
.../core/model/impl/dom/ElementModel.java | 4 +-
.../core/model/impl/dom/NodeModel.java | 4 +-
.../core/model/impl/dom/NodeOutputter.java | 8 +-
...ConditionalTemplateConfigurationFactory.java | 4 +-
.../templateresolver/GetTemplateResult.java | 18 ++---
.../templateresolver/TemplateLoadingResult.java | 18 ++---
.../impl/ClassTemplateLoader.java | 2 +-
.../impl/FileTemplateLoader.java | 8 +-
.../templateresolver/impl/MruCacheStorage.java | 2 +-
.../templateresolver/impl/SoftCacheStorage.java | 2 +-
.../freemarker/core/util/_ArrayEnumeration.java | 2 +-
.../freemarker/core/util/_ArrayIterator.java | 2 +-
.../freemarker/servlet/FreemarkerServlet.java | 4 +-
.../servlet/HttpSessionHashModel.java | 6 +-
.../servlet/ServletContextHashModel.java | 4 +-
.../servlet/WebAppTemplateLoader.java | 8 +-
.../servlet/jsp/FreeMarkerPageContext.java | 6 +-
.../freemarker/servlet/jsp/TaglibFactory.java | 12 +--
.../freemarker/core/ConfigurationTest.java | 2 +-
.../core/TemplateNotFoundMessageTest.java | 4 +-
.../core/ast/ObjectBuilderSettingsTest.java | 20 ++---
.../ast/PrintfGTemplateNumberFormatFactory.java | 2 +-
.../impl/beans/BeansWrapperSingletonsTest.java | 2 +-
.../beans/BeansWrapperWithShortedMethods.java | 4 +-
.../freemarker/manualtest/ExamplesTest.java | 7 +-
.../freemarker/servlet/InitParamParserTest.java | 6 +-
.../apache/freemarker/test/TemplateTest.java | 4 +-
.../hamcerst/StringContainsIgnoringCase.java | 2 +-
.../freemarker/test/servlet/WebAppTestCase.java | 2 +-
.../freemarker/test/util/FileTestCase.java | 2 +-
80 files changed, 303 insertions(+), 300 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/Template.java b/src/main/java/org/apache/freemarker/core/Template.java
index 77b18f3..9c97c5c 100644
--- a/src/main/java/org/apache/freemarker/core/Template.java
+++ b/src/main/java/org/apache/freemarker/core/Template.java
@@ -117,8 +117,8 @@ public class Template extends Configurable {
super(toNonNull(cfg));
this.name = name;
this.sourceName = sourceName;
- this.templateLanguageVersion = normalizeTemplateLanguageVersion(toNonNull(cfg).getIncompatibleImprovements());
- this.parserConfiguration = customParserConfiguration != null ? customParserConfiguration : getConfiguration();
+ templateLanguageVersion = normalizeTemplateLanguageVersion(toNonNull(cfg).getIncompatibleImprovements());
+ parserConfiguration = customParserConfiguration != null ? customParserConfiguration : getConfiguration();
}
private static Configuration toNonNull(Configuration cfg) {
@@ -256,8 +256,8 @@ public class Template extends Configurable {
this(name, sourceName, cfg, customParserConfiguration);
_NullArgumentException.check("templateSpecifiedEncodingHandler", templateSpecifiedEncodingHandler);
-
- this.setEncoding(encoding);
+
+ setEncoding(encoding);
LineTableBuilder ltbReader;
try {
ParserConfiguration actualParserConfiguration = getParserConfiguration();
@@ -275,7 +275,7 @@ public class Template extends Configurable {
parser = _CoreAPI.newFMParser(
this, reader, actualParserConfiguration, templateSpecifiedEncodingHandler);
try {
- this.rootElement = parser.Root();
+ rootElement = parser.Root();
} catch (IndexOutOfBoundsException exc) {
// There's a JavaCC bug where the Reader throws a RuntimeExcepton and then JavaCC fails with
// IndexOutOfBoundsException. If that wasn't the case, we just rethrow. Otherwise we suppress the
@@ -285,8 +285,8 @@ public class Template extends Configurable {
}
rootElement = null;
}
- this.actualTagSyntax = parser._getLastTagSyntax();
- this.actualNamingConvention = parser._getLastNamingConvention();
+ actualTagSyntax = parser._getLastTagSyntax();
+ actualNamingConvention = parser._getLastNamingConvention();
} catch (TokenMgrError exc) {
// TokenMgrError VS ParseException is not an interesting difference for the user, so we just convert it
// to ParseException
@@ -327,9 +327,9 @@ public class Template extends Configurable {
*/
@Deprecated
// [2.4] remove this
- Template(String name, TemplateElement root, Configuration cfg) {
+ Template(String name, TemplateElement rootElement, Configuration cfg) {
this(name, null, cfg, (ParserConfiguration) null);
- this.rootElement = root;
+ this.rootElement = rootElement;
DebuggerService.registerTemplate(this);
}
@@ -634,7 +634,7 @@ public class Template extends Configurable {
* the encoding returned by {@link Configuration#getEncoding(java.util.Locale)} should be used instead.
*/
public String getEncoding() {
- return this.encoding;
+ return encoding;
}
/**
@@ -955,7 +955,7 @@ public class Template extends Configurable {
throw new IllegalArgumentException("The namespace URI: " + nsURI + " cannot be mapped to 2 different prefixes.");
}
if (prefix.equals(DEFAULT_NAMESPACE_PREFIX)) {
- this.defaultNS = nsURI;
+ defaultNS = nsURI;
} else {
prefixToNamespaceURILookup.put(prefix, nsURI);
namespaceURIToPrefixLookup.put(nsURI, prefix);
@@ -963,7 +963,7 @@ public class Template extends Configurable {
}
public String getDefaultNS() {
- return this.defaultNS;
+ return defaultNS;
}
/**
@@ -1046,7 +1046,7 @@ public class Template extends Configurable {
/** @deprecated Use {@link #getTemplateSpecifiedEncoding()} instead. */
@Deprecated
- public String specifiedEncoding;
+ public String templateSpecifiedEncoding;
private final String constructorSpecifiedEncoding;
@@ -1062,13 +1062,13 @@ public class Template extends Configurable {
* @since 2.3.22
*/
public WrongEncodingException(String templateSpecifiedEncoding, String constructorSpecifiedEncoding) {
- this.specifiedEncoding = templateSpecifiedEncoding;
+ this.templateSpecifiedEncoding = templateSpecifiedEncoding;
this.constructorSpecifiedEncoding = constructorSpecifiedEncoding;
}
@Override
public String getMessage() {
- return "Encoding specified inside the template (" + specifiedEncoding
+ return "Encoding specified inside the template (" + templateSpecifiedEncoding
+ ") doesn't match the encoding specified for the Template constructor"
+ (constructorSpecifiedEncoding != null ? " (" + constructorSpecifiedEncoding + ")." : ".");
}
@@ -1077,7 +1077,7 @@ public class Template extends Configurable {
* @since 2.3.22
*/
public String getTemplateSpecifiedEncoding() {
- return specifiedEncoding;
+ return templateSpecifiedEncoding;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/Version.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/Version.java b/src/main/java/org/apache/freemarker/core/Version.java
index f399fa4..3ff91d8 100644
--- a/src/main/java/org/apache/freemarker/core/Version.java
+++ b/src/main/java/org/apache/freemarker/core/Version.java
@@ -135,23 +135,23 @@ public final class Version implements Serializable {
*/
public Version(int intValue) {
this.intValue = intValue;
-
- this.micro = intValue % 1000;
- this.minor = (intValue / 1000) % 1000;
- this.major = intValue / 1000000;
-
- this.extraInfo = null;
- this.gaeCompliant = null;
- this.buildDate = null;
+
+ micro = intValue % 1000;
+ minor = (intValue / 1000) % 1000;
+ major = intValue / 1000000;
+
+ extraInfo = null;
+ gaeCompliant = null;
+ buildDate = null;
originalStringValue = null;
}
- public Version(int major, int minor, int micro, String extraInfo, Boolean gaeCompatible, Date buildDate) {
+ public Version(int major, int minor, int micro, String extraInfo, Boolean gaeCompliant, Date buildDate) {
this.major = major;
this.minor = minor;
this.micro = micro;
this.extraInfo = extraInfo;
- this.gaeCompliant = gaeCompatible;
+ this.gaeCompliant = gaeCompliant;
this.buildDate = buildDate;
intValue = calculateIntValue();
originalStringValue = null;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
index 813277d..fc48738 100644
--- a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
+++ b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
@@ -275,8 +275,8 @@ final class AddConcatExpression extends Expression {
if (keys == null) {
HashSet keySet = new HashSet();
SimpleSequence keySeq = new SimpleSequence(32);
- addKeys(keySet, keySeq, (TemplateHashModelEx) this.left);
- addKeys(keySet, keySeq, (TemplateHashModelEx) this.right);
+ addKeys(keySet, keySeq, (TemplateHashModelEx) left);
+ addKeys(keySet, keySeq, (TemplateHashModelEx) right);
size = keySet.size();
keys = new CollectionAndSequence(keySeq);
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
index dc0c510..014c221 100644
--- a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
@@ -41,7 +41,7 @@ public final class AliasTemplateDateFormatFactory extends TemplateDateFormatFact
* The format string this format will be an alias to.
*/
public AliasTemplateDateFormatFactory(String targetFormatString) {
- this.defaultTargetFormatString = targetFormatString;
+ defaultTargetFormatString = targetFormatString;
localizedTargetFormatStrings = null;
}
@@ -80,7 +80,7 @@ public final class AliasTemplateDateFormatFactory extends TemplateDateFormatFact
targetFormatString = null;
}
if (targetFormatString == null) {
- targetFormatString = this.defaultTargetFormatString;
+ targetFormatString = defaultTargetFormatString;
}
return env.getTemplateDateFormat(targetFormatString, dateType, locale, timeZone, zonelessInput);
} catch (TemplateValueFormatException e) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
index 6ee8026..2fab315 100644
--- a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
@@ -40,7 +40,7 @@ public final class AliasTemplateNumberFormatFactory extends TemplateNumberFormat
* The format string this format will be an alias to
*/
public AliasTemplateNumberFormatFactory(String targetFormatString) {
- this.defaultTargetFormatString = targetFormatString;
+ defaultTargetFormatString = targetFormatString;
localizedTargetFormatStrings = null;
}
@@ -79,7 +79,7 @@ public final class AliasTemplateNumberFormatFactory extends TemplateNumberFormat
targetFormatString = null;
}
if (targetFormatString == null) {
- targetFormatString = this.defaultTargetFormatString;
+ targetFormatString = defaultTargetFormatString;
}
return env.getTemplateNumberFormat(targetFormatString, locale);
} catch (TemplateValueFormatException e) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java b/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java
index 9024b2b..88c1d0b 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java
@@ -39,7 +39,7 @@ final class BoundedRangeModel extends RangeModel {
step = begin <= end ? 1 : -1;
size = Math.abs(end - begin) + (inclusiveEnd ? 1 : 0);
this.rightAdaptive = rightAdaptive;
- this.affectedByStringSlicingBug = inclusiveEnd;
+ affectedByStringSlicingBug = inclusiveEnd;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BuiltInWithParseTimeParameters.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInWithParseTimeParameters.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInWithParseTimeParameters.java
index c113fb6..21fdc75 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BuiltInWithParseTimeParameters.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInWithParseTimeParameters.java
@@ -86,7 +86,7 @@ abstract class BuiltInWithParseTimeParameters extends SpecialBuiltIn {
protected ParseException newArgumentCountException(String ordinalityDesc, Token openParen, Token closeParen) {
return new ParseException(
- "?" + key + "(...) " + ordinalityDesc + " parameters", this.getTemplate(),
+ "?" + key + "(...) " + ordinalityDesc + " parameters", getTemplate(),
openParen.beginLine, openParen.beginColumn,
closeParen.endLine, closeParen.endColumn);
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java
index 53a239b..5dfd86f 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java
@@ -201,8 +201,8 @@ class BuiltInsForDates {
protected boolean shouldShowOffset(Date date, int dateType, Environment env) {
if (dateType == TemplateDateModel.DATE) {
return false; // ISO 8061 doesn't allow zone for date-only values
- } else if (this.showOffset != null) {
- return this.showOffset.booleanValue();
+ } else if (showOffset != null) {
+ return showOffset.booleanValue();
} else {
// java.sql.Time values meant to carry calendar field values only, so we don't show offset for them.
return !(date instanceof java.sql.Time
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BuiltInsForMultipleTypes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForMultipleTypes.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForMultipleTypes.java
index ea13825..422ae38 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForMultipleTypes.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForMultipleTypes.java
@@ -148,7 +148,7 @@ class BuiltInsForMultipleTypes {
throws TemplateException {
this.text = text;
this.env = env;
- this.defaultFormat = env.getTemplateDateFormat(dateType, Date.class, target, false);
+ defaultFormat = env.getTemplateDateFormat(dateType, Date.class, target, false);
}
@Override
@@ -563,7 +563,7 @@ class BuiltInsForMultipleTypes {
this.env = env;
final int dateType = dateModel.getDateType();
- this.defaultFormat = dateType == TemplateDateModel.UNKNOWN
+ defaultFormat = dateType == TemplateDateModel.UNKNOWN
? null // Lazy unknown type error in getAsString()
: env.getTemplateDateFormat(
dateType, EvalUtil.modelToDate(dateModel, target).getClass(), target, true);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsEncoding.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsEncoding.java
index 82a6143..f273732 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsEncoding.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsEncoding.java
@@ -157,9 +157,9 @@ class BuiltInsForStringsEncoding {
private final Environment env;
private String cachedResult;
- protected AbstractUrlBIResult(BuiltIn parent, String target, Environment env) {
+ protected AbstractUrlBIResult(BuiltIn parent, String targetAsString, Environment env) {
this.parent = parent;
- this.targetAsString = target;
+ this.targetAsString = targetAsString;
this.env = env;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java
index b436db9..c60af34 100644
--- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java
+++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java
@@ -188,10 +188,10 @@ class BuiltInsForStringsRegexp {
TemplateModel getGroups() {
TemplateSequenceModel entireInputMatchGroups = this.entireInputMatchGroups;
if (entireInputMatchGroups == null) {
- Matcher t = this.firedEntireInputMatcher;
+ Matcher t = firedEntireInputMatcher;
if (t == null) {
isEntrieInputMatchesAndStoreResults();
- t = this.firedEntireInputMatcher;
+ t = firedEntireInputMatcher;
}
final Matcher firedEntireInputMatcher = t;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Case.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Case.java b/src/main/java/org/apache/freemarker/core/ast/Case.java
index 661b66e..165d7ba 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Case.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Case.java
@@ -30,7 +30,7 @@ final class Case extends TemplateElement {
Expression condition;
Case(Expression matchingValue, TemplateElements children) {
- this.condition = matchingValue;
+ condition = matchingValue;
setChildren(children);
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java b/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java
index b593f56..a0b9988 100644
--- a/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java
+++ b/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java
@@ -93,7 +93,7 @@ implements TemplateCollectionModel, TemplateSequenceModel, Serializable {
SequenceIterator(TemplateSequenceModel sequence) throws TemplateModelException {
this.sequence = sequence;
- this.size = sequence.size();
+ size = sequence.size();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/CommonMarkupOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/CommonMarkupOutputFormat.java b/src/main/java/org/apache/freemarker/core/ast/CommonMarkupOutputFormat.java
index 324a186..b3cde16 100644
--- a/src/main/java/org/apache/freemarker/core/ast/CommonMarkupOutputFormat.java
+++ b/src/main/java/org/apache/freemarker/core/ast/CommonMarkupOutputFormat.java
@@ -72,7 +72,7 @@ public abstract class CommonMarkupOutputFormat<MO extends CommonTemplateMarkupOu
}
mc = escapePlainText(mo.getPlainTextContent());
- mo.setMarkupContet(mc);
+ mo.setMarkupContent(mc);
return mc;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java b/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java
index fd208e3..f7c5db5 100644
--- a/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java
+++ b/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java
@@ -33,14 +33,14 @@ public abstract class CommonTemplateMarkupOutputModel<MO extends CommonTemplateM
implements TemplateMarkupOutputModel<MO> {
private final String plainTextContent;
- private String markupContet;
+ private String markupContent;
/**
* A least one of the parameters must be non-{@code null}!
*/
protected CommonTemplateMarkupOutputModel(String plainTextContent, String markupContent) {
this.plainTextContent = plainTextContent;
- this.markupContet = markupContent;
+ this.markupContent = markupContent;
}
@Override
@@ -53,15 +53,15 @@ public abstract class CommonTemplateMarkupOutputModel<MO extends CommonTemplateM
/** Maybe {@code null}, but then {@link #getPlainTextContent()} isn't {@code null}. */
final String getMarkupContent() {
- return markupContet;
+ return markupContent;
}
/**
* Use only to set the value calculated from {@link #getPlainTextContent()}, when {@link #getMarkupContent()} was
* still {@code null}!
*/
- final void setMarkupContet(String markupContet) {
- this.markupContet = markupContet;
+ final void setMarkupContent(String markupContent) {
+ this.markupContent = markupContent;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Configurable.java b/src/main/java/org/apache/freemarker/core/ast/Configurable.java
index c0df514..a00b808 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Configurable.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Configurable.java
@@ -1165,7 +1165,7 @@ public class Configurable {
* @since 2.3.24
*/
public boolean isCustomDateFormatsSet() {
- return this.customDateFormats != null;
+ return customDateFormats != null;
}
/**
@@ -1436,7 +1436,7 @@ public class Configurable {
* @since 2.3.21
*/
public void setShowErrorTips(boolean showTips) {
- this.showErrorTips = Boolean.valueOf(showTips);
+ showErrorTips = Boolean.valueOf(showTips);
properties.setProperty(SHOW_ERROR_TIPS_KEY, String.valueOf(showTips));
}
@@ -2784,8 +2784,8 @@ public class Configurable {
private SettingStringParser(String text) {
this.text = text;
- this.p = 0;
- this.ln = text.length();
+ p = 0;
+ ln = text.length();
}
List<KeyValuePair<List<String>>> parseAsSegmentedList() throws ParseException {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/DebugBreak.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/DebugBreak.java b/src/main/java/org/apache/freemarker/core/ast/DebugBreak.java
index abbdede..6db9f09 100644
--- a/src/main/java/org/apache/freemarker/core/ast/DebugBreak.java
+++ b/src/main/java/org/apache/freemarker/core/ast/DebugBreak.java
@@ -40,7 +40,7 @@ public class DebugBreak extends TemplateElement {
@Override
protected TemplateElement[] accept(Environment env) throws TemplateException, IOException {
if (!DebuggerService.suspendEnvironment(
- env, this.getTemplate().getSourceName(), getChild(0).getBeginLine())) {
+ env, getTemplate().getSourceName(), getChild(0).getBeginLine())) {
return getChild(0).accept(env);
} else {
throw new StopException(env, "Stopped by debugger");
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/DollarVariable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/DollarVariable.java b/src/main/java/org/apache/freemarker/core/ast/DollarVariable.java
index ce233b0..318b66e 100644
--- a/src/main/java/org/apache/freemarker/core/ast/DollarVariable.java
+++ b/src/main/java/org/apache/freemarker/core/ast/DollarVariable.java
@@ -46,7 +46,7 @@ final class DollarVariable extends Interpolation {
this.expression = expression;
this.escapedExpression = escapedExpression;
this.outputFormat = outputFormat;
- this.markupOutputFormat
+ markupOutputFormat
= (MarkupOutputFormat) (outputFormat instanceof MarkupOutputFormat ? outputFormat : null);
this.autoEscape = autoEscape;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Environment.java b/src/main/java/org/apache/freemarker/core/ast/Environment.java
index fcafa66..b133475 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Environment.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Environment.java
@@ -202,8 +202,8 @@ public final class Environment extends Configurable {
public Environment(Template template, final TemplateHashModel rootDataModel, Writer out) {
super(template);
configuration = template.getConfiguration();
- this.globalNamespace = new Namespace(null);
- this.currentNamespace = mainNamespace = new Namespace(template);
+ globalNamespace = new Namespace(null);
+ currentNamespace = mainNamespace = new Namespace(template);
this.out = out;
this.rootDataModel = rootDataModel;
importMacros(template);
@@ -498,9 +498,9 @@ public final class Environment extends Configurable {
void visitAttemptRecover(
AttemptBlock attemptBlock, TemplateElement attemptedSection, RecoveryBlock recoverySection)
throws TemplateException, IOException {
- Writer prevOut = this.out;
+ Writer prevOut = out;
StringWriter sw = new StringWriter();
- this.out = sw;
+ out = sw;
TemplateException thrownException = null;
boolean lastFIRE = setFastInvalidReferenceExceptions(false);
boolean lastInAttemptBlock = inAttemptBlock;
@@ -512,7 +512,7 @@ public final class Environment extends Configurable {
} finally {
inAttemptBlock = lastInAttemptBlock;
setFastInvalidReferenceExceptions(lastFIRE);
- this.out = prevOut;
+ out = prevOut;
}
if (thrownException != null) {
if (LOG_ATTEMPT.isDebugEnabled()) {
@@ -556,7 +556,7 @@ public final class Environment extends Configurable {
LocalContextStack prevLocalContextStack = localContextStack;
TemplateElement[] nestedContentBuffer = invokingMacroContext.nestedContentBuffer;
if (nestedContentBuffer != null) {
- this.currentMacroContext = invokingMacroContext.prevMacroContext;
+ currentMacroContext = invokingMacroContext.prevMacroContext;
currentNamespace = invokingMacroContext.nestedContentNamespace;
final Configurable prevParent;
@@ -568,7 +568,7 @@ public final class Environment extends Configurable {
legacyParent = currentNamespace.getTemplate();
}
- this.localContextStack = invokingMacroContext.prevLocalContextStack;
+ localContextStack = invokingMacroContext.prevLocalContextStack;
if (invokingMacroContext.nestedContentParameterNames != null) {
pushLocalContext(bodyCtx);
}
@@ -578,14 +578,14 @@ public final class Environment extends Configurable {
if (invokingMacroContext.nestedContentParameterNames != null) {
localContextStack.pop();
}
- this.currentMacroContext = invokingMacroContext;
+ currentMacroContext = invokingMacroContext;
currentNamespace = getMacroNamespace(invokingMacroContext.getMacro());
if (parentReplacementOn) {
setParent(prevParent);
} else {
legacyParent = prevParent;
}
- this.localContextStack = prevLocalContextStack;
+ localContextStack = prevLocalContextStack;
}
}
}
@@ -616,14 +616,14 @@ public final class Environment extends Configurable {
ss.add(currentNamespace);
nodeNamespaces = ss;
}
- int prevNodeNamespaceIndex = this.nodeNamespaceIndex;
- String prevNodeName = this.currentNodeName;
- String prevNodeNS = this.currentNodeNS;
+ int prevNodeNamespaceIndex = nodeNamespaceIndex;
+ String prevNodeName = currentNodeName;
+ String prevNodeNS = currentNodeNS;
TemplateSequenceModel prevNodeNamespaces = nodeNamespaces;
TemplateNodeModel prevVisitorNode = currentVisitorNode;
currentVisitorNode = node;
if (namespaces != null) {
- this.nodeNamespaces = namespaces;
+ nodeNamespaces = namespaces;
}
try {
TemplateModel macroOrTransform = getNodeProcessor(node);
@@ -654,11 +654,11 @@ public final class Environment extends Configurable {
}
}
} finally {
- this.currentVisitorNode = prevVisitorNode;
- this.nodeNamespaceIndex = prevNodeNamespaceIndex;
- this.currentNodeName = prevNodeName;
- this.currentNodeNS = prevNodeNS;
- this.nodeNamespaces = prevNodeNamespaces;
+ currentVisitorNode = prevVisitorNode;
+ nodeNamespaceIndex = prevNodeNamespaceIndex;
+ currentNodeName = prevNodeName;
+ currentNodeNS = prevNodeNS;
+ nodeNamespaces = prevNodeNamespaces;
}
}
@@ -814,7 +814,7 @@ public final class Environment extends Configurable {
void recurse(TemplateNodeModel node, TemplateSequenceModel namespaces)
throws TemplateException, IOException {
if (node == null) {
- node = this.getCurrentVisitorNode();
+ node = getCurrentVisitorNode();
if (node == null) {
throw new _TemplateModelException(
"The target node of recursion is missing or null.");
@@ -1358,7 +1358,7 @@ public final class Environment extends Configurable {
}
void clearLastReturnValue() {
- this.lastReturnValue = null;
+ lastReturnValue = null;
}
/**
@@ -1647,12 +1647,12 @@ public final class Environment extends Configurable {
throw new UnknownDateTypeFormattingUnsupportedException();
}
int cacheIdx = getTemplateDateFormatCacheArrayIndex(dateType, zonelessInput, useSQLDTTZ);
- TemplateDateFormat[] cachedTemplateDateFormats = this.cachedTempDateFormatArray;
- if (cachedTemplateDateFormats == null) {
- cachedTemplateDateFormats = new TemplateDateFormat[CACHED_TDFS_LENGTH];
- this.cachedTempDateFormatArray = cachedTemplateDateFormats;
+ TemplateDateFormat[] cachedTempDateFormatArray = this.cachedTempDateFormatArray;
+ if (cachedTempDateFormatArray == null) {
+ cachedTempDateFormatArray = new TemplateDateFormat[CACHED_TDFS_LENGTH];
+ this.cachedTempDateFormatArray = cachedTempDateFormatArray;
}
- TemplateDateFormat format = cachedTemplateDateFormats[cacheIdx];
+ TemplateDateFormat format = cachedTempDateFormatArray[cacheIdx];
if (format == null) {
final String formatString;
switch (dateType) {
@@ -1671,7 +1671,7 @@ public final class Environment extends Configurable {
format = getTemplateDateFormat(formatString, dateType, useSQLDTTZ, zonelessInput, false);
- cachedTemplateDateFormats[cacheIdx] = format;
+ cachedTempDateFormatArray[cacheIdx] = format;
}
return format;
}
@@ -2365,9 +2365,9 @@ public final class Environment extends Configurable {
break;
}
if (result != null) {
- this.nodeNamespaceIndex = i + 1;
- this.currentNodeName = nodeName;
- this.currentNodeNS = nsURI;
+ nodeNamespaceIndex = i + 1;
+ currentNodeName = nodeName;
+ currentNodeNS = nsURI;
}
return result;
}
@@ -2492,7 +2492,7 @@ public final class Environment extends Configurable {
// [FM3] This branch shouldn't exist, as it doesn't make much sense to inherit encoding. But we have to keep BC.
encoding = getTemplate().getEncoding();
if (encoding == null) {
- encoding = configuration.getEncoding(this.getLocale());
+ encoding = configuration.getEncoding(getLocale());
}
return encoding;
}
@@ -2661,15 +2661,15 @@ public final class Environment extends Configurable {
private void initializeImportLibNamespace(final Namespace newNamespace, Template loadedTemplate)
throws TemplateException, IOException {
- Namespace prevNamespace = this.currentNamespace;
- this.currentNamespace = newNamespace;
+ Namespace prevNamespace = currentNamespace;
+ currentNamespace = newNamespace;
Writer prevOut = out;
- this.out = _NullWriter.INSTANCE;
+ out = _NullWriter.INSTANCE;
try {
include(loadedTemplate);
} finally {
- this.out = prevOut;
- this.currentNamespace = prevNamespace;
+ out = prevOut;
+ currentNamespace = prevNamespace;
}
}
@@ -2710,11 +2710,11 @@ public final class Environment extends Configurable {
Writer prevOut = out;
try {
StringWriter sw = new StringWriter();
- this.out = sw;
+ out = sw;
visit(te);
return sw.toString();
} finally {
- this.out = prevOut;
+ out = prevOut;
}
}
@@ -2813,7 +2813,7 @@ public final class Environment extends Configurable {
private Template template;
Namespace() {
- this.template = Environment.this.getTemplate();
+ template = Environment.this.getTemplate();
}
Namespace(Template template) {
@@ -2855,9 +2855,9 @@ public final class Environment extends Configurable {
this.templateName = templateName;
// Make snapshot of all settings that influence template resolution:
- this.locale = getLocale();
- this.encoding = getIncludedTemplateEncoding();
- this.customLookupCondition = getIncludedTemplateCustomLookupCondition();
+ locale = getLocale();
+ encoding = getIncludedTemplateEncoding();
+ customLookupCondition = getIncludedTemplateCustomLookupCondition();
}
private void ensureInitializedTME() throws TemplateModelException {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/EscapeBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/EscapeBlock.java b/src/main/java/org/apache/freemarker/core/ast/EscapeBlock.java
index e87aa49..07f02b5 100644
--- a/src/main/java/org/apache/freemarker/core/ast/EscapeBlock.java
+++ b/src/main/java/org/apache/freemarker/core/ast/EscapeBlock.java
@@ -44,7 +44,7 @@ class EscapeBlock extends TemplateElement {
void setContent(TemplateElements children) {
setChildren(children);
// We don't need it anymore at this point
- this.escapedExpr = null;
+ escapedExpr = null;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Expression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Expression.java b/src/main/java/org/apache/freemarker/core/ast/Expression.java
index 2ab45be..0e28800 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Expression.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Expression.java
@@ -136,7 +136,7 @@ abstract public class Expression extends TemplateObject {
}
TemplateModel evalToNonMissing(Environment env) throws TemplateException {
- TemplateModel result = this.eval(env);
+ TemplateModel result = eval(env);
assertNonNull(result, env);
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/ExtendedDecimalFormatParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/ExtendedDecimalFormatParser.java b/src/main/java/org/apache/freemarker/core/ast/ExtendedDecimalFormatParser.java
index 9fa399e..4f09696 100644
--- a/src/main/java/org/apache/freemarker/core/ast/ExtendedDecimalFormatParser.java
+++ b/src/main/java/org/apache/freemarker/core/ast/ExtendedDecimalFormatParser.java
@@ -475,7 +475,7 @@ class ExtendedDecimalFormatParser {
private ExtendedDecimalFormatParser(String formatString, Locale locale) {
src = formatString;
- this.symbols = new DecimalFormatSymbols(locale);
+ symbols = new DecimalFormatSymbols(locale);
}
private ParseException newExpectedSgParseException(String expectedThing) {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java b/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java
index 3c4b412..3710c44 100644
--- a/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java
+++ b/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java
@@ -55,8 +55,8 @@ public class FreeMarkerTree extends JTree {
}
public void setTemplate(Template template) {
- this.setModel(new DefaultTreeModel(getNode(template.getRootTreeNode())));
- this.invalidate();
+ setModel(new DefaultTreeModel(getNode(template.getRootTreeNode())));
+ invalidate();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/HashLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/HashLiteral.java b/src/main/java/org/apache/freemarker/core/ast/HashLiteral.java
index d4e1181..fc36547 100644
--- a/src/main/java/org/apache/freemarker/core/ast/HashLiteral.java
+++ b/src/main/java/org/apache/freemarker/core/ast/HashLiteral.java
@@ -41,7 +41,7 @@ final class HashLiteral extends Expression {
HashLiteral(ArrayList/*<Expression>*/ keys, ArrayList/*<Expression>*/ values) {
this.keys = keys;
this.values = values;
- this.size = keys.size();
+ size = keys.size();
keys.trimToSize();
values.trimToSize();
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Identifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Identifier.java b/src/main/java/org/apache/freemarker/core/ast/Identifier.java
index f2a955d..3ac82d5 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Identifier.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Identifier.java
@@ -89,7 +89,7 @@ final class Identifier extends Expression {
@Override
protected Expression deepCloneWithIdentifierReplaced_inner(
String replacedIdentifier, Expression replacement, ReplacemenetState replacementState) {
- if (this.name.equals(replacedIdentifier)) {
+ if (name.equals(replacedIdentifier)) {
if (replacementState.replacementAlreadyInUse) {
Expression clone = replacement.deepCloneWithIdentifierReplaced(null, null, replacementState);
clone.copyLocationFrom(replacement);
@@ -99,7 +99,7 @@ final class Identifier extends Expression {
return replacement;
}
} else {
- return new Identifier(this.name);
+ return new Identifier(name);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Include.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Include.java b/src/main/java/org/apache/freemarker/core/ast/Include.java
index 9adeb38..8e9d78b 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Include.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Include.java
@@ -42,14 +42,14 @@ final class Include extends TemplateElement {
/**
* @param template the template that this <tt>#include</tt> is a part of.
- * @param includedTemplatePathExp the path of the template to be included.
+ * @param includedTemplateNameExp the path of the template to be included.
* @param encodingExp the encoding to be used or null, if it's the default.
* @param parseExp whether the template should be parsed (or is raw text)
*/
Include(Template template,
- Expression includedTemplatePathExp,
+ Expression includedTemplateNameExp,
Expression encodingExp, Expression parseExp, Expression ignoreMissingExp) throws ParseException {
- this.includedTemplateNameExp = includedTemplatePathExp;
+ this.includedTemplateNameExp = includedTemplateNameExp;
this.encodingExp = encodingExp;
if (encodingExp == null) {
@@ -149,8 +149,8 @@ final class Include extends TemplateElement {
}
final boolean ignoreMissing;
- if (this.ignoreMissingExpPrecalcedValue != null) {
- ignoreMissing = this.ignoreMissingExpPrecalcedValue.booleanValue();
+ if (ignoreMissingExpPrecalcedValue != null) {
+ ignoreMissing = ignoreMissingExpPrecalcedValue.booleanValue();
} else if (ignoreMissingExp != null) {
ignoreMissing = ignoreMissingExp.evalToBoolean(env);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/IteratorBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/IteratorBlock.java b/src/main/java/org/apache/freemarker/core/ast/IteratorBlock.java
index 206fe88..1ee3c0d 100644
--- a/src/main/java/org/apache/freemarker/core/ast/IteratorBlock.java
+++ b/src/main/java/org/apache/freemarker/core/ast/IteratorBlock.java
@@ -413,18 +413,18 @@ final class IteratorBlock extends TemplateElement {
}
String getLoopVariableName() {
- return this.loopVarName;
+ return loopVarName;
}
String getLoopVariable2Name() {
- return this.loopVar2Name;
+ return loopVar2Name;
}
@Override
public TemplateModel getLocalVariable(String name) {
- String loopVariableName = this.loopVarName;
- if (loopVariableName != null && name.startsWith(loopVariableName)) {
- switch(name.length() - loopVariableName.length()) {
+ String loopVarName = this.loopVarName;
+ if (loopVarName != null && name.startsWith(loopVarName)) {
+ switch(name.length() - loopVarName.length()) {
case 0:
return loopVar;
case 6:
@@ -449,13 +449,13 @@ final class IteratorBlock extends TemplateElement {
@Override
public Collection getLocalVariableNames() {
- String loopVariableName = this.loopVarName;
- if (loopVariableName != null) {
+ String loopVarName = this.loopVarName;
+ if (loopVarName != null) {
if (localVarNames == null) {
localVarNames = new ArrayList(3);
- localVarNames.add(loopVariableName);
- localVarNames.add(loopVariableName + LOOP_STATE_INDEX);
- localVarNames.add(loopVariableName + LOOP_STATE_HAS_NEXT);
+ localVarNames.add(loopVarName);
+ localVarNames.add(loopVarName + LOOP_STATE_INDEX);
+ localVarNames.add(loopVarName + LOOP_STATE_HAS_NEXT);
}
return localVarNames;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/LibraryLoad.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/LibraryLoad.java b/src/main/java/org/apache/freemarker/core/ast/LibraryLoad.java
index 0143a08..61eb08e 100644
--- a/src/main/java/org/apache/freemarker/core/ast/LibraryLoad.java
+++ b/src/main/java/org/apache/freemarker/core/ast/LibraryLoad.java
@@ -40,14 +40,14 @@ public final class LibraryLoad extends TemplateElement {
/**
* @param template the template that this <tt>Include</tt> is a part of.
- * @param templateName the name of the template to be included.
+ * @param importedTemplateNameExp the name of the template to be included.
* @param targetNsVarName the name of the variable to assign this library's namespace to
*/
LibraryLoad(Template template,
- Expression templateName,
+ Expression importedTemplateNameExp,
String targetNsVarName) {
this.targetNsVarName = targetNsVarName;
- this.importedTemplateNameExp = templateName;
+ this.importedTemplateNameExp = importedTemplateNameExp;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/Macro.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/Macro.java b/src/main/java/org/apache/freemarker/core/ast/Macro.java
index 44d19c6..2a8b072 100644
--- a/src/main/java/org/apache/freemarker/core/ast/Macro.java
+++ b/src/main/java/org/apache/freemarker/core/ast/Macro.java
@@ -58,14 +58,14 @@ public final class Macro extends TemplateElement implements TemplateModel {
String catchAllParamName, boolean function,
TemplateElements children) {
this.name = name;
- this.paramNames = (String[]) argumentNames.toArray(
+ paramNames = (String[]) argumentNames.toArray(
new String[argumentNames.size()]);
- this.paramDefaults = args;
+ paramDefaults = args;
this.function = function;
- this.catchAllParamName = catchAllParamName;
-
- this.setChildren(children);
+ this.catchAllParamName = catchAllParamName;
+
+ setChildren(children);
}
public String getCatchAll() {
@@ -163,12 +163,12 @@ public final class Macro extends TemplateElement implements TemplateModel {
Context(Environment env,
TemplateElement[] nestedContentBuffer,
List nestedContentParameterNames) {
- this.localVars = env.new Namespace();
+ localVars = env.new Namespace();
this.nestedContentBuffer = nestedContentBuffer;
- this.nestedContentNamespace = env.getCurrentNamespace();
+ nestedContentNamespace = env.getCurrentNamespace();
this.nestedContentParameterNames = nestedContentParameterNames;
- this.prevLocalContextStack = env.getLocalContextStack();
- this.prevMacroContext = env.getCurrentMacroContext();
+ prevLocalContextStack = env.getLocalContextStack();
+ prevMacroContext = env.getCurrentMacroContext();
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/NumericalOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/NumericalOutput.java b/src/main/java/org/apache/freemarker/core/ast/NumericalOutput.java
index acaab86..ac7b817 100644
--- a/src/main/java/org/apache/freemarker/core/ast/NumericalOutput.java
+++ b/src/main/java/org/apache/freemarker/core/ast/NumericalOutput.java
@@ -43,8 +43,8 @@ final class NumericalOutput extends Interpolation {
NumericalOutput(Expression expression, MarkupOutputFormat autoEscapeOutputFormat) {
this.expression = expression;
hasFormat = false;
- this.minFracDigits = 0;
- this.maxFracDigits = 0;
+ minFracDigits = 0;
+ maxFracDigits = 0;
this.autoEscapeOutputFormat = autoEscapeOutputFormat;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/ParseException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/ParseException.java b/src/main/java/org/apache/freemarker/core/ast/ParseException.java
index 03cec71..d82a2b7 100644
--- a/src/main/java/org/apache/freemarker/core/ast/ParseException.java
+++ b/src/main/java/org/apache/freemarker/core/ast/ParseException.java
@@ -221,7 +221,7 @@ public class ParseException extends IOException implements FMParserConstants {
Throwable cause) {
super(description); // but we override getMessage, so it will be different
try {
- this.initCause(cause);
+ initCause(cause);
} catch (Exception e) {
// Suppressed; we can't do more
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/StopException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/StopException.java b/src/main/java/org/apache/freemarker/core/ast/StopException.java
index cb32a02..9b135f1 100644
--- a/src/main/java/org/apache/freemarker/core/ast/StopException.java
+++ b/src/main/java/org/apache/freemarker/core/ast/StopException.java
@@ -40,7 +40,7 @@ public class StopException extends TemplateException {
@Override
public void printStackTrace(PrintWriter pw) {
synchronized (pw) {
- String msg = this.getMessage();
+ String msg = getMessage();
pw.print("Encountered stop instruction");
if (msg != null && !msg.equals("")) {
pw.println("\nCause given: " + msg);
@@ -52,7 +52,7 @@ public class StopException extends TemplateException {
@Override
public void printStackTrace(PrintStream ps) {
synchronized (ps) {
- String msg = this.getMessage();
+ String msg = getMessage();
ps.print("Encountered stop instruction");
if (msg != null && !msg.equals("")) {
ps.println("\nCause given: " + msg);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/StringLiteral.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/StringLiteral.java b/src/main/java/org/apache/freemarker/core/ast/StringLiteral.java
index 4d98a26..255d4f8 100644
--- a/src/main/java/org/apache/freemarker/core/ast/StringLiteral.java
+++ b/src/main/java/org/apache/freemarker/core/ast/StringLiteral.java
@@ -80,7 +80,7 @@ final class StringLiteral extends Expression implements TemplateScalarModel {
e.setTemplateName(parentTemplate.getSourceName());
throw e;
}
- this.constantValue = null;
+ constantValue = null;
}
}
@@ -180,7 +180,7 @@ final class StringLiteral extends Expression implements TemplateScalarModel {
String replacedIdentifier, Expression replacement, ReplacemenetState replacementState) {
StringLiteral cloned = new StringLiteral(value);
// FIXME: replacedIdentifier should be searched inside interpolatedOutput too:
- cloned.dynamicValue = this.dynamicValue;
+ cloned.dynamicValue = dynamicValue;
return cloned;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/TemplateElement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/TemplateElement.java b/src/main/java/org/apache/freemarker/core/ast/TemplateElement.java
index a987874..3a69e9e 100644
--- a/src/main/java/org/apache/freemarker/core/ast/TemplateElement.java
+++ b/src/main/java/org/apache/freemarker/core/ast/TemplateElement.java
@@ -173,9 +173,9 @@ abstract public class TemplateElement extends TemplateObject {
}
public String getNodeName() {
- String classname = this.getClass().getName();
- int shortNameOffset = classname.lastIndexOf('.') + 1;
- return classname.substring(shortNameOffset);
+ String className = getClass().getName();
+ int shortNameOffset = className.lastIndexOf('.') + 1;
+ return className.substring(shortNameOffset);
}
// Methods so that we can implement the Swing TreeNode API.
@@ -452,8 +452,8 @@ abstract public class TemplateElement extends TemplateObject {
}
private TemplateElement getLastChild() {
- final int regulatedChildCount = this.childCount;
- return regulatedChildCount == 0 ? null : childBuffer[regulatedChildCount - 1];
+ final int childCount = this.childCount;
+ return childCount == 0 ? null : childBuffer[childCount - 1];
}
private TemplateElement getFirstLeaf() {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/TextBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/TextBlock.java b/src/main/java/org/apache/freemarker/core/ast/TextBlock.java
index cc1ad9c..a0e880e 100644
--- a/src/main/java/org/apache/freemarker/core/ast/TextBlock.java
+++ b/src/main/java/org/apache/freemarker/core/ast/TextBlock.java
@@ -125,13 +125,13 @@ public final class TextBlock extends TemplateElement {
if (openingCharsToStrip == 0 && trailingCharsToStrip == 0) {
return this;
}
- this.text = substring(text, openingCharsToStrip, text.length - trailingCharsToStrip);
+ text = substring(text, openingCharsToStrip, text.length - trailingCharsToStrip);
if (openingCharsToStrip > 0) {
- this.beginLine++;
- this.beginColumn = 1;
+ beginLine++;
+ beginColumn = 1;
}
if (trailingCharsToStrip > 0) {
- this.endColumn = 0;
+ endColumn = 0;
}
return this;
}
@@ -142,8 +142,8 @@ public final class TextBlock extends TemplateElement {
*/
private boolean deliberateLeftTrim() {
boolean result = false;
- for (TemplateElement elem = this.nextTerminalNode();
- elem != null && elem.beginLine == this.endLine;
+ for (TemplateElement elem = nextTerminalNode();
+ elem != null && elem.beginLine == endLine;
elem = elem.nextTerminalNode()) {
if (elem instanceof TrimInstruction) {
TrimInstruction ti = (TrimInstruction) elem;
@@ -157,15 +157,15 @@ public final class TextBlock extends TemplateElement {
char[] firstPart = substring(text, 0, lastNewLineIndex + 1);
char[] lastLine = substring(text, 1 + lastNewLineIndex);
if (_StringUtil.isTrimmableToEmpty(lastLine)) {
- this.text = firstPart;
- this.endColumn = 0;
+ text = firstPart;
+ endColumn = 0;
} else {
int i = 0;
while (Character.isWhitespace(lastLine[i])) {
i++;
}
char[] printablePart = substring(lastLine, i);
- this.text = concat(firstPart, printablePart);
+ text = concat(firstPart, printablePart);
}
}
}
@@ -180,8 +180,8 @@ public final class TextBlock extends TemplateElement {
*/
private boolean deliberateRightTrim() {
boolean result = false;
- for (TemplateElement elem = this.prevTerminalNode();
- elem != null && elem.endLine == this.beginLine;
+ for (TemplateElement elem = prevTerminalNode();
+ elem != null && elem.endLine == beginLine;
elem = elem.prevTerminalNode()) {
if (elem instanceof TrimInstruction) {
TrimInstruction ti = (TrimInstruction) elem;
@@ -202,9 +202,9 @@ public final class TextBlock extends TemplateElement {
char[] trailingPart = substring(text, firstLineIndex);
char[] openingPart = substring(text, 0, firstLineIndex);
if (_StringUtil.isTrimmableToEmpty(openingPart)) {
- this.text = trailingPart;
- this.beginLine++;
- this.beginColumn = 1;
+ text = trailingPart;
+ beginLine++;
+ beginColumn = 1;
} else {
int lastNonWS = openingPart.length - 1;
while (Character.isWhitespace(text[lastNonWS])) {
@@ -214,8 +214,8 @@ public final class TextBlock extends TemplateElement {
if (_StringUtil.isTrimmableToEmpty(trailingPart)) {
// THIS BLOCK IS HEINOUS! THERE MUST BE A BETTER WAY! REVISIT (JR)
boolean trimTrailingPart = true;
- for (TemplateElement te = this.nextTerminalNode();
- te != null && te.beginLine == this.endLine;
+ for (TemplateElement te = nextTerminalNode();
+ te != null && te.beginLine == endLine;
te = te.nextTerminalNode()) {
if (te.heedsOpeningWhitespace()) {
trimTrailingPart = false;
@@ -227,7 +227,7 @@ public final class TextBlock extends TemplateElement {
}
if (trimTrailingPart) trailingPart = _CollectionUtil.EMPTY_CHAR_ARRAY;
}
- this.text = concat(printablePart, trailingPart);
+ text = concat(printablePart, trailingPart);
}
}
}
@@ -277,8 +277,8 @@ public final class TextBlock extends TemplateElement {
}
// We look at the preceding elements on the line to see if we should
// strip the opening newline and any whitespace preceding it.
- for (TemplateElement elem = this.prevTerminalNode();
- elem != null && elem.endLine == this.beginLine;
+ for (TemplateElement elem = prevTerminalNode();
+ elem != null && elem.endLine == beginLine;
elem = elem.prevTerminalNode()) {
if (elem.heedsOpeningWhitespace()) {
return 0;
@@ -301,8 +301,8 @@ public final class TextBlock extends TemplateElement {
}
// We look at the elements afterward on the same line to see if we should
// strip any whitespace after the last newline
- for (TemplateElement elem = this.nextTerminalNode();
- elem != null && elem.beginLine == this.endLine;
+ for (TemplateElement elem = nextTerminalNode();
+ elem != null && elem.beginLine == endLine;
elem = elem.nextTerminalNode()) {
if (elem.heedsTrailingWhitespace()) {
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/TokenMgrError.java b/src/main/java/org/apache/freemarker/core/ast/TokenMgrError.java
index 83b8c38..0759641 100644
--- a/src/main/java/org/apache/freemarker/core/ast/TokenMgrError.java
+++ b/src/main/java/org/apache/freemarker/core/ast/TokenMgrError.java
@@ -168,8 +168,8 @@ public String getMessage() {
@Deprecated
public TokenMgrError(String detail, int reason, int errorLine, int errorColumn) {
this(detail, reason, errorLine, errorColumn, 0, 0);
- this.endLineNumber = null;
- this.endColumnNumber = null;
+ endLineNumber = null;
+ endColumnNumber = null;
}
/**
@@ -181,9 +181,9 @@ public TokenMgrError(String detail, int reason, int errorLine, int errorColumn)
super(detail); // the "detail" must not contain location information, the "message" might does
this.detail = detail;
errorCode = reason;
-
- this.lineNumber = Integer.valueOf(errorLine); // In J2SE there was no Integer.valueOf(int)
- this.columnNumber = Integer.valueOf(errorColumn);
+
+ lineNumber = Integer.valueOf(errorLine); // In J2SE there was no Integer.valueOf(int)
+ columnNumber = Integer.valueOf(errorColumn);
this.endLineNumber = Integer.valueOf(endLineNumber);
this.endColumnNumber = Integer.valueOf(endColumnNumber);
}
@@ -199,12 +199,12 @@ public TokenMgrError(String detail, int reason, int errorLine, int errorColumn)
public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-
- this.lineNumber = Integer.valueOf(errorLine); // In J2SE there was no Integer.valueOf(int)
- this.columnNumber = Integer.valueOf(errorColumn);
+
+ lineNumber = Integer.valueOf(errorLine); // In J2SE there was no Integer.valueOf(int)
+ columnNumber = Integer.valueOf(errorColumn);
// We blame the single character that can't be the start of a legal token:
- this.endLineNumber = this.lineNumber;
- this.endColumnNumber = this.columnNumber;
+ endLineNumber = lineNumber;
+ endColumnNumber = columnNumber;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/_DelayedConversionToString.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/_DelayedConversionToString.java b/src/main/java/org/apache/freemarker/core/ast/_DelayedConversionToString.java
index 23f5687..543a8a3 100644
--- a/src/main/java/org/apache/freemarker/core/ast/_DelayedConversionToString.java
+++ b/src/main/java/org/apache/freemarker/core/ast/_DelayedConversionToString.java
@@ -39,8 +39,8 @@ public abstract class _DelayedConversionToString {
stringValue = this.stringValue;
if (stringValue == NOT_SET) {
stringValue = doConversion(object);
- this.stringValue = stringValue;
- this.object = null;
+ this.stringValue = stringValue;
+ object = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/ast/_ErrorDescriptionBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/_ErrorDescriptionBuilder.java b/src/main/java/org/apache/freemarker/core/ast/_ErrorDescriptionBuilder.java
index 1477e17..d677744 100644
--- a/src/main/java/org/apache/freemarker/core/ast/_ErrorDescriptionBuilder.java
+++ b/src/main/java/org/apache/freemarker/core/ast/_ErrorDescriptionBuilder.java
@@ -51,7 +51,7 @@ public class _ErrorDescriptionBuilder {
public _ErrorDescriptionBuilder(String description) {
this.description = description;
- this.descriptionParts = null;
+ descriptionParts = null;
}
/**
@@ -61,7 +61,7 @@ public class _ErrorDescriptionBuilder {
*/
public _ErrorDescriptionBuilder(Object... descriptionParts) {
this.descriptionParts = descriptionParts;
- this.description = null;
+ description = null;
}
@Override
@@ -285,8 +285,8 @@ public class _ErrorDescriptionBuilder {
return this;
}
- public _ErrorDescriptionBuilder blame(Expression blamedExpr) {
- this.blamed = blamedExpr;
+ public _ErrorDescriptionBuilder blame(Expression blamed) {
+ this.blamed = blamed;
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/debug/EnvironmentSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/debug/EnvironmentSuspendedEvent.java b/src/main/java/org/apache/freemarker/core/debug/EnvironmentSuspendedEvent.java
index 74c6cd2..99d387f 100644
--- a/src/main/java/org/apache/freemarker/core/debug/EnvironmentSuspendedEvent.java
+++ b/src/main/java/org/apache/freemarker/core/debug/EnvironmentSuspendedEvent.java
@@ -32,9 +32,9 @@ public class EnvironmentSuspendedEvent extends EventObject {
private final int line;
private final DebuggedEnvironment env;
- public EnvironmentSuspendedEvent(Object source, String templateName, int line, DebuggedEnvironment env) {
+ public EnvironmentSuspendedEvent(Object source, String name, int line, DebuggedEnvironment env) {
super(source);
- this.name = templateName;
+ this.name = name;
this.line = line;
this.env = env;
}
@@ -45,7 +45,7 @@ public class EnvironmentSuspendedEvent extends EventObject {
* @return String the template name
*/
public String getName() {
- return this.name;
+ return name;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java b/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java
index 42db661..799bff4 100644
--- a/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java
+++ b/src/main/java/org/apache/freemarker/core/debug/impl/DebuggerServer.java
@@ -118,7 +118,7 @@ class DebuggerServer {
}
public void stop() {
- this.stop = true;
+ stop = true;
if (serverSocket != null) {
try {
serverSocket.close();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggedEnvironmentImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggedEnvironmentImpl.java b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggedEnvironmentImpl.java
index 87a8a7c..3d7f1ab 100644
--- a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggedEnvironmentImpl.java
+++ b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggedEnvironmentImpl.java
@@ -243,7 +243,7 @@ implements
DebugTemplateModel(Template template) {
super(template);
- this.name = new SimpleScalar(template.getName());
+ name = new SimpleScalar(template.getName());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java
index d0d4883..741b407 100644
--- a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java
+++ b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerService.java
@@ -388,7 +388,7 @@ extends
void shutdownSpi() {
server.stop();
try {
- UnicastRemoteObject.unexportObject(this.debugger, true);
+ UnicastRemoteObject.unexportObject(debugger, true);
} catch (Exception e) {
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
index d8fac84..c69b498 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java
@@ -61,8 +61,8 @@ public abstract class DefaultObjectWrapperConfiguration extends BeansWrapperConf
}
/** See {@link DefaultObjectWrapper#setForceLegacyNonListCollections(boolean)}. */
- public void setForceLegacyNonListCollections(boolean legacyNonListCollectionWrapping) {
- this.forceLegacyNonListCollections = legacyNonListCollectionWrapping;
+ public void setForceLegacyNonListCollections(boolean forceLegacyNonListCollections) {
+ this.forceLegacyNonListCollections = forceLegacyNonListCollections;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
index 52f3bb7..cb26b4a 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
@@ -285,7 +285,7 @@ public class SimpleHash extends WrappingTemplateModel implements TemplateHashMod
public void putAll(Map m) {
for (Iterator it = m.entrySet().iterator(); it.hasNext(); ) {
Map.Entry entry = (Map.Entry) it.next();
- this.put((String) entry.getKey(), entry.getValue());
+ put((String) entry.getKey(), entry.getValue());
}
}
@@ -298,7 +298,7 @@ public class SimpleHash extends WrappingTemplateModel implements TemplateHashMod
*/
public Map toMap() throws TemplateModelException {
if (unwrappedMap == null) {
- Class mapClass = this.map.getClass();
+ Class mapClass = map.getClass();
Map m = null;
try {
m = (Map) mapClass.newInstance();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java
index b6fe8d1..8ea7bfd 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java
@@ -42,27 +42,27 @@ public final class SimpleNumber implements TemplateNumberModel, Serializable {
}
public SimpleNumber(byte val) {
- this.value = Byte.valueOf(val);
+ value = Byte.valueOf(val);
}
public SimpleNumber(short val) {
- this.value = Short.valueOf(val);
+ value = Short.valueOf(val);
}
public SimpleNumber(int val) {
- this.value = Integer.valueOf(val);
+ value = Integer.valueOf(val);
}
public SimpleNumber(long val) {
- this.value = Long.valueOf(val);
+ value = Long.valueOf(val);
}
public SimpleNumber(float val) {
- this.value = Float.valueOf(val);
+ value = Float.valueOf(val);
}
public SimpleNumber(double val) {
- this.value = Double.valueOf(val);
+ value = Double.valueOf(val);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
index 14b0f80..26e8ef9 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapper.java
@@ -284,7 +284,7 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
protected BeansWrapper(BeansWrapperConfiguration bwConf, boolean writeProtected, boolean finalizeConstruction) {
// Backward-compatibility hack for "finetuneMethodAppearance" overrides to work:
if (bwConf.getMethodAppearanceFineTuner() == null) {
- Class<?> thisClass = this.getClass();
+ Class<?> thisClass = getClass();
boolean overridden = false;
boolean testFailed = false;
try {
@@ -321,14 +321,14 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
@Override
public void process(
MethodAppearanceDecisionInput in, MethodAppearanceDecision out) {
- BeansWrapper.this.finetuneMethodAppearance(in.getContainingClass(), in.getMethod(), out);
+ finetuneMethodAppearance(in.getContainingClass(), in.getMethod(), out);
}
});
}
}
-
- this.incompatibleImprovements = bwConf.getIncompatibleImprovements(); // normalized
+
+ incompatibleImprovements = bwConf.getIncompatibleImprovements(); // normalized
simpleMapWrapper = bwConf.isSimpleMapWrapper();
defaultDateType = bwConf.getDefaultDateType();
@@ -415,7 +415,7 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
*/
protected void checkModifiable() {
if (writeProtected) throw new IllegalStateException(
- "Can't modify the " + this.getClass().getName() + " object, as it was write protected.");
+ "Can't modify the " + getClass().getName() + " object, as it was write protected.");
}
/**
@@ -1748,16 +1748,16 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
return exposeMethodAs;
}
- public void setExposeMethodAs(String exposeAsMethod) {
- this.exposeMethodAs = exposeAsMethod;
+ public void setExposeMethodAs(String exposeMethodAs) {
+ this.exposeMethodAs = exposeMethodAs;
}
public boolean getMethodShadowsProperty() {
return methodShadowsProperty;
}
- public void setMethodShadowsProperty(boolean shadowEarlierProperty) {
- this.methodShadowsProperty = shadowEarlierProperty;
+ public void setMethodShadowsProperty(boolean methodShadowsProperty) {
+ this.methodShadowsProperty = methodShadowsProperty;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassIntrospector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassIntrospector.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassIntrospector.java
index 6f3516c..279fe31 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassIntrospector.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassIntrospector.java
@@ -173,11 +173,11 @@ class ClassIntrospector {
boolean hasSharedInstanceRestrictons, boolean shared) {
_NullArgumentException.check("sharedLock", sharedLock);
- this.exposureLevel = builder.getExposureLevel();
- this.exposeFields = builder.getExposeFields();
- this.methodAppearanceFineTuner = builder.getMethodAppearanceFineTuner();
- this.methodSorter = builder.getMethodSorter();
- this.bugfixed = builder.isBugfixed();
+ exposureLevel = builder.getExposureLevel();
+ exposeFields = builder.getExposeFields();
+ methodAppearanceFineTuner = builder.getMethodAppearanceFineTuner();
+ methodSorter = builder.getMethodSorter();
+ bugfixed = builder.isBugfixed();
this.sharedLock = sharedLock;
@@ -588,7 +588,7 @@ class ClassIntrospector {
void clearCache() {
if (getHasSharedInstanceRestrictons()) {
throw new IllegalStateException(
- "It's not allowed to clear the whole cache in a read-only " + this.getClass().getName() +
+ "It's not allowed to clear the whole cache in a read-only " + getClass().getName() +
"instance. Use removeFromClassIntrospectionCache(String prefix) instead.");
}
forcedClearCache();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/beans/MemberAndArguments.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/MemberAndArguments.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/MemberAndArguments.java
index 862ebde..b22a63e 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/MemberAndArguments.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/MemberAndArguments.java
@@ -34,8 +34,8 @@ class MemberAndArguments extends MaybeEmptyMemberAndArguments {
/**
* @param args The already unwrapped arguments
*/
- MemberAndArguments(CallableMemberDescriptor memberDesc, Object[] args) {
- this.callableMemberDesc = memberDesc;
+ MemberAndArguments(CallableMemberDescriptor callableMemberDesc, Object[] args) {
+ this.callableMemberDesc = callableMemberDesc;
this.args = args;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/beans/ModelCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ModelCache.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ModelCache.java
index 605ef14..2dd422a 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ModelCache.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ModelCache.java
@@ -136,7 +136,7 @@ public abstract class ModelCache {
}
TemplateModel getModel() {
- return this.get();
+ return get();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ee8e2096/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
index e435d2d..1e9c0bc 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
@@ -369,7 +369,7 @@ class OverloadedNumberUtil {
@Override
public boolean equals(Object obj) {
- if (obj != null && this.getClass() == obj.getClass()) {
+ if (obj != null && getClass() == obj.getClass()) {
return getSourceNumber().equals(((NumberWithFallbackType) obj).getSourceNumber());
} else {
return false;