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 2018/06/10 16:49:07 UTC
[1/2] freemarker git commit: Type: changed newDesciptionBuilder to
newDescriptionBuilder
Repository: freemarker
Updated Branches:
refs/heads/2.3-gae 43d065841 -> a03a1473b
Type: changed newDesciptionBuilder to newDescriptionBuilder
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/b2ff8152
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/b2ff8152
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/b2ff8152
Branch: refs/heads/2.3-gae
Commit: b2ff8152202accd51d0760b20b5773deb6d44784
Parents: 43d0658
Author: Chaquotay <st...@notatoaster.org>
Authored: Sun Jun 10 17:39:31 2018 +0200
Committer: Chaquotay <st...@notatoaster.org>
Committed: Sun Jun 10 17:39:31 2018 +0200
----------------------------------------------------------------------
.../java/freemarker/core/UnexpectedTypeException.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/freemarker/blob/b2ff8152/src/main/java/freemarker/core/UnexpectedTypeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/UnexpectedTypeException.java b/src/main/java/freemarker/core/UnexpectedTypeException.java
index 61b0fe4..9cb56f8 100644
--- a/src/main/java/freemarker/core/UnexpectedTypeException.java
+++ b/src/main/java/freemarker/core/UnexpectedTypeException.java
@@ -45,14 +45,14 @@ public class UnexpectedTypeException extends TemplateException {
UnexpectedTypeException(
Expression blamed, TemplateModel model, String expectedTypesDesc, Class[] expectedTypes, Environment env)
throws InvalidReferenceException {
- super(null, env, blamed, newDesciptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env));
+ super(null, env, blamed, newDescriptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env));
}
UnexpectedTypeException(
Expression blamed, TemplateModel model, String expectedTypesDesc, Class[] expectedTypes, String tip,
Environment env)
throws InvalidReferenceException {
- super(null, env, blamed, newDesciptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env)
+ super(null, env, blamed, newDescriptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env)
.tip(tip));
}
@@ -60,7 +60,7 @@ public class UnexpectedTypeException extends TemplateException {
Expression blamed, TemplateModel model, String expectedTypesDesc, Class[] expectedTypes, Object[] tips,
Environment env)
throws InvalidReferenceException {
- super(null, env, blamed, newDesciptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env)
+ super(null, env, blamed, newDescriptionBuilder(blamed, null, model, expectedTypesDesc, expectedTypes, env)
.tips(tips));
}
@@ -69,7 +69,7 @@ public class UnexpectedTypeException extends TemplateException {
Object[] tips,
Environment env)
throws InvalidReferenceException {
- super(null, env, null, newDesciptionBuilder(
+ super(null, env, null, newDescriptionBuilder(
null, blamedAssignmentTargetVarName, model, expectedTypesDesc, expectedTypes, env).tips(tips));
}
@@ -78,7 +78,7 @@ public class UnexpectedTypeException extends TemplateException {
* Used for assignments that use {@code +=} and such, in which case the {@code blamed} expression
* parameter will be null {@code null} and this parameter will be non-{null}.
*/
- private static _ErrorDescriptionBuilder newDesciptionBuilder(
+ private static _ErrorDescriptionBuilder newDescriptionBuilder(
Expression blamed, String blamedAssignmentTargetVarName,
TemplateModel model, String expectedTypesDesc, Class[] expectedTypes, Environment env)
throws InvalidReferenceException {
[2/2] freemarker git commit: Merge commit 'refs/pull/46/head' of
https://github.com/apache/freemarker into 2.3-gae
Posted by dd...@apache.org.
Merge commit 'refs/pull/46/head' of https://github.com/apache/freemarker into 2.3-gae
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/a03a1473
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/a03a1473
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/a03a1473
Branch: refs/heads/2.3-gae
Commit: a03a1473b65d9819674b285a0538fed824f37478
Parents: 43d0658 b2ff815
Author: ddekany <dd...@apache.org>
Authored: Sun Jun 10 18:48:28 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Jun 10 18:48:28 2018 +0200
----------------------------------------------------------------------
.../java/freemarker/core/UnexpectedTypeException.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------