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/09/11 22:23:14 UTC
freemarker git commit: (Compilation error that's not an error for
Eclipse)
Repository: freemarker
Updated Branches:
refs/heads/2.3-gae daf859ef6 -> 3d29eef5e
(Compilation error that's not an error for Eclipse)
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/3d29eef5
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/3d29eef5
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/3d29eef5
Branch: refs/heads/2.3-gae
Commit: 3d29eef5edc2c9f8c7c37eb625cb74a590cc65b3
Parents: daf859e
Author: ddekany <dd...@apache.org>
Authored: Wed Sep 12 00:23:05 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Sep 12 00:23:05 2018 +0200
----------------------------------------------------------------------
.../java/freemarker/template/utility/TemplateModelUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/freemarker/blob/3d29eef5/src/main/java/freemarker/template/utility/TemplateModelUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/TemplateModelUtils.java b/src/main/java/freemarker/template/utility/TemplateModelUtils.java
index e396050..a22b4a8 100644
--- a/src/main/java/freemarker/template/utility/TemplateModelUtils.java
+++ b/src/main/java/freemarker/template/utility/TemplateModelUtils.java
@@ -147,7 +147,7 @@ public final class TemplateModelUtils {
*
* @since 2.3.29
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static TemplateHashModel wrapAsHashUnion(ObjectWrapper objectWrapper, List<?> hashLikeObjects)
throws TemplateModelException {
NullArgumentException.check("hashLikeObjects", hashLikeObjects);
@@ -181,7 +181,7 @@ public final class TemplateModelUtils {
return hashes.isEmpty() ? Constants.EMPTY_HASH
: hashes.size() == 1 ? hashes.get(0)
- : allTHMEx ? new HashExUnionModel((List<? extends TemplateHashModelEx>) hashes)
+ : allTHMEx ? new HashExUnionModel((List) hashes)
: new HashUnionModel(hashes);
}