You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/07/01 05:55:37 UTC
[freemarker-generator] branch FREEMARKER-149 updated:
FREEMARKER-149 Support multiple template transformation on the command line
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-149
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-149 by this push:
new a0d5535 FREEMARKER-149 Support multiple template transformation on the command line
a0d5535 is described below
commit a0d5535a08a58610117c09b5dea34037a5963ad0
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Wed Jul 1 07:53:06 2020 +0200
FREEMARKER-149 Support multiple template transformation on the command line
---
.../apache/freemarker/generator/base/datasource/DataSources.java | 2 +-
.../freemarker/generator/base/file/RecursiveFileSupplier.java | 6 +++---
.../java/org/apache/freemarker/generator/base/uri/NamedUri.java | 2 +-
freemarker-generator-cli/CHANGELOG.md | 2 +-
.../src/site/markdown/cli/advanced/cli-configuration.md | 2 +-
.../java/org/apache/freemarker/generator/tools/excel/ExcelTool.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
index 9db5552..62838a1 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
@@ -124,7 +124,7 @@ public class DataSources implements Closeable {
* Find data sources based on their group and and globbing pattern.
*
* @param wildcard the wildcard string to match against
- * @return list of mathching data sources
+ * @return list of matching data sources
*/
public List<DataSource> findByGroup(String wildcard) {
return dataSources.stream()
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
index ef60fe7..d532df8 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
@@ -53,7 +53,7 @@ public class RecursiveFileSupplier implements Supplier<List<File>> {
/** File filter to apply */
private final IOFileFilter fileFilter;
- /** Diectory filter to apply */
+ /** Directory filter to apply */
private final IOFileFilter directoryFilter;
public RecursiveFileSupplier(Collection<String> sources, Collection<String> includes, Collection<String> excludes) {
@@ -119,10 +119,10 @@ public class RecursiveFileSupplier implements Supplier<List<File>> {
return emptyList();
}
- return excludes.stream().map(RecursiveFileSupplier::exludeFilter).collect(toList());
+ return excludes.stream().map(RecursiveFileSupplier::excludeFilter).collect(toList());
}
- private static IOFileFilter exludeFilter(String exclude) {
+ private static IOFileFilter excludeFilter(String exclude) {
return isEmpty(exclude) ?
VISIBLE :
new NotFileFilter(new OrFileFilter(new WildcardFileFilter(exclude), HIDDEN));
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
index 45fb595..1b1c63e 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
@@ -25,7 +25,7 @@ import static org.apache.freemarker.generator.base.util.StringUtils.emptyToNull;
import static org.apache.freemarker.generator.base.util.StringUtils.isEmpty;
/**
- * Caputeres the information of a user-supplied "named URI".
+ * Captures the information of a user-supplied "named URI".
*/
public class NamedUri {
diff --git a/freemarker-generator-cli/CHANGELOG.md b/freemarker-generator-cli/CHANGELOG.md
index c73e622..70d43a1 100644
--- a/freemarker-generator-cli/CHANGELOG.md
+++ b/freemarker-generator-cli/CHANGELOG.md
@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file. We try to a
* [FREEMARKER-136] Fix broken `site:stage` build
* [FREEMARKER-134] Rename `Document` to `Datasource` which also changes `--document` to `--datasource`
* [FREEMARKER-129] Use `freemarker.configuration.setting` in `freemarker-cli.properties` to configure FreeMarker
-* [FREEMARKER-129] Provide a `toString()` metheod for all tools
+* [FREEMARKER-129] Provide a `toString()` method for all tools
* [FREEMARKER-129] Use version "0.X.Y" to cater for API changes according to [Semantic Versioning](https://semver.org)
### Fixed
diff --git a/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md b/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
index cde2cd1..0c3e842 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
@@ -40,7 +40,7 @@ Changing this file allows to tweak the underlying `Apache FreeMarker Configurati
### Storing User-Specific Templates
-Over the time you will accumalate more and more `Apache FreeMarker` templates - some of them are stored within a project but some of the more general might be free-floating and you don't want to store them in the installation directory.
+Over the time you will accumulate more and more `Apache FreeMarker` templates - some of them are stored within a project but some of the more general might be free-floating and you don't want to store them in the installation directory.
To give those free-floating templates a home `Apache FreeMarker CLI` tries to read templates from `~/freemarker-cli`, e.g.
diff --git a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/excel/ExcelTool.java b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/excel/ExcelTool.java
index d9bb473..406a927 100644
--- a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/excel/ExcelTool.java
+++ b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/excel/ExcelTool.java
@@ -154,7 +154,7 @@ public class ExcelTool {
* See https://stackoverflow.com/questions/15710888/reading-time-values-from-spreadsheet-using-poi-api.
*
* @param cell Cell containing some sort of date or time
- * @return The corresponding Java istance
+ * @return The corresponding Java instance
*/
private static synchronized Object toDateCellValue(Cell cell) {
final Date date = cell.getDateCellValue();