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/09/30 10:45:14 UTC
incubator-freemarker git commit: Fixed binary compatibility mistake.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae a36719572 -> 17c3d4e50
Fixed binary compatibility mistake.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/17c3d4e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/17c3d4e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/17c3d4e5
Branch: refs/heads/2.3-gae
Commit: 17c3d4e50bb01716609473c0e68972876c84dae1
Parents: a367195
Author: ddekany <dd...@apache.org>
Authored: Sat Sep 30 12:45:09 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sat Sep 30 12:45:09 2017 +0200
----------------------------------------------------------------------
.../freemarker/template/SimpleCollection.java | 21 +++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/17c3d4e5/src/main/java/freemarker/template/SimpleCollection.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/SimpleCollection.java b/src/main/java/freemarker/template/SimpleCollection.java
index b29c110..46e8671 100644
--- a/src/main/java/freemarker/template/SimpleCollection.java
+++ b/src/main/java/freemarker/template/SimpleCollection.java
@@ -55,9 +55,7 @@ implements TemplateCollectionModel, Serializable {
}
/**
- * @param iterable Note that this was a {@link Collection} before 2.3.27, not an {@link Iterable}
- *
- * @deprecated Use {@link #SimpleCollection(Iterable, ObjectWrapper)}
+ * @deprecated Use {@link #SimpleCollection(Iterable, ObjectWrapper)} instead.
*/
@Deprecated
public SimpleCollection(Iterable iterable) {
@@ -65,6 +63,23 @@ implements TemplateCollectionModel, Serializable {
iterator = null;
}
+ /**
+ * Same as {@link SimpleCollection#SimpleCollection(Iterable)}; kept for binary compatibility.
+ *
+ * @deprecated Use {@link #SimpleCollection(Iterable, ObjectWrapper)} instead.
+ */
+ @Deprecated
+ public SimpleCollection(Collection collection) {
+ this((Iterable) collection);
+ }
+
+ /**
+ * Same as {@link SimpleCollection#SimpleCollection(Iterable, ObjectWrapper)}; kept for binary compatibility.
+ */
+ public SimpleCollection(Collection collection, ObjectWrapper wrapper) {
+ this((Iterable) collection, wrapper);
+ }
+
public SimpleCollection(Iterator iterator, ObjectWrapper wrapper) {
super(wrapper);
this.iterator = iterator;