freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [04/19] incubator-freemarker git commit: (Minor JavaDoc fixes)
Date Fri, 25 Aug 2017 23:39:30 GMT
(Minor JavaDoc fixes)


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

Branch: refs/heads/2.3
Commit: f1f8080b47b6736c0096fae177730c5d53ea8925
Parents: 0359d26
Author: ddekany <ddekany@apache.org>
Authored: Tue Aug 8 00:23:30 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Tue Aug 8 00:23:30 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/ext/beans/BeansWrapper.java          | 2 +-
 src/main/java/freemarker/template/TemplateModelException.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f1f8080b/src/main/java/freemarker/ext/beans/BeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/BeansWrapper.java b/src/main/java/freemarker/ext/beans/BeansWrapper.java
index 1a10bf0..f108ad6 100644
--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
+++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
@@ -898,7 +898,7 @@ public class BeansWrapper implements RichObjectWrapper, WriteProtectable
{
      * Wraps a Java method so that it can be called from templates, without wrapping its
parent ("this") object. The
      * result is almost the same as that you would get by wrapping the parent object then
getting the method from the
      * resulting {@link TemplateHashModel} by name. Except, if the wrapped method is overloaded,
with this method you
-     * explicitly select a an overload, while otherwise you would get a {@link TemplateMethodModelEx}
that selects an
+     * explicitly select an overload, while otherwise you would get a {@link TemplateMethodModelEx}
that selects an
      * overload each time it's called based on the argument values.
      * 
      * @param object The object whose method will be called, or {@code null} if {@code method}
is a static method.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f1f8080b/src/main/java/freemarker/template/TemplateModelException.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/TemplateModelException.java b/src/main/java/freemarker/template/TemplateModelException.java
index cdf3825..1ab47b4 100644
--- a/src/main/java/freemarker/template/TemplateModelException.java
+++ b/src/main/java/freemarker/template/TemplateModelException.java
@@ -23,7 +23,8 @@ import freemarker.core.Environment;
 import freemarker.core._ErrorDescriptionBuilder;
 
 /**
- * {@link TemplateModel} methods throw this exception if the requested data can't be retrieved.
 
+ * {@link ObjectWrapper}-s may throw this when wrapping/unwrapping fails, or {@link TemplateModel}
methods throw this
+ * if the requested data can't be retrieved.
  */
 public class TemplateModelException extends TemplateException {
 


Mime
View raw message