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/01/20 12:47:42 UTC
[1/2] incubator-freemarker git commit: Removed reflection trick
unnecessary since we require Java 5
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 7418c10d2 -> 371b4312f
Removed reflection trick unnecessary since we require Java 5
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c23e0bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c23e0bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c23e0bad
Branch: refs/heads/2.3-gae
Commit: c23e0bad4ee2d4a3962804ab1fc962ca0cfaca12
Parents: 7418c10
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 20 13:46:46 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 20 13:46:46 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/ext/beans/BeansWrapper.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c23e0bad/src/main/java/freemarker/ext/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapper.java b/src/main/java/freemarker/ext/beans/BeansWrapper.java
index 8b51238..71c405f 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
@@ -94,18 +94,6 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
@Deprecated
static final Object CAN_NOT_UNWRAP = ObjectWrapperAndUnwrapper.CANT_UNWRAP_TO_TARGET_CLASS;
- private static final Class<?> ITERABLE_CLASS;
- static {
- Class<?> iterable;
- try {
- iterable = Class.forName("java.lang.Iterable");
- } catch (ClassNotFoundException e) {
- // We're running on a pre-1.5 JRE
- iterable = null;
- }
- ITERABLE_CLASS = iterable;
- }
-
private static final Constructor<?> ENUMS_MODEL_CTOR = enumsModelCtor();
/**
@@ -1119,7 +1107,7 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable {
}
}
- if (Collection.class == targetClass || ITERABLE_CLASS == targetClass) {
+ if (Collection.class == targetClass || Iterable.class == targetClass) {
if (model instanceof TemplateCollectionModel) {
return new CollectionAdapter((TemplateCollectionModel) model,
this);
[2/2] incubator-freemarker git commit: Build: "ide-dependencies"
depends on "jar"
Posted by dd...@apache.org.
Build: "ide-dependencies" depends on "jar"
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/371b4312
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/371b4312
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/371b4312
Branch: refs/heads/2.3-gae
Commit: 371b4312f46cff6f02395c1d4a25d52b13d70104
Parents: c23e0ba
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 20 13:47:29 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 20 13:47:29 2017 +0100
----------------------------------------------------------------------
build.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/371b4312/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f42815a..d05c9bd 100644
--- a/build.xml
+++ b/build.xml
@@ -1062,7 +1062,8 @@ Proceed? </input>
<ivy:report todir="build/deps-report" />
</target>
- <target name="ide-dependencies" description="If your IDE has no Ivy support, this generates ide-lib/*.jar for it">
+ <target name="ide-dependencies" depends="jar"
+ description="If your IDE has no Ivy support, this generates ide-lib/*.jar for it">
<mkdir dir="ide-dependencies" />
<delete includeEmptyDirs="true">
<fileset dir="ide-dependencies">