diff --git a/Advanced/CsvStreaming/CsvStreaming.csproj b/Advanced/CsvStreaming/CsvStreaming.csproj index c5b1981c..c3781570 100644 --- a/Advanced/CsvStreaming/CsvStreaming.csproj +++ b/Advanced/CsvStreaming/CsvStreaming.csproj @@ -40,7 +40,7 @@ True - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll False diff --git a/Advanced/CsvStreaming/packages.config b/Advanced/CsvStreaming/packages.config index b7452d3b..3d264873 100644 --- a/Advanced/CsvStreaming/packages.config +++ b/Advanced/CsvStreaming/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Advanced/CsvStreaming/pom.xml b/Advanced/CsvStreaming/pom.xml index f1c77c43..87259b73 100644 --- a/Advanced/CsvStreaming/pom.xml +++ b/Advanced/CsvStreaming/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example csv-streaming-example jar - 6.1.0 + 6.2.0 CSV streaming https://github.com/ngs-doo/TemplaterExamples diff --git a/Advanced/CsvStreaming/src/main/java/hr/ngs/templater/example/CsvStreamingExample.java b/Advanced/CsvStreaming/src/main/java/hr/ngs/templater/example/CsvStreamingExample.java index c05dd244..e1e02e31 100644 --- a/Advanced/CsvStreaming/src/main/java/hr/ngs/templater/example/CsvStreamingExample.java +++ b/Advanced/CsvStreaming/src/main/java/hr/ngs/templater/example/CsvStreamingExample.java @@ -18,7 +18,7 @@ public class CsvStreamingExample { - static class Quoter implements IDocumentFactoryBuilder.ILowLevelReplacer { + static class Quoter implements IDocumentFactoryBuilder.LowLevelReplacer { @Override public Object replace(Object value, String tag, String[] metadata) { @@ -32,7 +32,7 @@ public Object replace(Object value, String tag, String[] metadata) { return value; } } - static class NumberAsComma implements IDocumentFactoryBuilder.ILowLevelReplacer { + static class NumberAsComma implements IDocumentFactoryBuilder.LowLevelReplacer { @Override public Object replace(Object value, String tag, String[] metadata) { diff --git a/Advanced/DepartmentReport/DepartmentReport.csproj b/Advanced/DepartmentReport/DepartmentReport.csproj index 920c6a2d..bde15b05 100644 --- a/Advanced/DepartmentReport/DepartmentReport.csproj +++ b/Advanced/DepartmentReport/DepartmentReport.csproj @@ -36,7 +36,10 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll + + + ..\..\packages\NReco.LambdaParser.1.0.10\lib\portable-net40+sl5+win8+wp8+wpa81\NReco.LambdaParser.dll diff --git a/Advanced/DepartmentReport/Readme.md b/Advanced/DepartmentReport/Readme.md index bfd74949..5a442f5a 100644 --- a/Advanced/DepartmentReport/Readme.md +++ b/Advanced/DepartmentReport/Readme.md @@ -56,3 +56,7 @@ This can be used for various purposes: * calling methods with arguments (unlike only being able to use zero method navigation) * various other complex logic +There are two navigation plugin implementations in the project: + + * sort - using simplistic reflection implementation + * filter - using expression parsing libraries diff --git a/Advanced/DepartmentReport/packages.config b/Advanced/DepartmentReport/packages.config index c2d6a5a7..ca804358 100644 --- a/Advanced/DepartmentReport/packages.config +++ b/Advanced/DepartmentReport/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Advanced/DepartmentReport/pom.xml b/Advanced/DepartmentReport/pom.xml index 89aff44e..8d873c0b 100644 --- a/Advanced/DepartmentReport/pom.xml +++ b/Advanced/DepartmentReport/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example department-report-example jar - 6.1.0 + 6.2.0 DepartmentReportExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Advanced/DepartmentReport/result.xlsx b/Advanced/DepartmentReport/result.xlsx index e61296a5..7c2d802f 100644 Binary files a/Advanced/DepartmentReport/result.xlsx and b/Advanced/DepartmentReport/result.xlsx differ diff --git a/Advanced/DepartmentReport/src/Program.cs b/Advanced/DepartmentReport/src/Program.cs index 6345c9b8..0016ebbf 100644 --- a/Advanced/DepartmentReport/src/Program.cs +++ b/Advanced/DepartmentReport/src/Program.cs @@ -1,8 +1,11 @@ -using System.Collections; +using System; +using System.Collections; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using NGS.Templater; +using NReco.Linq; namespace DepartmentReport { @@ -64,16 +67,28 @@ public Task(string id, decimal estimated, decimal spent) public static void Main(string[] args) { + var company = GetCompany(); using (var fis = File.OpenRead("template/departments.xlsx")) using (var fos = File.OpenWrite("departments.xlsx")) using (var doc = Configuration .Builder - .NavigateSeparator(':') + .WithMatcher(@"[\w\s \.,:?!+\*-<>=()]+") + .NavigateSeparator(':', null) .Include(SortExpression) + .Include(FilterExpression) .Build() .Open(fis, "xlsx", fos)) - doc.Process(GetCompany()); - + { + doc.Process(company); + var flattened = + from d in company.department + from t in d.team + from p in t.project + from e in p.epic + from k in e.task + select new { department = d, team = t, project = p, epic = e, task = k }; + doc.Process(new { flatten = flattened }); + } Process.Start(new ProcessStartInfo("departments.xlsx") { UseShellExecute = true }); } @@ -86,6 +101,25 @@ static object SortExpression(object parent, object value, string member, string return col.OfType().OrderBy(it => f.GetValue(it)).ToList(); } + private static readonly LambdaParser ExpressionParser = new LambdaParser { UseCache = true }; + private static Func GetValue(object instance) + { + var type = instance.GetType(); + return name => + { + var property = type.GetProperty(name); + return property.GetValue(instance, new object[0]); + }; + } + + static object FilterExpression(object parent, object value, string member, string metadata) + { + var col = value as IEnumerable; + if (!metadata.StartsWith("filter(") || col == null) return value; + var expression = metadata.Substring(7, metadata.Length - 8); + return col.Where(it => (bool)ExpressionParser.Eval(expression, GetValue(it))); + } + private static Company GetCompany() { var company = new Company diff --git a/Advanced/DepartmentReport/src/main/java/hr/ngs/templater/example/DepartmentReportExample.java b/Advanced/DepartmentReport/src/main/java/hr/ngs/templater/example/DepartmentReportExample.java index 4e0ba4a7..8b232aaa 100644 --- a/Advanced/DepartmentReport/src/main/java/hr/ngs/templater/example/DepartmentReportExample.java +++ b/Advanced/DepartmentReport/src/main/java/hr/ngs/templater/example/DepartmentReportExample.java @@ -4,8 +4,10 @@ import hr.ngs.templater.IDocumentFactoryBuilder; import hr.ngs.templater.ITemplateDocument; +import javax.script.*; import java.awt.Desktop; import java.io.*; +import java.lang.reflect.Array; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -29,15 +31,10 @@ public Collection summary() { public final String epic = e.name; public final String task = it.id; public final double days = it.spent; - } - ) - ) - ) - ) - ).collect(Collectors.toList()); + }))))).collect(Collectors.toList()); } } - static class Department { + public static class Department { public String name; public String code; public String head; @@ -49,7 +46,7 @@ public Department(String name, String code, String head, Team... teams) { this.team = teams; } } - static class Team { + public static class Team { public String name; public String lead; public Project[] project; @@ -59,7 +56,7 @@ public Team(String name, String lead, Project... projects) { this.project = projects; } } - static class Project { + public static class Project { public String name; public Epic[] epic; public Project(String name, Epic... epics) { @@ -67,7 +64,7 @@ public Project(String name, Epic... epics) { this.epic = epics; } } - static class Epic { + public static class Epic { public String name; public Task[] task; public Epic(String name, Task... tasks) { @@ -75,7 +72,7 @@ public Epic(String name, Task... tasks) { this.task = tasks; } } - static class Task { + public static class Task { public String id; public double estimated; public double spent; @@ -90,14 +87,31 @@ public static void main(final String[] args) throws Exception { InputStream templateStream = DepartmentReportExample.class.getResourceAsStream("/departments.xlsx"); File tmp = File.createTempFile("department", ".xlsx"); + Company company = getCompany(); FileOutputStream fos = new FileOutputStream(tmp); ITemplateDocument tpl = Configuration .builder() - .navigateSeparator(':') + .withMatcher("[\\w\\s \\.,:?!+\\*-<>=()]+") + .navigateSeparator(':', null) .include(new SortExpression()) + .include(new FilterExpression()) .build() .open(templateStream, "xlsx", fos); - tpl.process(getCompany()); + tpl.process(company); + List flattened = + Arrays.stream(company.department).flatMap(d -> + Arrays.stream(d.team).flatMap(t -> + Arrays.stream(t.project).flatMap(p -> + Arrays.stream(p.epic).flatMap(e -> + Arrays.stream(e.task).map(it -> + new Object() { + public final Department department = d; + public final Team team = t; + public final Project project = p; + public final Epic epic = e; + public final Task task = it; + }))))).collect(Collectors.toList()); + tpl.process(new Object() { public final List flatten = flattened; }); tpl.close(); fos.close(); Desktop.getDesktop().open(tmp); @@ -105,7 +119,7 @@ public static void main(final String[] args) throws Exception { //this is just a simplistic implementation //a better implementation would take care of methods, dictionaries and various other types - static class SortExpression implements IDocumentFactoryBuilder.INavigate { + static class SortExpression implements IDocumentFactoryBuilder.Navigate { @Override public Object navigate(Object parent, Object value, String member, String metadata) { if (!metadata.startsWith("sort(") || value instanceof Object[] == false) return value; @@ -135,6 +149,35 @@ public Object navigate(Object parent, Object value, String member, String metada } } + private static final ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName("JavaScript"); + + static class FilterExpression implements IDocumentFactoryBuilder.Navigate { + @Override + public Object navigate(Object parent, Object value, String member, String metadata) { + if (!metadata.startsWith("filter(") || value instanceof List == false) return value; + List elements = (List) value; + if (elements.size() == 0 || elements.get(0) == null) return value; + String expression = metadata.substring(7, metadata.length() - 1); + Field[] fields = elements.get(0).getClass().getFields(); + List result = new ArrayList<>(); + Bindings bindings = scriptEngine.createBindings(); + for (Object el : elements) { + try { + for (Field f : fields) { + bindings.put(f.getName(), f.get(el)); + } + Object eval = scriptEngine.eval(expression, bindings); + if (Boolean.TRUE.equals(eval)) { + result.add(el); + } + } catch (IllegalAccessException | ScriptException e) { + throw new RuntimeException(e); + } + } + return result; + } + } + private static Company getCompany() { Company company = new Company(); company.name = "Sweat shop ltd."; diff --git a/Advanced/DepartmentReport/template/departments.xlsx b/Advanced/DepartmentReport/template/departments.xlsx index 91ff5d2f..680d8de1 100644 Binary files a/Advanced/DepartmentReport/template/departments.xlsx and b/Advanced/DepartmentReport/template/departments.xlsx differ diff --git a/Advanced/DoubleProcessing/DoubleProcessing.csproj b/Advanced/DoubleProcessing/DoubleProcessing.csproj index 153522a6..28f988da 100644 --- a/Advanced/DoubleProcessing/DoubleProcessing.csproj +++ b/Advanced/DoubleProcessing/DoubleProcessing.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Advanced/DoubleProcessing/packages.config b/Advanced/DoubleProcessing/packages.config index c2d6a5a7..7d665602 100644 --- a/Advanced/DoubleProcessing/packages.config +++ b/Advanced/DoubleProcessing/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Advanced/DoubleProcessing/pom.xml b/Advanced/DoubleProcessing/pom.xml index 783f4ce4..392d56e8 100644 --- a/Advanced/DoubleProcessing/pom.xml +++ b/Advanced/DoubleProcessing/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example double-processing-example jar - 6.1.0 + 6.2.0 DoubleProcessingExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Advanced/PowerQuery/PowerQuery.csproj b/Advanced/PowerQuery/PowerQuery.csproj index 8c46684f..88d79ba4 100644 --- a/Advanced/PowerQuery/PowerQuery.csproj +++ b/Advanced/PowerQuery/PowerQuery.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Advanced/PowerQuery/packages.config b/Advanced/PowerQuery/packages.config index c2d6a5a7..7d665602 100644 --- a/Advanced/PowerQuery/packages.config +++ b/Advanced/PowerQuery/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Advanced/PowerQuery/pom.xml b/Advanced/PowerQuery/pom.xml index 2a98223b..5bd512bc 100644 --- a/Advanced/PowerQuery/pom.xml +++ b/Advanced/PowerQuery/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example power-query-example jar - 6.1.0 + 6.2.0 PowerQueryExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Advanced/README.md b/Advanced/README.md index 37034ad4..2b392b6c 100644 --- a/Advanced/README.md +++ b/Advanced/README.md @@ -34,7 +34,7 @@ Templater makes it very convenient to manage report templates. ### [Complex Excel report](DepartmentReport/Readme.md) -Combining various Excel features to create good looking report. +Combining various Excel features to create good-looking report. Using expression parser for filtering. [template](DepartmentReport/template/departments.xlsx?raw=true) - [result](DepartmentReport/result.xlsx?raw=true) diff --git a/Advanced/SalesOrderMVP (.NET)/SalesOrderMVP.csproj b/Advanced/SalesOrderMVP (.NET)/SalesOrderMVP.csproj index c6e8d941..878e6115 100644 --- a/Advanced/SalesOrderMVP (.NET)/SalesOrderMVP.csproj +++ b/Advanced/SalesOrderMVP (.NET)/SalesOrderMVP.csproj @@ -48,7 +48,7 @@ True - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Advanced/SalesOrderMVP (.NET)/packages.config b/Advanced/SalesOrderMVP (.NET)/packages.config index a3a8d9f7..b6801e97 100644 --- a/Advanced/SalesOrderMVP (.NET)/packages.config +++ b/Advanced/SalesOrderMVP (.NET)/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Advanced/SheetReport/SheetReport.csproj b/Advanced/SheetReport/SheetReport.csproj index c9259004..3eee4caf 100644 --- a/Advanced/SheetReport/SheetReport.csproj +++ b/Advanced/SheetReport/SheetReport.csproj @@ -40,7 +40,7 @@ True - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Advanced/SheetReport/packages.config b/Advanced/SheetReport/packages.config index 0e8cc397..eea555c4 100644 --- a/Advanced/SheetReport/packages.config +++ b/Advanced/SheetReport/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Advanced/SheetReport/pom.xml b/Advanced/SheetReport/pom.xml index ab128c7c..9a7bf98b 100644 --- a/Advanced/SheetReport/pom.xml +++ b/Advanced/SheetReport/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example sheet-report-example jar - 6.1.0 + 6.2.0 SheetReportExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Advanced/TemplaterServer/TemplaterServer.csproj b/Advanced/TemplaterServer/TemplaterServer.csproj index afbc8f8e..74bf5582 100644 --- a/Advanced/TemplaterServer/TemplaterServer.csproj +++ b/Advanced/TemplaterServer/TemplaterServer.csproj @@ -24,7 +24,7 @@ - + diff --git a/Advanced/TemplaterServer/pom.xml b/Advanced/TemplaterServer/pom.xml index 43fd2e7f..1724fc61 100644 --- a/Advanced/TemplaterServer/pom.xml +++ b/Advanced/TemplaterServer/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example templater-server jar - 6.1.0 + 6.2.0 TemplaterServer https://github.com/ngs-doo/TemplaterExamples @@ -38,14 +38,14 @@ e-iceblue spire.doc.free 3.9.0 - compile + provided com.aspose aspose-words 21.7 jdk17 - compile + provided javax.xml.bind diff --git a/Advanced/XmlBinding/XmlBinding.csproj b/Advanced/XmlBinding/XmlBinding.csproj index 3844363c..a83ee86f 100644 --- a/Advanced/XmlBinding/XmlBinding.csproj +++ b/Advanced/XmlBinding/XmlBinding.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Advanced/XmlBinding/packages.config b/Advanced/XmlBinding/packages.config index c2d6a5a7..7d665602 100644 --- a/Advanced/XmlBinding/packages.config +++ b/Advanced/XmlBinding/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Advanced/XmlBinding/pom.xml b/Advanced/XmlBinding/pom.xml index d78d66e5..7508d6ea 100644 --- a/Advanced/XmlBinding/pom.xml +++ b/Advanced/XmlBinding/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example xml-binding-example jar - 6.1.0 + 6.2.0 XmlBindingExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/AndroidExample/app/build.gradle b/Beginner/AndroidExample/app/build.gradle index 96484f87..4cc8205d 100644 --- a/Beginner/AndroidExample/app/build.gradle +++ b/Beginner/AndroidExample/app/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:28.0.0' - implementation 'hr.ngs.templater:templater:6.1.0' + implementation 'hr.ngs.templater:templater:6.2.0' implementation 'xalan:xalan:2.7.2' implementation 'xerces:xercesImpl:2.12.0' testImplementation 'junit:junit:4.12' diff --git a/Beginner/BeerList (Scala)/build.sbt b/Beginner/BeerList (Scala)/build.sbt index e2e97436..a05ee3d9 100644 --- a/Beginner/BeerList (Scala)/build.sbt +++ b/Beginner/BeerList (Scala)/build.sbt @@ -1,6 +1,6 @@ name := "BeerList" version := "1.0.0-SNAPSHOT" organization := "hr.ngs.templater.example" -scalaVersion := "2.12.14" +scalaVersion := "2.12.15" -libraryDependencies += "hr.ngs.templater" %% "templater" % "6.1.0" +libraryDependencies += "hr.ngs.templater" %% "templater" % "6.2.0" diff --git a/Beginner/CsvExample/CsvExample.csproj b/Beginner/CsvExample/CsvExample.csproj index c62e0b4b..72e9a599 100644 --- a/Beginner/CsvExample/CsvExample.csproj +++ b/Beginner/CsvExample/CsvExample.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll diff --git a/Beginner/CsvExample/packages.config b/Beginner/CsvExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/CsvExample/packages.config +++ b/Beginner/CsvExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/CsvExample/pom.xml b/Beginner/CsvExample/pom.xml index 5d16d5ca..19f499c1 100644 --- a/Beginner/CsvExample/pom.xml +++ b/Beginner/CsvExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example csv-example jar - 6.1.0 + 6.2.0 CSV https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/CsvExample/src/main/java/hr/ngs/templater/example/CsvExample.java b/Beginner/CsvExample/src/main/java/hr/ngs/templater/example/CsvExample.java index d3dd5106..936c5d90 100644 --- a/Beginner/CsvExample/src/main/java/hr/ngs/templater/example/CsvExample.java +++ b/Beginner/CsvExample/src/main/java/hr/ngs/templater/example/CsvExample.java @@ -16,7 +16,7 @@ public class CsvExample { - static class Quoter implements IDocumentFactoryBuilder.IFormatter { + static class Quoter implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { diff --git a/Beginner/DataSet (.NET)/DataSetExample.csproj b/Beginner/DataSet (.NET)/DataSetExample.csproj index 647a0ccf..b64fd4b6 100644 --- a/Beginner/DataSet (.NET)/DataSetExample.csproj +++ b/Beginner/DataSet (.NET)/DataSetExample.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/DataSet (.NET)/packages.config b/Beginner/DataSet (.NET)/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/DataSet (.NET)/packages.config +++ b/Beginner/DataSet (.NET)/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/DynamicResize/DynamicResize.csproj b/Beginner/DynamicResize/DynamicResize.csproj index 4ee8a794..6ac29300 100644 --- a/Beginner/DynamicResize/DynamicResize.csproj +++ b/Beginner/DynamicResize/DynamicResize.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/DynamicResize/packages.config b/Beginner/DynamicResize/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/DynamicResize/packages.config +++ b/Beginner/DynamicResize/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/DynamicResize/pom.xml b/Beginner/DynamicResize/pom.xml index f3aad9a8..3e6cda4e 100644 --- a/Beginner/DynamicResize/pom.xml +++ b/Beginner/DynamicResize/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example dynamic-resize jar - 6.1.0 + 6.2.0 DynamicResize https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/ExcelLinks/ExcelLinks.csproj b/Beginner/ExcelLinks/ExcelLinks.csproj index c458aeb6..8dcbe9b6 100644 --- a/Beginner/ExcelLinks/ExcelLinks.csproj +++ b/Beginner/ExcelLinks/ExcelLinks.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/ExcelLinks/packages.config b/Beginner/ExcelLinks/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/ExcelLinks/packages.config +++ b/Beginner/ExcelLinks/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/ExcelLinks/pom.xml b/Beginner/ExcelLinks/pom.xml index 0658e41a..50472991 100644 --- a/Beginner/ExcelLinks/pom.xml +++ b/Beginner/ExcelLinks/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example excel-links-example jar - 6.1.0 + 6.2.0 Excel links https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/ImageExample/ImageExample.csproj b/Beginner/ImageExample/ImageExample.csproj index 1db937d6..a32fd269 100644 --- a/Beginner/ImageExample/ImageExample.csproj +++ b/Beginner/ImageExample/ImageExample.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/ImageExample/packages.config b/Beginner/ImageExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/ImageExample/packages.config +++ b/Beginner/ImageExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/ImageExample/pom.xml b/Beginner/ImageExample/pom.xml index 3480feaf..f6c530ff 100644 --- a/Beginner/ImageExample/pom.xml +++ b/Beginner/ImageExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example image-example jar - 6.1.0 + 6.2.0 ImageExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/Labels/Labels.csproj b/Beginner/Labels/Labels.csproj index fa94f0f4..10a27ae8 100644 --- a/Beginner/Labels/Labels.csproj +++ b/Beginner/Labels/Labels.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/Labels/packages.config b/Beginner/Labels/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/Labels/packages.config +++ b/Beginner/Labels/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/Labels/pom.xml b/Beginner/Labels/pom.xml index c830e36a..9f1e34d5 100644 --- a/Beginner/Labels/pom.xml +++ b/Beginner/Labels/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example labels-example jar - 6.1.0 + 6.2.0 Labels https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/ListExample/ListExample.csproj b/Beginner/ListExample/ListExample.csproj index 9c10565c..040ad4e9 100644 --- a/Beginner/ListExample/ListExample.csproj +++ b/Beginner/ListExample/ListExample.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/ListExample/packages.config b/Beginner/ListExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/ListExample/packages.config +++ b/Beginner/ListExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/ListExample/pom.xml b/Beginner/ListExample/pom.xml index 5de49049..d66db25b 100644 --- a/Beginner/ListExample/pom.xml +++ b/Beginner/ListExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example list-example jar - 6.1.0 + 6.2.0 List https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/MailMerge/MailMerge.csproj b/Beginner/MailMerge/MailMerge.csproj index 6958faf0..68b1fc63 100644 --- a/Beginner/MailMerge/MailMerge.csproj +++ b/Beginner/MailMerge/MailMerge.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/MailMerge/packages.config b/Beginner/MailMerge/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/MailMerge/packages.config +++ b/Beginner/MailMerge/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/MailMerge/pom.xml b/Beginner/MailMerge/pom.xml index 07544dbc..df77cb72 100644 --- a/Beginner/MailMerge/pom.xml +++ b/Beginner/MailMerge/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example mail-merge-example jar - 6.1.0 + 6.2.0 MailMergeExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/MailMerge/src/main/java/hr/ngs/templater/example/MailMergeExample.java b/Beginner/MailMerge/src/main/java/hr/ngs/templater/example/MailMergeExample.java index 30b5d767..fbf13c15 100644 --- a/Beginner/MailMerge/src/main/java/hr/ngs/templater/example/MailMergeExample.java +++ b/Beginner/MailMerge/src/main/java/hr/ngs/templater/example/MailMergeExample.java @@ -35,7 +35,7 @@ public ImageReference(String value) { } } - static class ImageReferenceReplacer implements IDocumentFactoryBuilder.ILowLevelReplacer { + static class ImageReferenceReplacer implements IDocumentFactoryBuilder.LowLevelReplacer { @Override public Object replace(Object value, String tag, String[] metadata) { if (value instanceof ImageReference) { diff --git a/Beginner/MapExample (Java)/pom.xml b/Beginner/MapExample (Java)/pom.xml index e1138ac3..43350d7e 100644 --- a/Beginner/MapExample (Java)/pom.xml +++ b/Beginner/MapExample (Java)/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example map-example jar - 6.1.0 + 6.2.0 MapExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/NamedRange/NamedRange.csproj b/Beginner/NamedRange/NamedRange.csproj index 9f05585c..72db308f 100644 --- a/Beginner/NamedRange/NamedRange.csproj +++ b/Beginner/NamedRange/NamedRange.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/NamedRange/packages.config b/Beginner/NamedRange/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/NamedRange/packages.config +++ b/Beginner/NamedRange/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/NamedRange/pom.xml b/Beginner/NamedRange/pom.xml index 8294a764..53c747ce 100644 --- a/Beginner/NamedRange/pom.xml +++ b/Beginner/NamedRange/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example named-range-example jar - 6.1.0 + 6.2.0 NamedRange https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/Paragraphs/Paragraphs.csproj b/Beginner/Paragraphs/Paragraphs.csproj index fc80eaaa..93a01535 100644 --- a/Beginner/Paragraphs/Paragraphs.csproj +++ b/Beginner/Paragraphs/Paragraphs.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/Paragraphs/packages.config b/Beginner/Paragraphs/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/Paragraphs/packages.config +++ b/Beginner/Paragraphs/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/Paragraphs/pom.xml b/Beginner/Paragraphs/pom.xml index 80a90739..f8cbc259 100644 --- a/Beginner/Paragraphs/pom.xml +++ b/Beginner/Paragraphs/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example paragraphs-example jar - 6.1.0 + 6.2.0 Paragraphs https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/PivotExample/PivotExample.csproj b/Beginner/PivotExample/PivotExample.csproj index 58cf5adb..2869cf01 100644 --- a/Beginner/PivotExample/PivotExample.csproj +++ b/Beginner/PivotExample/PivotExample.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/PivotExample/packages.config b/Beginner/PivotExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/PivotExample/packages.config +++ b/Beginner/PivotExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/PivotExample/pom.xml b/Beginner/PivotExample/pom.xml index 43b95bc7..95ab7ae1 100644 --- a/Beginner/PivotExample/pom.xml +++ b/Beginner/PivotExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example pivot-example jar - 6.1.0 + 6.2.0 Pivot https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/PresentationTables/PresentationTables.csproj b/Beginner/PresentationTables/PresentationTables.csproj index e6f18817..6be55c17 100644 --- a/Beginner/PresentationTables/PresentationTables.csproj +++ b/Beginner/PresentationTables/PresentationTables.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/PresentationTables/packages.config b/Beginner/PresentationTables/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/PresentationTables/packages.config +++ b/Beginner/PresentationTables/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/PresentationTables/pom.xml b/Beginner/PresentationTables/pom.xml index 32be1126..e049f660 100644 --- a/Beginner/PresentationTables/pom.xml +++ b/Beginner/PresentationTables/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example presentation-tables jar - 6.1.0 + 6.2.0 Labels https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/PushDownExample/PushDownExample.csproj b/Beginner/PushDownExample/PushDownExample.csproj index bd807026..319010b5 100644 --- a/Beginner/PushDownExample/PushDownExample.csproj +++ b/Beginner/PushDownExample/PushDownExample.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/PushDownExample/packages.config b/Beginner/PushDownExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/PushDownExample/packages.config +++ b/Beginner/PushDownExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/PushDownExample/pom.xml b/Beginner/PushDownExample/pom.xml index 5f2cd9a0..f2c84684 100644 --- a/Beginner/PushDownExample/pom.xml +++ b/Beginner/PushDownExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example pushdown-example jar - 6.1.0 + 6.2.0 PushDownExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/SimpleDocument/SimpleDocument.csproj b/Beginner/SimpleDocument/SimpleDocument.csproj index e821ce80..0b7e0065 100644 --- a/Beginner/SimpleDocument/SimpleDocument.csproj +++ b/Beginner/SimpleDocument/SimpleDocument.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/SimpleDocument/packages.config b/Beginner/SimpleDocument/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/SimpleDocument/packages.config +++ b/Beginner/SimpleDocument/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/SimpleDocument/pom.xml b/Beginner/SimpleDocument/pom.xml index 5f2d50ae..77868684 100644 --- a/Beginner/SimpleDocument/pom.xml +++ b/Beginner/SimpleDocument/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example simple-word-example jar - 6.1.0 + 6.2.0 Simple Word document https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/SimplePresentation/SimplePresentation.csproj b/Beginner/SimplePresentation/SimplePresentation.csproj index 606fcabc..d1d6d086 100644 --- a/Beginner/SimplePresentation/SimplePresentation.csproj +++ b/Beginner/SimplePresentation/SimplePresentation.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/SimplePresentation/packages.config b/Beginner/SimplePresentation/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/SimplePresentation/packages.config +++ b/Beginner/SimplePresentation/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/SimplePresentation/pom.xml b/Beginner/SimplePresentation/pom.xml index 44e70377..0f254d86 100644 --- a/Beginner/SimplePresentation/pom.xml +++ b/Beginner/SimplePresentation/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example simple-presentation-example jar - 6.1.0 + 6.2.0 Simple PowerPoint document https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/SimpleSpreadsheet/SimpleSpreadsheet.csproj b/Beginner/SimpleSpreadsheet/SimpleSpreadsheet.csproj index eb9f9395..05385fda 100644 --- a/Beginner/SimpleSpreadsheet/SimpleSpreadsheet.csproj +++ b/Beginner/SimpleSpreadsheet/SimpleSpreadsheet.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/SimpleSpreadsheet/packages.config b/Beginner/SimpleSpreadsheet/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/SimpleSpreadsheet/packages.config +++ b/Beginner/SimpleSpreadsheet/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/SimpleSpreadsheet/pom.xml b/Beginner/SimpleSpreadsheet/pom.xml index 6e18c868..54cfbf99 100644 --- a/Beginner/SimpleSpreadsheet/pom.xml +++ b/Beginner/SimpleSpreadsheet/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example simple-excel-example jar - 6.1.0 + 6.2.0 Simple Excel document https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/SpreadsheetGrouping/SpreadsheetGrouping.csproj b/Beginner/SpreadsheetGrouping/SpreadsheetGrouping.csproj index 50db2ab0..e8217286 100644 --- a/Beginner/SpreadsheetGrouping/SpreadsheetGrouping.csproj +++ b/Beginner/SpreadsheetGrouping/SpreadsheetGrouping.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/SpreadsheetGrouping/packages.config b/Beginner/SpreadsheetGrouping/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/SpreadsheetGrouping/packages.config +++ b/Beginner/SpreadsheetGrouping/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/SpreadsheetGrouping/pom.xml b/Beginner/SpreadsheetGrouping/pom.xml index a01fd3c6..1eb3be2b 100644 --- a/Beginner/SpreadsheetGrouping/pom.xml +++ b/Beginner/SpreadsheetGrouping/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example spreadsheet-grouping-example jar - 6.1.0 + 6.2.0 Spreadsheet grouping https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/ToFormulaConversion/ToFormulaConversion.csproj b/Beginner/ToFormulaConversion/ToFormulaConversion.csproj index 6368e686..4e33e543 100644 --- a/Beginner/ToFormulaConversion/ToFormulaConversion.csproj +++ b/Beginner/ToFormulaConversion/ToFormulaConversion.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/ToFormulaConversion/packages.config b/Beginner/ToFormulaConversion/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/ToFormulaConversion/packages.config +++ b/Beginner/ToFormulaConversion/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/ToFormulaConversion/pom.xml b/Beginner/ToFormulaConversion/pom.xml index db9d609c..956ab8dd 100644 --- a/Beginner/ToFormulaConversion/pom.xml +++ b/Beginner/ToFormulaConversion/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example formula-conversion-example jar - 6.1.0 + 6.2.0 To formula conversion https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/WebExample (.NET)/TemplaterWeb.csproj b/Beginner/WebExample (.NET)/TemplaterWeb.csproj index 8625b110..d6e96fdc 100644 --- a/Beginner/WebExample (.NET)/TemplaterWeb.csproj +++ b/Beginner/WebExample (.NET)/TemplaterWeb.csproj @@ -47,7 +47,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/WebExample (.NET)/packages.config b/Beginner/WebExample (.NET)/packages.config index 353a3949..1391c0e1 100644 --- a/Beginner/WebExample (.NET)/packages.config +++ b/Beginner/WebExample (.NET)/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/WordLinks/WordLinks.csproj b/Beginner/WordLinks/WordLinks.csproj index 314811ad..70dabbae 100644 --- a/Beginner/WordLinks/WordLinks.csproj +++ b/Beginner/WordLinks/WordLinks.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Beginner/WordLinks/packages.config b/Beginner/WordLinks/packages.config index c2d6a5a7..7d665602 100644 --- a/Beginner/WordLinks/packages.config +++ b/Beginner/WordLinks/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Beginner/WordLinks/pom.xml b/Beginner/WordLinks/pom.xml index e7d86f31..38d23ded 100644 --- a/Beginner/WordLinks/pom.xml +++ b/Beginner/WordLinks/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example word-links-example jar - 6.1.0 + 6.2.0 Word links https://github.com/ngs-doo/TemplaterExamples diff --git a/Beginner/WordLinks/src/main/java/hr/ngs/templater/example/WordLinksExample.java b/Beginner/WordLinks/src/main/java/hr/ngs/templater/example/WordLinksExample.java index 83ac452e..5793c584 100644 --- a/Beginner/WordLinks/src/main/java/hr/ngs/templater/example/WordLinksExample.java +++ b/Beginner/WordLinks/src/main/java/hr/ngs/templater/example/WordLinksExample.java @@ -17,7 +17,7 @@ public class WordLinksExample { - private static class StringToUrl implements IDocumentFactoryBuilder.IFormatter { + private static class StringToUrl implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { if ("url".equals(metadata)) { @@ -30,7 +30,7 @@ public Object format(Object value, String metadata) { } } - private static class ToHyperlink implements IDocumentFactoryBuilder.IFormatter { + private static class ToHyperlink implements IDocumentFactoryBuilder.Formatter { DocumentBuilderFactory dbFactory; DocumentBuilder dBuilder; diff --git a/Intermediate/AlternativeProperty/AlternativeProperty.csproj b/Intermediate/AlternativeProperty/AlternativeProperty.csproj index 8bec91db..5d351063 100644 --- a/Intermediate/AlternativeProperty/AlternativeProperty.csproj +++ b/Intermediate/AlternativeProperty/AlternativeProperty.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/AlternativeProperty/packages.config b/Intermediate/AlternativeProperty/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/AlternativeProperty/packages.config +++ b/Intermediate/AlternativeProperty/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/AlternativeProperty/pom.xml b/Intermediate/AlternativeProperty/pom.xml index 6b009e0d..9b9cbdd1 100644 --- a/Intermediate/AlternativeProperty/pom.xml +++ b/Intermediate/AlternativeProperty/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example alternative-property-example jar - 6.1.0 + 6.2.0 AlternativePropertyExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/AlternativeProperty/src/main/java/hr/ngs/templater/example/FieldsExample.java b/Intermediate/AlternativeProperty/src/main/java/hr/ngs/templater/example/FieldsExample.java index 1b637eea..00806b24 100644 --- a/Intermediate/AlternativeProperty/src/main/java/hr/ngs/templater/example/FieldsExample.java +++ b/Intermediate/AlternativeProperty/src/main/java/hr/ngs/templater/example/FieldsExample.java @@ -19,7 +19,7 @@ static class MyObject { public MyObjectB objectB = new MyObjectB(); } - static class MissingFormatter implements IDocumentFactoryBuilder.IFormatter { + static class MissingFormatter implements IDocumentFactoryBuilder.Formatter { private Callable getRoot; public MissingFormatter(Callable getRoot) { this.getRoot = getRoot; diff --git a/Intermediate/BoolOverride/BoolOverride.csproj b/Intermediate/BoolOverride/BoolOverride.csproj index 4029979b..5e04e778 100644 --- a/Intermediate/BoolOverride/BoolOverride.csproj +++ b/Intermediate/BoolOverride/BoolOverride.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/BoolOverride/packages.config b/Intermediate/BoolOverride/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/BoolOverride/packages.config +++ b/Intermediate/BoolOverride/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/BoolOverride/pom.xml b/Intermediate/BoolOverride/pom.xml index accf1d74..2dbd0c86 100644 --- a/Intermediate/BoolOverride/pom.xml +++ b/Intermediate/BoolOverride/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example bool-override-example jar - 6.1.0 + 6.2.0 BoolOverrideExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/BoolOverride/src/main/java/hr/ngs/templater/example/BoolExample.java b/Intermediate/BoolOverride/src/main/java/hr/ngs/templater/example/BoolExample.java index 7a2f4cb6..42839f4a 100644 --- a/Intermediate/BoolOverride/src/main/java/hr/ngs/templater/example/BoolExample.java +++ b/Intermediate/BoolOverride/src/main/java/hr/ngs/templater/example/BoolExample.java @@ -11,7 +11,7 @@ static class Bools { public boolean game2 = true; } - static class CustomBoolFormatter implements IDocumentFactoryBuilder.IFormatter { + static class CustomBoolFormatter implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { diff --git a/Intermediate/ChartExample/ChartExample.csproj b/Intermediate/ChartExample/ChartExample.csproj index b32d8ef9..98b0dcea 100644 --- a/Intermediate/ChartExample/ChartExample.csproj +++ b/Intermediate/ChartExample/ChartExample.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/ChartExample/packages.config b/Intermediate/ChartExample/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/ChartExample/packages.config +++ b/Intermediate/ChartExample/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/ChartExample/pom.xml b/Intermediate/ChartExample/pom.xml index 8dac42ce..1097b0ba 100644 --- a/Intermediate/ChartExample/pom.xml +++ b/Intermediate/ChartExample/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example word-chart-example jar - 6.1.0 + 6.2.0 Word chart https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/CollapseRegion/CollapseRegion.csproj b/Intermediate/CollapseRegion/CollapseRegion.csproj index 397840f8..d6b9e65f 100644 --- a/Intermediate/CollapseRegion/CollapseRegion.csproj +++ b/Intermediate/CollapseRegion/CollapseRegion.csproj @@ -39,7 +39,7 @@ ..\..\packages\Humanizer.1.37.7\lib\portable-win+net40+sl50+wp8+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Humanizer.dll - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/CollapseRegion/packages.config b/Intermediate/CollapseRegion/packages.config index db616e4f..b6e59baf 100644 --- a/Intermediate/CollapseRegion/packages.config +++ b/Intermediate/CollapseRegion/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Intermediate/CollapseRegion/pom.xml b/Intermediate/CollapseRegion/pom.xml index e780c07e..046cfe6a 100644 --- a/Intermediate/CollapseRegion/pom.xml +++ b/Intermediate/CollapseRegion/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example collapse-example jar - 6.1.0 + 6.2.0 CollapseExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/DocxImport/DocxImport.csproj b/Intermediate/DocxImport/DocxImport.csproj index bf1ce714..80d5cb50 100644 --- a/Intermediate/DocxImport/DocxImport.csproj +++ b/Intermediate/DocxImport/DocxImport.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/DocxImport/packages.config b/Intermediate/DocxImport/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/DocxImport/packages.config +++ b/Intermediate/DocxImport/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/DocxImport/pom.xml b/Intermediate/DocxImport/pom.xml index 972ed6e4..e0fb4515 100644 --- a/Intermediate/DocxImport/pom.xml +++ b/Intermediate/DocxImport/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example docx-import-example jar - 6.1.0 + 6.2.0 DocxImportExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/ExcelContextRules/ExcelContextRules.csproj b/Intermediate/ExcelContextRules/ExcelContextRules.csproj index 34297668..25c1428e 100644 --- a/Intermediate/ExcelContextRules/ExcelContextRules.csproj +++ b/Intermediate/ExcelContextRules/ExcelContextRules.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll diff --git a/Intermediate/ExcelContextRules/packages.config b/Intermediate/ExcelContextRules/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/ExcelContextRules/packages.config +++ b/Intermediate/ExcelContextRules/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/ExcelContextRules/pom.xml b/Intermediate/ExcelContextRules/pom.xml index 8ee6f6e9..73841af3 100644 --- a/Intermediate/ExcelContextRules/pom.xml +++ b/Intermediate/ExcelContextRules/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example excel-context-rules-example jar - 6.1.0 + 6.2.0 ExcelContextRulesExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/ExchangeRates (.NET)/ExchangeRates.csproj b/Intermediate/ExchangeRates (.NET)/ExchangeRates.csproj index 4b3f9bc8..d462d64c 100644 --- a/Intermediate/ExchangeRates (.NET)/ExchangeRates.csproj +++ b/Intermediate/ExchangeRates (.NET)/ExchangeRates.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/ExchangeRates (.NET)/packages.config b/Intermediate/ExchangeRates (.NET)/packages.config index 01f7c26a..16bbc33a 100644 --- a/Intermediate/ExchangeRates (.NET)/packages.config +++ b/Intermediate/ExchangeRates (.NET)/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Intermediate/FoodOrder (.NET)/FoodOrder.Web/FoodOrder.Web.csproj b/Intermediate/FoodOrder (.NET)/FoodOrder.Web/FoodOrder.Web.csproj index 1463f859..8fc067b6 100644 --- a/Intermediate/FoodOrder (.NET)/FoodOrder.Web/FoodOrder.Web.csproj +++ b/Intermediate/FoodOrder (.NET)/FoodOrder.Web/FoodOrder.Web.csproj @@ -49,7 +49,7 @@ - ..\..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/FoodOrder (.NET)/FoodOrder.Web/packages.config b/Intermediate/FoodOrder (.NET)/FoodOrder.Web/packages.config index 353a3949..1391c0e1 100644 --- a/Intermediate/FoodOrder (.NET)/FoodOrder.Web/packages.config +++ b/Intermediate/FoodOrder (.NET)/FoodOrder.Web/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/Formulas/Formulas.csproj b/Intermediate/Formulas/Formulas.csproj index f9e4e2c1..0d6b5ad2 100644 --- a/Intermediate/Formulas/Formulas.csproj +++ b/Intermediate/Formulas/Formulas.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/Formulas/packages.config b/Intermediate/Formulas/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/Formulas/packages.config +++ b/Intermediate/Formulas/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/Formulas/pom.xml b/Intermediate/Formulas/pom.xml index f3f48b8e..775b4027 100644 --- a/Intermediate/Formulas/pom.xml +++ b/Intermediate/Formulas/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example formula-example jar - 6.1.0 + 6.2.0 FormulaExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/HtmlToExcel/HtmlToExcel.csproj b/Intermediate/HtmlToExcel/HtmlToExcel.csproj index 96ad4748..4c3e4742 100644 --- a/Intermediate/HtmlToExcel/HtmlToExcel.csproj +++ b/Intermediate/HtmlToExcel/HtmlToExcel.csproj @@ -44,7 +44,7 @@ True - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/HtmlToExcel/packages.config b/Intermediate/HtmlToExcel/packages.config index 8cfca18d..eb1e57ae 100644 --- a/Intermediate/HtmlToExcel/packages.config +++ b/Intermediate/HtmlToExcel/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Intermediate/HtmlToExcel/pom.xml b/Intermediate/HtmlToExcel/pom.xml index 2bf402a9..6ed6cc3b 100644 --- a/Intermediate/HtmlToExcel/pom.xml +++ b/Intermediate/HtmlToExcel/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example html-excel-example jar - 6.1.0 + 6.2.0 HtmlExcelExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/HtmlToExcel/src/main/java/hr/ngs/templater/example/HtmlExcelExample.java b/Intermediate/HtmlToExcel/src/main/java/hr/ngs/templater/example/HtmlExcelExample.java index 29c6c5f0..9e07e9e3 100644 --- a/Intermediate/HtmlToExcel/src/main/java/hr/ngs/templater/example/HtmlExcelExample.java +++ b/Intermediate/HtmlToExcel/src/main/java/hr/ngs/templater/example/HtmlExcelExample.java @@ -24,7 +24,7 @@ public Number(int number) { } } - private static class HtmlToOoxml implements IDocumentFactoryBuilder.IFormatter { + private static class HtmlToOoxml implements IDocumentFactoryBuilder.Formatter { DocumentBuilder dBuilder; HtmlToOoxml(DocumentBuilder dBuilder) { diff --git a/Intermediate/HtmlToWord/HtmlToWord.csproj b/Intermediate/HtmlToWord/HtmlToWord.csproj index a228dc93..76fe3513 100644 --- a/Intermediate/HtmlToWord/HtmlToWord.csproj +++ b/Intermediate/HtmlToWord/HtmlToWord.csproj @@ -45,7 +45,7 @@ True - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/HtmlToWord/packages.config b/Intermediate/HtmlToWord/packages.config index 8cfca18d..eb1e57ae 100644 --- a/Intermediate/HtmlToWord/packages.config +++ b/Intermediate/HtmlToWord/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Intermediate/HtmlToWord/pom.xml b/Intermediate/HtmlToWord/pom.xml index 44122f1c..f233b9c7 100644 --- a/Intermediate/HtmlToWord/pom.xml +++ b/Intermediate/HtmlToWord/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example html-word-example jar - 6.1.0 + 6.2.0 HtmlWordExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/HtmlToWord/src/main/java/hr/ngs/templater/example/HtmlWordExample.java b/Intermediate/HtmlToWord/src/main/java/hr/ngs/templater/example/HtmlWordExample.java index 8073437f..30584a18 100644 --- a/Intermediate/HtmlToWord/src/main/java/hr/ngs/templater/example/HtmlWordExample.java +++ b/Intermediate/HtmlToWord/src/main/java/hr/ngs/templater/example/HtmlWordExample.java @@ -39,7 +39,7 @@ private static Element convert(String html, DocumentBuilder dBuilder) { } } - private static class SimpleHtmlConverter implements IDocumentFactoryBuilder.IFormatter { + private static class SimpleHtmlConverter implements IDocumentFactoryBuilder.Formatter { private final DocumentBuilder dBuilder; public SimpleHtmlConverter(DocumentBuilder dBuilder) { this.dBuilder = dBuilder; @@ -54,7 +54,7 @@ public Object format(Object value, String metadata) { } } - private static class ComplexHtmlConverter implements IDocumentFactoryBuilder.IFormatter { + private static class ComplexHtmlConverter implements IDocumentFactoryBuilder.Formatter { private final DocumentBuilder dBuilder; public ComplexHtmlConverter(DocumentBuilder dBuilder) { this.dBuilder = dBuilder; diff --git a/Intermediate/IsoCountries (.NET)/IsoCountries.csproj b/Intermediate/IsoCountries (.NET)/IsoCountries.csproj index 324282f0..17573a53 100644 --- a/Intermediate/IsoCountries (.NET)/IsoCountries.csproj +++ b/Intermediate/IsoCountries (.NET)/IsoCountries.csproj @@ -53,7 +53,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/IsoCountries (.NET)/packages.config b/Intermediate/IsoCountries (.NET)/packages.config index 0da39af8..8c363046 100644 --- a/Intermediate/IsoCountries (.NET)/packages.config +++ b/Intermediate/IsoCountries (.NET)/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/LimitPlugins/LimitPlugins.csproj b/Intermediate/LimitPlugins/LimitPlugins.csproj index e127adf0..33241233 100644 --- a/Intermediate/LimitPlugins/LimitPlugins.csproj +++ b/Intermediate/LimitPlugins/LimitPlugins.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/LimitPlugins/packages.config b/Intermediate/LimitPlugins/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/LimitPlugins/packages.config +++ b/Intermediate/LimitPlugins/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/LimitPlugins/pom.xml b/Intermediate/LimitPlugins/pom.xml index ddc6aee0..1e818948 100644 --- a/Intermediate/LimitPlugins/pom.xml +++ b/Intermediate/LimitPlugins/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example limits-example jar - 6.1.0 + 6.2.0 LimitsExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/LimitPlugins/src/Program.cs b/Intermediate/LimitPlugins/src/Program.cs index 4a3d1e74..19577346 100644 --- a/Intermediate/LimitPlugins/src/Program.cs +++ b/Intermediate/LimitPlugins/src/Program.cs @@ -110,7 +110,7 @@ public static void Main(string[] args) var factory = Configuration.Builder .Include(TopNElementsFormatting) .Include(TopNElementsProcessing) - .NavigateSeparator(':') + .NavigateSeparator(':', null) .Include(TopNElementNavigation) .Include(ListGroupping) .Build(); diff --git a/Intermediate/LimitPlugins/src/main/java/hr/ngs/templater/example/LimitsExample.java b/Intermediate/LimitPlugins/src/main/java/hr/ngs/templater/example/LimitsExample.java index d5e627c7..8f703385 100644 --- a/Intermediate/LimitPlugins/src/main/java/hr/ngs/templater/example/LimitsExample.java +++ b/Intermediate/LimitPlugins/src/main/java/hr/ngs/templater/example/LimitsExample.java @@ -8,7 +8,7 @@ public class LimitsExample { - static class TopNElementsFormatting implements IDocumentFactoryBuilder.IFormatter { + static class TopNElementsFormatting implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { @@ -20,7 +20,7 @@ public Object format(Object value, String metadata) { } } - static class TopNElementsProcessing implements IDocumentFactoryBuilder.IProcessor { + static class TopNElementsProcessing implements IDocumentFactoryBuilder.Processor { @Override public boolean tryProcess(String prefix, ITemplater templater, List list) { for (String t : templater.tags()) { @@ -42,7 +42,7 @@ public boolean tryProcess(String prefix, ITemplater templater, List list) { } } - static class TopNElementNavigation implements IDocumentFactoryBuilder.INavigate { + static class TopNElementNavigation implements IDocumentFactoryBuilder.Navigate { @Override public Object navigate(Object parent, Object value, String member, String metadata) { @@ -57,7 +57,7 @@ public Object navigate(Object parent, Object value, String member, String metada } } - static class ListGrouping implements IDocumentFactoryBuilder.INavigate { + static class ListGrouping implements IDocumentFactoryBuilder.Navigate { @Override public Object navigate(Object parent, Object value, String member, String metadata) { @@ -116,7 +116,7 @@ public static void main(final String[] args) throws Exception { Configuration.builder() .include(new TopNElementsFormatting()) .include(List.class, new TopNElementsProcessing()) - .navigateSeparator(':') + .navigateSeparator(':', null) .include(new TopNElementNavigation()) .include(new ListGrouping()) .build(); diff --git a/Intermediate/ListsAndTables/ListsAndTables.csproj b/Intermediate/ListsAndTables/ListsAndTables.csproj index 9b3f60a8..3be27f87 100644 --- a/Intermediate/ListsAndTables/ListsAndTables.csproj +++ b/Intermediate/ListsAndTables/ListsAndTables.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/ListsAndTables/packages.config b/Intermediate/ListsAndTables/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/ListsAndTables/packages.config +++ b/Intermediate/ListsAndTables/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/ListsAndTables/pom.xml b/Intermediate/ListsAndTables/pom.xml index 44716cb5..f28e4d52 100644 --- a/Intermediate/ListsAndTables/pom.xml +++ b/Intermediate/ListsAndTables/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example lists-tables-example jar - 6.1.0 + 6.2.0 ListsAndTablesExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/ListsAndTables/src/main/java/hr/ngs/templater/example/ListsTablesExample.java b/Intermediate/ListsAndTables/src/main/java/hr/ngs/templater/example/ListsTablesExample.java index c37a0f7b..8f52216a 100644 --- a/Intermediate/ListsAndTables/src/main/java/hr/ngs/templater/example/ListsTablesExample.java +++ b/Intermediate/ListsAndTables/src/main/java/hr/ngs/templater/example/ListsTablesExample.java @@ -55,7 +55,7 @@ public Coworker(String name, String title, String impression) { } } - static class LoadImage implements IDocumentFactoryBuilder.IFormatter { + static class LoadImage implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { diff --git a/Intermediate/MissingProperty/MissingProperty.csproj b/Intermediate/MissingProperty/MissingProperty.csproj index 00cea587..a161a929 100644 --- a/Intermediate/MissingProperty/MissingProperty.csproj +++ b/Intermediate/MissingProperty/MissingProperty.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/MissingProperty/packages.config b/Intermediate/MissingProperty/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/MissingProperty/packages.config +++ b/Intermediate/MissingProperty/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/MissingProperty/pom.xml b/Intermediate/MissingProperty/pom.xml index 238a6697..9baf7875 100644 --- a/Intermediate/MissingProperty/pom.xml +++ b/Intermediate/MissingProperty/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example missing-property-example jar - 6.1.0 + 6.2.0 MissingPropertyExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/Pictures/Pictures.csproj b/Intermediate/Pictures/Pictures.csproj index c3c79f83..136b48d1 100644 --- a/Intermediate/Pictures/Pictures.csproj +++ b/Intermediate/Pictures/Pictures.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll ..\..\packages\Svg.2.4.3\lib\Svg.dll diff --git a/Intermediate/Pictures/packages.config b/Intermediate/Pictures/packages.config index ec2230ef..f3e225ce 100644 --- a/Intermediate/Pictures/packages.config +++ b/Intermediate/Pictures/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Intermediate/Pictures/pom.xml b/Intermediate/Pictures/pom.xml index 9aa801cf..039e942c 100644 --- a/Intermediate/Pictures/pom.xml +++ b/Intermediate/Pictures/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example pictures-example jar - 6.1.0 + 6.2.0 PicturesExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/Pictures/src/main/java/hr/ngs/templater/example/PicturesExample.java b/Intermediate/Pictures/src/main/java/hr/ngs/templater/example/PicturesExample.java index fe72d786..78e6fded 100644 --- a/Intermediate/Pictures/src/main/java/hr/ngs/templater/example/PicturesExample.java +++ b/Intermediate/Pictures/src/main/java/hr/ngs/templater/example/PicturesExample.java @@ -61,7 +61,7 @@ static class Svg { } } - static class MaxSizeBufferedImage implements IDocumentFactoryBuilder.IFormatter { + static class MaxSizeBufferedImage implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { @@ -92,7 +92,7 @@ public Object format(Object value, String metadata) { } } - static class MaxSizeImageStream implements IDocumentFactoryBuilder.IFormatter { + static class MaxSizeImageStream implements IDocumentFactoryBuilder.Formatter { private float getPixelSizeMM(IIOMetadataNode dimension, String elementName) { NodeList pixelSizes = dimension.getElementsByTagName(elementName); @@ -144,7 +144,7 @@ public Object format(Object value, String metadata) { } } - static class ImageLoader implements IDocumentFactoryBuilder.IFormatter { + static class ImageLoader implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { @@ -209,7 +209,7 @@ private static Document svgDoc(SAXSVGDocumentFactory factory, String name) throw return factory.createDocument(SVGDOMImplementation.SVG_NAMESPACE_URI, Svg.class.getResourceAsStream(name)); } - static class ConvertQR implements IDocumentFactoryBuilder.IFormatter { + static class ConvertQR implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { diff --git a/Intermediate/QuestionnairePlugin/QuestionnairePlugin.csproj b/Intermediate/QuestionnairePlugin/QuestionnairePlugin.csproj index aa529236..10bbc01d 100644 --- a/Intermediate/QuestionnairePlugin/QuestionnairePlugin.csproj +++ b/Intermediate/QuestionnairePlugin/QuestionnairePlugin.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/QuestionnairePlugin/packages.config b/Intermediate/QuestionnairePlugin/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/QuestionnairePlugin/packages.config +++ b/Intermediate/QuestionnairePlugin/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/QuestionnairePlugin/pom.xml b/Intermediate/QuestionnairePlugin/pom.xml index 30f2bc6c..0092cc66 100644 --- a/Intermediate/QuestionnairePlugin/pom.xml +++ b/Intermediate/QuestionnairePlugin/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example questionnaire-example jar - 6.1.0 + 6.2.0 QuestionnaireExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/QuestionnairePlugin/src/main/java/hr/ngs/templater/example/QuestionnaireExample.java b/Intermediate/QuestionnairePlugin/src/main/java/hr/ngs/templater/example/QuestionnaireExample.java index 3e5febab..f7ccfb53 100644 --- a/Intermediate/QuestionnairePlugin/src/main/java/hr/ngs/templater/example/QuestionnaireExample.java +++ b/Intermediate/QuestionnairePlugin/src/main/java/hr/ngs/templater/example/QuestionnaireExample.java @@ -80,7 +80,7 @@ public Question(String text, List options, int selectedOption) { } } - static class FormatDate implements IDocumentFactoryBuilder.IFormatter { + static class FormatDate implements IDocumentFactoryBuilder.Formatter { private final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); @Override @@ -92,7 +92,7 @@ public Object format(Object value, String metadata) { } } - static class Letters implements IDocumentFactoryBuilder.IFormatter { + static class Letters implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String metadata) { @@ -107,7 +107,7 @@ public Object format(Object value, String metadata) { } } - static class QuestionnairePlugin implements IDocumentFactoryBuilder.IProcessor { + static class QuestionnairePlugin implements IDocumentFactoryBuilder.Processor { @Override public boolean tryProcess(String prefix, ITemplater templater, Questionnaire q) { String[] tags = templater.tags(); diff --git a/Intermediate/ResultSetExample (Java)/pom.xml b/Intermediate/ResultSetExample (Java)/pom.xml index 8b3215ac..117a1f2f 100644 --- a/Intermediate/ResultSetExample (Java)/pom.xml +++ b/Intermediate/ResultSetExample (Java)/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example resultset-example jar - 6.1.0 + 6.2.0 ResultSetExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/SharedCharts/SharedCharts.csproj b/Intermediate/SharedCharts/SharedCharts.csproj index d4553ef4..d805a6e1 100644 --- a/Intermediate/SharedCharts/SharedCharts.csproj +++ b/Intermediate/SharedCharts/SharedCharts.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/SharedCharts/packages.config b/Intermediate/SharedCharts/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/SharedCharts/packages.config +++ b/Intermediate/SharedCharts/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/SharedCharts/pom.xml b/Intermediate/SharedCharts/pom.xml index f3671490..a1174634 100644 --- a/Intermediate/SharedCharts/pom.xml +++ b/Intermediate/SharedCharts/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example shared-charts jar - 6.1.0 + 6.2.0 Labels https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/SharedCollection/SharedCollection.csproj b/Intermediate/SharedCollection/SharedCollection.csproj index 605224ef..5114d3dc 100644 --- a/Intermediate/SharedCollection/SharedCollection.csproj +++ b/Intermediate/SharedCollection/SharedCollection.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/SharedCollection/packages.config b/Intermediate/SharedCollection/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/SharedCollection/packages.config +++ b/Intermediate/SharedCollection/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/SharedCollection/pom.xml b/Intermediate/SharedCollection/pom.xml index 8898eb39..9452ca84 100644 --- a/Intermediate/SharedCollection/pom.xml +++ b/Intermediate/SharedCollection/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example shared-collection-example jar - 6.1.0 + 6.2.0 SharedCollectionExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/SharedCollection/src/main/java/hr/ngs/templater/example/SharedCollectionExample.java b/Intermediate/SharedCollection/src/main/java/hr/ngs/templater/example/SharedCollectionExample.java index af087840..78d8d7c2 100644 --- a/Intermediate/SharedCollection/src/main/java/hr/ngs/templater/example/SharedCollectionExample.java +++ b/Intermediate/SharedCollection/src/main/java/hr/ngs/templater/example/SharedCollectionExample.java @@ -54,7 +54,7 @@ static class Medicine { } } - static class ImageWithDPI implements IDocumentFactoryBuilder.IFormatter { + static class ImageWithDPI implements IDocumentFactoryBuilder.Formatter { @Override public Object format(Object value, String md) { diff --git a/Intermediate/TemplaterJson/TemplaterJson.csproj b/Intermediate/TemplaterJson/TemplaterJson.csproj index 1178c3c3..c53ac630 100644 --- a/Intermediate/TemplaterJson/TemplaterJson.csproj +++ b/Intermediate/TemplaterJson/TemplaterJson.csproj @@ -36,7 +36,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll ..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll diff --git a/Intermediate/TemplaterJson/TemplaterJsonDotNetCore.csproj b/Intermediate/TemplaterJson/TemplaterJsonDotNetCore.csproj index 0edcefb3..8a0e78d0 100644 --- a/Intermediate/TemplaterJson/TemplaterJsonDotNetCore.csproj +++ b/Intermediate/TemplaterJson/TemplaterJsonDotNetCore.csproj @@ -17,7 +17,7 @@ - + diff --git a/Intermediate/TemplaterJson/packages.config b/Intermediate/TemplaterJson/packages.config index 74c908bb..84c591d7 100644 --- a/Intermediate/TemplaterJson/packages.config +++ b/Intermediate/TemplaterJson/packages.config @@ -1,5 +1,5 @@  - + diff --git a/Intermediate/TemplaterJson/pom.xml b/Intermediate/TemplaterJson/pom.xml index e2e59908..e1ee02cb 100644 --- a/Intermediate/TemplaterJson/pom.xml +++ b/Intermediate/TemplaterJson/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater templater-json jar - 6.1.0 + 6.2.0 TemplaterJson https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/WordTables/WordTables.csproj b/Intermediate/WordTables/WordTables.csproj index ebfad1a0..d6b907d4 100644 --- a/Intermediate/WordTables/WordTables.csproj +++ b/Intermediate/WordTables/WordTables.csproj @@ -37,7 +37,7 @@ - ..\..\packages\Templater.6.1.0\lib\Net40\NGS.Templater.dll + ..\..\packages\Templater.6.2.0\lib\Net40\NGS.Templater.dll True diff --git a/Intermediate/WordTables/packages.config b/Intermediate/WordTables/packages.config index c2d6a5a7..7d665602 100644 --- a/Intermediate/WordTables/packages.config +++ b/Intermediate/WordTables/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Intermediate/WordTables/pom.xml b/Intermediate/WordTables/pom.xml index d7be4ad1..dbcbe0e7 100644 --- a/Intermediate/WordTables/pom.xml +++ b/Intermediate/WordTables/pom.xml @@ -4,7 +4,7 @@ hr.ngs.templater.example word-tables-example jar - 6.1.0 + 6.2.0 WordTablesExample https://github.com/ngs-doo/TemplaterExamples diff --git a/Intermediate/WordTables/src/Program.cs b/Intermediate/WordTables/src/Program.cs index 9fffa473..9f50dcf8 100644 --- a/Intermediate/WordTables/src/Program.cs +++ b/Intermediate/WordTables/src/Program.cs @@ -136,7 +136,7 @@ public static void Main(string[] args) Configuration.Builder .Include(Top10Rows) .Include(Limit10Table) - .NavigateSeparator(':') + .NavigateSeparator(':', null) .Include(LimitDataTable) .Include(CollapseNonEmpty) .Build(); diff --git a/Intermediate/WordTables/src/main/java/hr/ngs/templater/example/WordTablesExample.java b/Intermediate/WordTables/src/main/java/hr/ngs/templater/example/WordTablesExample.java index 0a5fde4e..68cf7b85 100644 --- a/Intermediate/WordTables/src/main/java/hr/ngs/templater/example/WordTablesExample.java +++ b/Intermediate/WordTables/src/main/java/hr/ngs/templater/example/WordTablesExample.java @@ -85,7 +85,7 @@ public static void main(final String[] args) throws Exception { .include(new Top10Rows()) .include(ResultSet.class, new Limit10Table()) //without specifying separator, navigation feature will not be available - .navigateSeparator(':') + .navigateSeparator(':', null) .include(new LimitResultSet()) .include(new CollapseNonEmpty()) .build().open(templateStream, "docx", fos); @@ -95,7 +95,7 @@ public static void main(final String[] args) throws Exception { Desktop.getDesktop().open(tmp); } - static class Top10Rows implements IDocumentFactoryBuilder.IFormatter { + static class Top10Rows implements IDocumentFactoryBuilder.Formatter { public Object format(Object argument, String metadata) { //if we find exact metadata and type invoke the plugin if ("top10".equals(metadata) && argument instanceof ResultSet) { @@ -124,7 +124,7 @@ public Object format(Object argument, String metadata) { } } - static class LimitResultSet implements IDocumentFactoryBuilder.INavigate { + static class LimitResultSet implements IDocumentFactoryBuilder.Navigate { @Override public Object navigate(Object parent, Object value, String member, String metadata) { //check if plugin is applicable @@ -155,7 +155,7 @@ public Object navigate(Object parent, Object value, String member, String metada } } - static class Limit10Table implements IDocumentFactoryBuilder.IProcessor { + static class Limit10Table implements IDocumentFactoryBuilder.Processor { @Override public boolean tryProcess(String prefix, ITemplater templater, ResultSet resultSet) { try { @@ -195,7 +195,7 @@ public boolean tryProcess(String prefix, ITemplater templater, ResultSet resultS } } - static class CollapseNonEmpty implements IDocumentFactoryBuilder.IHandler { + static class CollapseNonEmpty implements IDocumentFactoryBuilder.Handler { @Override public Handled handle(Object value, String metadata, String tag, int position, ITemplater templater) { if (value instanceof ResultSet && ("collapseNonEmpty".equals(metadata) || "collapseEmpty".equals(metadata))) { diff --git a/README.md b/README.md index 6ec74d05..15d50f50 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ Examples: * [custom reflection processing](Intermediate/AlternativeProperty) * [overriding bultin plugins](Intermediate/BoolOverride) * [custom type processing](Intermediate/QuestionnairePlugin) + * [runtime filtering](Advanced/DepartmentReport) ## FAQ diff --git a/pom.xml b/pom.xml index 7dfbe694..d8e6e65b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ hr.ngs.templater.examples templater-examples - 6.1.0 + 6.2.0 pom https://github.com/ngs-doo/TemplaterExamples