You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/18 15:41:19 UTC
[2/2] incubator-freemarker git commit: Fixed JavaDoc refs
Fixed JavaDoc refs
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/10b768d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/10b768d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/10b768d4
Branch: refs/heads/3
Commit: 10b768d48aeaa0c7f59db77fdd27e7067fd07a37
Parents: e7a5e41
Author: ddekany <dd...@apache.org>
Authored: Sat Mar 18 16:41:14 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Mar 18 16:41:14 2017 +0100
----------------------------------------------------------------------
.../model/impl/MethodAppearanceFineTuner.java | 2 +-
.../freemarker/core/model/impl/SimpleHash.java | 16 +++++++---------
.../core/model/impl/SimpleSequence.java | 19 +++++++------------
3 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/10b768d4/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java b/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java
index 0ebd970..c60599d 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
/**
* Used for customizing how the methods are visible from templates, via
- * {@link DefaultObjectWrapper#setMethodAppearanceFineTuner(MethodAppearanceFineTuner)}.
+ * {@link DefaultObjectWrapper.ExtendableBuilder#setMethodAppearanceFineTuner(MethodAppearanceFineTuner)}.
* The object that implements this should also implement {@link SingletonCustomizer} whenever possible.
*
* @since 2.3.21
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/10b768d4/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
index ef475ca..a4df46f 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java
@@ -65,15 +65,13 @@ import org.apache.freemarker.core.model.WrappingTemplateModel;
* to which it had to be passed adapted to a {@link Map}).
*
* <p>
- * If regardless of which of the above two cases stand, you just need to (or more convenient to) invoke the hash from a
- * {@link Map} (via {@link SimpleHash#SimpleHash(Map, ObjectWrapper)} or
- * {@link SimpleHash#SimpleHash(Map, ObjectWrapper)}), which will be the faster depends on how many times will the
- * <em>same</em> {@link Map} entry be read from the template(s) later, on average. If, on average, you read each entry
- * for more than 4 times, {@link SimpleHash} will be most certainly faster, but if for 2 times or less (and especially
- * if not at all) then {@link DefaultMapAdapter} will be. Before choosing based on performance though, pay attention to
- * the behavioral differences; {@link SimpleHash} will shallow-copy the original {@link Map} at construction time, so
- * key order will be lost in some cases, and it won't reflect {@link Map} content changes after the {@link SimpleHash}
- * construction, also {@link SimpleHash} can't be unwrapped to the original {@link Map} instance.
+ * It also matters if for how many times will the <em>same</em> {@link Map} entry be read from the template(s) later, on
+ * average. If, on average, you read each entry for more than 4 times, {@link SimpleHash} will be most certainly faster,
+ * but if for 2 times or less (and especially if not at all) then {@link DefaultMapAdapter} will be. Before choosing
+ * based on performance though, pay attention to the behavioral differences; {@link SimpleHash} will shallow-copy
+ * the original {@link Map} at construction time, so key order will be lost in some cases, and it won't reflect
+ * {@link Map} content changes after the {@link SimpleHash} construction, also {@link SimpleHash} can't be unwrapped
+ * to the original {@link Map} instance.
*
* @see DefaultMapAdapter
* @see TemplateHashModelEx
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/10b768d4/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java
index 8811180..907acb2 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java
@@ -25,11 +25,8 @@ import java.util.Collection;
import java.util.List;
import org.apache.freemarker.core.model.ObjectWrapper;
-import org.apache.freemarker.core.model.RichObjectWrapper;
-import org.apache.freemarker.core.model.TemplateCollectionModel;
import org.apache.freemarker.core.model.TemplateModel;
import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateModelIterator;
import org.apache.freemarker.core.model.TemplateSequenceModel;
import org.apache.freemarker.core.model.WrappingTemplateModel;
@@ -59,15 +56,13 @@ import org.apache.freemarker.core.model.WrappingTemplateModel;
* from a plain Java method to which it had to be passed adapted to a {@link List}).
*
* <p>
- * If regardless of which of the above two cases stand, you just need to (or more convenient to) invoke the sequence
- * from a {@link List} (via {@link DefaultListAdapter#adapt(List, RichObjectWrapper)} or
- * {@link SimpleSequence#SimpleSequence(Collection)}), which will be the faster depends on how many times will the
- * <em>same</em> {@link List} entry be read from the template(s) later, on average. If, on average, you read each entry
- * for more than 4 times, {@link SimpleSequence} will be most certainly faster, but if for 2 times or less (and
- * especially if not at all) then {@link DefaultMapAdapter} will be. Before choosing based on performance though, pay
- * attention to the behavioral differences; {@link SimpleSequence} will shallow-copy the original {@link List} at
- * construction time, so it won't reflect {@link List} content changes after the {@link SimpleSequence} construction,
- * also {@link SimpleSequence} can't be unwrapped to the original wrapped instance.
+ * It also matters if for how many times will the <em>same</em> {@link List} entry be read from the template(s) later,
+ * on average. If, on average, you read each entry for more than 4 times, {@link SimpleSequence} will be most
+ * certainly faster, but if for 2 times or less (and especially if not at all) then {@link DefaultMapAdapter} will
+ * be. Before choosing based on performance though, pay attention to the behavioral differences;
+ * {@link SimpleSequence} will shallow-copy the original {@link List} at construction time, so it won't reflect
+ * {@link List} content changes after the {@link SimpleSequence} construction, also {@link SimpleSequence} can't be
+ * unwrapped to the original wrapped instance.
*
* @see DefaultListAdapter
* @see DefaultArrayAdapter