freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/6] incubator-freemarker git commit: (JavaDoc improvement)
Date Wed, 28 Feb 2018 19:51:04 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 0aab5d3ba -> 49ab712c9


(JavaDoc improvement)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/16ad98c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/16ad98c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/16ad98c1

Branch: refs/heads/2.3
Commit: 16ad98c1ed7db20f55582afe9f800104e6fdbb79
Parents: 5065cfe
Author: ddekany <ddekany@apache.org>
Authored: Wed Feb 28 09:49:00 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Feb 28 09:49:00 2018 +0100

----------------------------------------------------------------------
 src/main/java/freemarker/core/Environment.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/16ad98c1/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index 310ae9d..47b390a 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -2595,9 +2595,12 @@ public final class Environment extends Configurable {
      *
      * @param loadedTemplate
      *            The template to import. Note that it does <em>not</em> need
to be a template returned by
-     *            {@link #getTemplateForImporting(String name)}.
+     *            {@link #getTemplateForImporting(String name)}. Not {@code null}.
      * @param targetNsVarName
-     *            The name of the FTL variable that will store the namespace.
+     *            The name of the FTL variable that will store the namespace. If {@code null},
the namespace
+     *            won't be stored in a variable (but it's still returned).
+     *            
+     * @return The namespace of the imported template, already initialized. 
      *            
      * @see #getTemplateForImporting(String name)
      * @see #importLib(Template includedTemplate, String namespaceVarName)


Mime
View raw message