(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/60401773 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/60401773 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/60401773 Branch: refs/heads/2.3 Commit: 6040177316429c4fbad37b2f696b82ec860dd2d0 Parents: c4e7774 Author: ddekany <ddek...@apache.org> Authored: Tue Mar 6 22:17:23 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Tue Mar 6 22:17:23 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/60401773/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 4e208ee..209464c 100644 --- a/src/main/java/freemarker/core/Environment.java +++ b/src/main/java/freemarker/core/Environment.java @@ -231,7 +231,8 @@ public final class Environment extends Configurable { /** * Returns the topmost {@link Template}, with other words, the one for which this {@link Environment} was created. - * That template will never change, like {@code #include} or macro calls don't change it. + * That template will never change, like {@code #include} or macro calls don't change it. This method never returns + * {@code null}. * * @see #getCurrentNamespace() * @@ -244,7 +245,9 @@ public final class Environment extends Configurable { /** * Returns the {@link Template} that we are "lexically" inside at the moment. This template will change when * entering an {@code #include} or calling a macro or function in another template, or returning to yet another - * template with {@code #nested}. + * template with {@code #nested}. When you are calling a directive that's implemented in Java or a Java method + * from a template, the current template will be the last current template, not {@code null}. This method never + * returns {@code null}. * * @see #getMainTemplate() * @see #getCurrentNamespace()
