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/03/13 10:43:24 UTC

[08/25] incubator-freemarker git commit: The freemarker.template.TemplateCollectionModelEx interface and is not experimental anymore, so now it has backward compatibility guarantees. Note that the TemplateCollectionModelEx.contains(TemplateModel) method

The freemarker.template.TemplateCollectionModelEx interface and is not experimental anymore, so now it has backward compatibility guarantees. Note that the TemplateCollectionModelEx.contains(TemplateModel) method was removed from it.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/655331d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/655331d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/655331d9

Branch: refs/heads/2.3
Commit: 655331d9eed2b5dd18f062c84b37130fe4a70a8d
Parents: 9df633c
Author: ddekany <dd...@apache.org>
Authored: Tue Mar 7 15:13:12 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Mar 7 15:13:12 2017 +0100

----------------------------------------------------------------------
 .../java/freemarker/template/TemplateCollectionModelEx.java | 8 --------
 src/manual/en_US/book.xml                                   | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/655331d9/src/main/java/freemarker/template/TemplateCollectionModelEx.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateCollectionModelEx.java b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
index 356644e..266c209 100644
--- a/src/main/java/freemarker/template/TemplateCollectionModelEx.java
+++ b/src/main/java/freemarker/template/TemplateCollectionModelEx.java
@@ -42,12 +42,4 @@ public interface TemplateCollectionModelEx extends TemplateCollectionModel {
      */
     boolean isEmpty() throws TemplateModelException;
 
-    /**
-     * Tells if a given value occurs in the collection, according the rules of the wrapped collection. As of 2.3.22,
-     * this interface is not yet utilized by FTL, and certainly it won't be earlier than 2.4.0. The usefulness of this
-     * method is questionable, as the equality rules of Java differs from that of FTL, hence, calling this won't be
-     * equivalent with {@code ?seq_contains(e)}.
-     */
-    boolean contains(TemplateModel item) throws TemplateModelException;
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/655331d9/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 48b754e..2486c6f 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26928,6 +26928,15 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
             </listitem>
 
             <listitem>
+              <para>The
+              <literal>freemarker.template.TemplateCollectionModelEx</literal>
+              interface and is not experimental anymore, so now it has
+              backward compatibility guarantees. Note that the
+              <literal>TemplateCollectionModelEx.contains(TemplateModel)</literal>
+              method was removed from it.</para>
+            </listitem>
+
+            <listitem>
               <para>Various smaller code cleanups.</para>
             </listitem>
           </itemizedlist>