freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [freemarker] branch 3 updated: Forward ported from 2.3-gae: (Minor API cleanup)
Date Sun, 12 Jan 2020 09:51:27 GMT
This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/3 by this push:
     new d55e381  Forward ported from 2.3-gae: (Minor API cleanup)
d55e381 is described below

commit d55e381f023819289cbce314abbd657406229477
Author: ddekany <ddekany@apache.org>
AuthorDate: Sun Jan 12 10:51:17 2020 +0100

    Forward ported from 2.3-gae: (Minor API cleanup)
---
 .../apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java  | 2 +-
 .../core/model/impl/MemberSelectorListMemberAccessPolicy.java           | 2 +-
 .../apache/freemarker/core/model/impl/WhitelistMemberAccessPolicy.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java
index 5bb0d62..a7dc07f 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java
@@ -41,7 +41,7 @@ public class BlacklistMemberAccessPolicy extends MemberSelectorListMemberAccessP
      *      List of member selectors; see {@link MemberSelectorListMemberAccessPolicy} class-level
documentation for
      *      more.
      */
-    public BlacklistMemberAccessPolicy(Collection<MemberSelector> memberSelectors)
{
+    public BlacklistMemberAccessPolicy(Collection<? extends MemberSelector> memberSelectors)
{
         super(memberSelectors, ListType.BLACKLIST, null);
     }
 
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
index 48e48e4..6317b1a 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MemberSelectorListMemberAccessPolicy.java
@@ -350,7 +350,7 @@ public abstract class MemberSelectorListMemberAccessPolicy implements
MemberAcce
      * @param matchAnnotation
      */
     MemberSelectorListMemberAccessPolicy(
-            Collection<MemberSelector> memberSelectors, ListType listType,
+            Collection<? extends MemberSelector> memberSelectors, ListType listType,
             Class<? extends Annotation> matchAnnotation) {
         this.listType = listType;
         this.matchAnnotation = matchAnnotation;
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/WhitelistMemberAccessPolicy.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/WhitelistMemberAccessPolicy.java
index 25e4801..ecd6c77 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/WhitelistMemberAccessPolicy.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/WhitelistMemberAccessPolicy.java
@@ -45,7 +45,7 @@ public class WhitelistMemberAccessPolicy extends MemberSelectorListMemberAccessP
      *      List of member selectors; see {@link MemberSelectorListMemberAccessPolicy} class-level
documentation for
      *      more.
      */
-    public WhitelistMemberAccessPolicy(Collection<MemberSelector> memberSelectors)
{
+    public WhitelistMemberAccessPolicy(Collection<? extends MemberSelector> memberSelectors)
{
         super(memberSelectors, ListType.WHITELIST, TemplateAccessible.class);
     }
 


Mime
View raw message