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/07/06 08:19:05 UTC
[14/17] incubator-freemarker git commit: FREEMARKER-55: Fixed JavaDoc
build errors
FREEMARKER-55: Fixed JavaDoc build errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/cc6c469d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/cc6c469d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/cc6c469d
Branch: refs/heads/3
Commit: cc6c469db4b929921fb4603058a32dd8a29c2e37
Parents: bd09327
Author: ddekany <dd...@apache.org>
Authored: Thu Jul 6 10:07:26 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Jul 6 10:09:15 2017 +0200
----------------------------------------------------------------------
.../freemarker/servlet/FreemarkerServlet.java | 6 +++---
.../freemarker/servlet/jsp/TaglibFactory.java | 22 ++++++++------------
2 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cc6c469d/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java
index a3f4e75..bd3ffc9 100644
--- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java
+++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java
@@ -242,7 +242,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* optionally followed by colon and a regular expression, or {@value #META_INF_TLD_LOCATION_CLEAR}. For example {@code
* <param-value>classpath:.*myoverride.*\.jar$, webInfPerLibJars, classpath:.*taglib.*\.jar$</param-value>}, or {@code
* <param-value>classpath</param-value>}. (Whitespace around the commas and list items will be ignored.) See
- * {@link TaglibFactory#setMetaInfTldSources(List)} for more information. Defaults to a list that contains
+ * {@link TaglibFactory.Builder#setMetaInfTldSources(List)} for more information. Defaults to a list that contains
* {@value #META_INF_TLD_LOCATION_WEB_INF_PER_LIB_JARS} only (can be overridden with
* {@link #createDefaultMetaInfTldSources()}). Note that this can be also specified with the
* {@value #SYSTEM_PROPERTY_META_INF_TLD_SOURCES} system property. If both the init-param and the system property
@@ -254,8 +254,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* Jetty's {@code "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"} servlet context attribute.</li>
*
* <li><strong>{@value #INIT_PARAM_CLASSPATH_TLDS}</strong> (since 2.3.22): Comma separated list of paths; see
- * {@link TaglibFactory#setClasspathTlds(List)}. Whitespace around the list items will be ignored. Defaults to no paths
- * (can be overidden with {@link #createDefaultClassPathTlds()}). Note that this can also be specified with the
+ * {@link TaglibFactory.Builder#setClasspathTlds(List)}. Whitespace around the list items will be ignored. Defaults to
+ * no paths (can be overidden with {@link #createDefaultClassPathTlds()}). Note that this can also be specified with the
* {@value #SYSTEM_PROPERTY_CLASSPATH_TLDS} system property. If both the init-param and the system property exists, the
* items listed in system property will be added after those specified by the init-param.</li>
*
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cc6c469d/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java
index 7a45001..386b34e 100644
--- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java
+++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java
@@ -178,7 +178,7 @@ public class TaglibFactory implements TemplateHashModel {
* @param values TLD location string value list
* @return a list of type {@link MetaInfTldSource} by parsing each TLD location string item value
* @throws ParseException if invalid value syntax found
- * @see {@link #parseMetaInfTldLocation(String)}
+ * @see #parseMetaInfTldLocation(String)
*/
public static List<MetaInfTldSource> parseMetaInfTldLocations(List<String> values) throws ParseException {
List<MetaInfTldSource> metaInfTldSources = null;
@@ -206,13 +206,9 @@ public class TaglibFactory implements TemplateHashModel {
/**
* Creates a new JSP taglib factory that will be used to load JSP tag libraries and functions for the web
* application represented by the passed in {@link ServletContext}.
- * You should at least call {@link #setObjectWrapper(ObjectWrapper)} before start using this object.
- *
+ *
* <p>This object is only thread-safe after you have stopped calling its setter methods (and it was properly
* published to the other threads; see JSR 133 (Java Memory Model)).
- *
- * @param servletContext
- * The servlet context whose JSP tag libraries this factory will load.
*/
private TaglibFactory(Builder builder) {
servletContext = builder.getServletContext();
@@ -1120,7 +1116,7 @@ public class TaglibFactory implements TemplateHashModel {
/**
* A location within which we will look for {@code META-INF/**}{@code /*.tld}-s. Used in the parameter to
- * {@link #setMetaInfTldSources}. See concrete subclasses for more.
+ * {@link Builder#setMetaInfTldSources}. See concrete subclasses for more.
*/
public static abstract class MetaInfTldSource {
private MetaInfTldSource() { }
@@ -1171,12 +1167,12 @@ public class TaglibFactory implements TemplateHashModel {
}
/**
- * When it occurs in the {@link MetaInfTldSource} list, all {@link MetaInfTldSource}-s before it will be disabled.
- * This is useful when the list is assembled from multiple sources, and some want to re-start it, rather than append
- * to the end of it.
- *
+ * When it occurs in the {@link MetaInfTldSource} list ({@link #getMetaInfTldSources()}), all {@link
+ * MetaInfTldSource}-s before it will be disabled. This is useful when the list is assembled from multiple sources,
+ * and some wants to re-start it, rather than append to the end of it.
+ *
* @see FreemarkerServlet#SYSTEM_PROPERTY_META_INF_TLD_SOURCES
- * @see TaglibFactory#setMetaInfTldSources(List)
+ * @see Builder#setMetaInfTldSources(List)
*/
public static final class ClearMetaInfTldSource extends MetaInfTldSource {
public final static ClearMetaInfTldSource INSTANCE = new ClearMetaInfTldSource();
@@ -2046,7 +2042,7 @@ public class TaglibFactory implements TemplateHashModel {
private final ServletContext servletContext;
/**
- * ObjectWrapper to be used in model building.
+ * {@link ObjectWrapper} to be used in model building.
*/
private final ObjectWrapper objectWrapper;