[freemarker-generator] branch FREEMARKER-188 updated: FREEMARKER-188 Cleanup code

[sgoeschl]

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

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


The following commit(s) were added to refs/heads/FREEMARKER-188 by this push:
     new e76be41  FREEMARKER-188 Cleanup code
e76be41 is described below

commit e76be41b60c838e3e4dba8d3aabbfb6acd28329b
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Sat Sep 11 08:48:09 2021 +0200

    FREEMARKER-188 Cleanup code
---
 .../freemarker/generator/base/datasource/DataSourcesSupplier.java     | 2 +-
 .../src/main/java/org/apache/freemarker/generator/cli/Main.java       | 4 ++--
 .../java/org/apache/freemarker/generator/cli/config/Settings.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
index 8fc2e01..72d09b6 100644
--- 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
+++ 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourcesSupplier.java
@@ -169,7 +169,7 @@ public class DataSourcesSupplier implements 
Supplier<List<DataSource>> {
         if (namedUri.hasName()) {
             return namedUri.getName();
         } else {
-            return UriUtils.toStringWithoutFragment(file.toURI());
+            return file.getAbsolutePath();
         }
     }
 }
diff --git 
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
 
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
index c275406..363aa5a 100644
--- 
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
+++ 
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
@@ -147,7 +147,7 @@ public class Main implements Callable<Integer> {
 
     private Integer onCall() {
         final String currentConfigFile = isNotEmpty(configFile) ? configFile : 
getDefaultConfigFileName();
-        final Properties configuration = 
loadFreeMarkerCliConfiguration(currentConfigFile);
+        final Properties configuration = 
loadFreeMarkerGeneratorConfiguration(currentConfigFile);
         final List<File> templateDirectories = 
getTemplateDirectories(templateDir);
         final Settings settings = settings(configuration, templateDirectories, 
outputGeneratorDefinitions);
 
@@ -229,7 +229,7 @@ public class Main implements Callable<Integer> {
         return isNotEmpty(appHome) ? new File(appHome, 
Configuration.CONFIG_FILE_NAME).getAbsolutePath() : null;
     }
 
-    private static Properties loadFreeMarkerCliConfiguration(String fileName) {
+    private static Properties loadFreeMarkerGeneratorConfiguration(String 
fileName) {
         if (isEmpty(fileName)) {
             return new Properties();
         }
diff --git 
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
 
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
index ae530f1..93daa71 100644
--- 
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
+++ 
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
@@ -85,10 +85,10 @@ public class Settings {
     /** Read from stdin? */
     private final boolean isReadFromStdin;
 
-    /** User-supplied parameters */
+    /** User-supplied parameters available for template processing */
     private final Map<String, Object> userParameters;
 
-    /** User-supplied system properties */
+    /** User-supplied properties to be copied to global system properties */
     private final Properties userSystemProperties;
 
     /** Caller-supplied writer */