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/03 21:25:23 UTC
[1/2] incubator-freemarker git commit: (Removed #foreach from some
more places)
Repository: incubator-freemarker
Updated Branches:
refs/heads/3 e3486d9e6 -> df580b495
(Removed #foreach from some more places)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c4a9f6fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c4a9f6fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c4a9f6fd
Branch: refs/heads/3
Commit: c4a9f6fd6f42b4c89b9be82ea3053b9d0d5c8da3
Parents: e3486d9
Author: ddekany <dd...@apache.org>
Authored: Fri Mar 3 22:25:00 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Mar 3 22:25:00 2017 +0100
----------------------------------------------------------------------
src/main/java/org/apache/freemarker/core/ASTDirective.java | 1 -
.../apache/freemarker/test/templatesuite/expected/iterators.txt | 2 --
.../apache/freemarker/test/templatesuite/templates/iterators.ftl | 2 --
3 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/main/java/org/apache/freemarker/core/ASTDirective.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ASTDirective.java b/src/main/java/org/apache/freemarker/core/ASTDirective.java
index 3506036..778fed1 100644
--- a/src/main/java/org/apache/freemarker/core/ASTDirective.java
+++ b/src/main/java/org/apache/freemarker/core/ASTDirective.java
@@ -62,7 +62,6 @@ abstract class ASTDirective extends ASTElement {
addName(allNames, lcNames, ccNames, "escape");
addName(allNames, lcNames, ccNames, "fallback");
addName(allNames, lcNames, ccNames, "flush");
- addName(allNames, lcNames, ccNames, "foreach", "forEach");
addName(allNames, lcNames, ccNames, "ftl");
addName(allNames, lcNames, ccNames, "function");
addName(allNames, lcNames, ccNames, "global");
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt
index ef1954c..fb44def 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt
@@ -68,8 +68,6 @@
<p>four</p>
<p>five</p>
-<p>Now test the list and foreach keywords...</p>
-
<p>one</p>
<p>two</p>
<p>three</p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c4a9f6fd/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl
index 2fd9b21..389abf3 100644
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl
+++ b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/iterators.ftl
@@ -59,8 +59,6 @@
<p>${item}</p>
</#list>
-<p>Now test the list and foreach keywords...</p>
-
<#list hash2["value"].key as key>
<p>${key}</p>
</#list>
[2/2] incubator-freemarker git commit: (Removed unused test ftl)
Posted by dd...@apache.org.
(Removed unused test ftl)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/df580b49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/df580b49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/df580b49
Branch: refs/heads/3
Commit: df580b495e03feb6442b141f26866b0b58510aea
Parents: c4a9f6f
Author: ddekany <dd...@apache.org>
Authored: Fri Mar 3 22:25:16 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Mar 3 22:25:16 2017 +0100
----------------------------------------------------------------------
.../test/templatesuite/templates/exthash.ftl | 48 --------------------
1 file changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/df580b49/src/test/resources/org/apache/freemarker/test/templatesuite/templates/exthash.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/exthash.ftl b/src/test/resources/org/apache/freemarker/test/templatesuite/templates/exthash.ftl
deleted file mode 100644
index 24ba759..0000000
--- a/src/test/resources/org/apache/freemarker/test/templatesuite/templates/exthash.ftl
+++ /dev/null
@@ -1,48 +0,0 @@
-<#--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html>
-<head>
-<title>FreeMarker: Extended Hash Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>${message}</p>
-
-<p>A hash set of ${animals?size} animals follows:</p>
-<assign animalKeys = animals?keys>
-<p><foreach animal in animalKeys>
- ${animal}<if animal_has_next>, <else>.</if>
-</foreach></p>
-
-<p>The first animal is an ${animalKeys?first}, and the last is a
-${animalKeys?last}.</p>
-
-<p>A hash set of ${animals?size} digits follows:<p>
-<assign animalValues = animals._values>
-<p><foreach number in animalValues>
- ${number}<if number_has_next>, <else>.</if>
-</foreach></p>
-
-<p>The zebra number is ${animals.zebra}.</p>
-
-<p>The end.</p>
-</body>
-</html>