[freemarker-generator] branch FREEMARKER-161 updated: FREEMARKER-161 [freemarker-generator] Allow multiple transformations on the CLI

[sgoeschl]

This is an automated email from the ASF dual-hosted git repository.

sgoeschl pushed a commit to branch FREEMARKER-161
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git


The following commit(s) were added to refs/heads/FREEMARKER-161 by this push:
     new 6445e75  FREEMARKER-161 [freemarker-generator] Allow multiple 
transformations on the CLI
6445e75 is described below

commit 6445e755ef0c5a3ab090cac4c284b0b1bd643b20
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Thu Jan 7 18:59:17 2021 +0100

    FREEMARKER-161 [freemarker-generator] Allow multiple transformations on the 
CLI
---
 .../java/org/apache/freemarker/generator/base/util/MapBuilder.java | 7 -------
 freemarker-generator-cli/src/app/examples/templates/demo.ftl       | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
index 9b71d22..9033fdb 100644
--- 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
+++ 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
@@ -51,11 +51,4 @@ public class MapBuilder {
 
         return map;
     }
-
-    public static Map<String, Object> merge(List<Map<String, Object>> maps) {
-        final Map<String, Object> result = new HashMap<>();
-        maps.forEach(result::putAll);
-        return result;
-    }
-
 }
diff --git a/freemarker-generator-cli/src/app/examples/templates/demo.ftl 
b/freemarker-generator-cli/src/app/examples/templates/demo.ftl
index 8ec3ac4..879fb3f 100644
--- a/freemarker-generator-cli/src/app/examples/templates/demo.ftl
+++ b/freemarker-generator-cli/src/app/examples/templates/demo.ftl
@@ -127,7 +127,10 @@ UUIDTool Named UUID   : ${tools.uuid.namedUUID("value and 
salt")}
 
 15) Printing Special Characters
 ---------------------------------------------------------------------------
+Windows 1252 Characters: €¥§ÆÇæ®
 German Special Characters: äöüßÄÖÜ
+Cyrillic Characters: Кириллица
+Chinese Characters: 你好吗
 
 16) Locale-specific output
 ---------------------------------------------------------------------------