Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6AAC0200CFD for ; Wed, 6 Sep 2017 17:42:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 693571609BA; Wed, 6 Sep 2017 15:42:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 61AFC1609C2 for ; Wed, 6 Sep 2017 17:42:22 +0200 (CEST) Received: (qmail 82090 invoked by uid 500); 6 Sep 2017 15:42:21 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 82065 invoked by uid 99); 6 Sep 2017 15:42:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2017 15:42:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 083E218AA0C for ; Wed, 6 Sep 2017 15:42:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id cj-tWwRVOWFl for ; Wed, 6 Sep 2017 15:42:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 4BA6E61260 for ; Wed, 6 Sep 2017 15:42:18 +0000 (UTC) Received: (qmail 82048 invoked by uid 99); 6 Sep 2017 15:42:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2017 15:42:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EAC82E053D; Wed, 6 Sep 2017 15:42:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Wed, 06 Sep 2017 15:42:17 -0000 Message-Id: <5d015cc3da114cdda08c2c26189b5a32@git.apache.org> In-Reply-To: <3bf77598f625428a9b11300d063595be@git.apache.org> References: <3bf77598f625428a9b11300d063595be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-freemarker git commit: (JavaDoc errors) archived-at: Wed, 06 Sep 2017 15:42:23 -0000 (JavaDoc 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/5c65373c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5c65373c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5c65373c Branch: refs/heads/3 Commit: 5c65373c225313615cf773a113967317389477e6 Parents: ec1501b Author: ddekany Authored: Wed Sep 6 14:38:42 2017 +0200 Committer: ddekany Committed: Wed Sep 6 14:48:22 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/freemarker/core/ASTElement.java | 5 +---- .../java/org/apache/freemarker/core/ParsingConfiguration.java | 1 + .../java/org/apache/freemarker/core/util/CallableUtils.java | 4 ++-- .../java/org/apache/freemarker/servlet/FreemarkerServlet.java | 7 ++++--- .../freemarker/spring/SpringResourceTemplateLoader.java | 1 - .../org/apache/freemarker/spring/web/view/FreeMarkerView.java | 2 +- .../freemarker/spring/web/view/FreeMarkerViewResolver.java | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-core/src/main/java/org/apache/freemarker/core/ASTElement.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTElement.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTElement.java index b67d54d..5bc68e0 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTElement.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTElement.java @@ -27,11 +27,8 @@ import org.apache.freemarker.core.util._ArrayEnumeration; /** * AST non-expression node superclass: Superclass of directive calls, interpolations, static text, top-level comments, - * or other such non-expression node in the parsed template. Some information that can be found here can be accessed - * through the {@link Environment#getCurrentDirectiveCallPlace()}, which is a published API, and thus promises backward - * compatibility. + * or other such non-expression node in the parsed template. */ -// TODO [FM3] Get rid of "public" and thus the "_" prefix abstract class ASTElement extends ASTNode { private static final int INITIAL_CHILD_BUFFER_CAPACITY = 6; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-core/src/main/java/org/apache/freemarker/core/ParsingConfiguration.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ParsingConfiguration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ParsingConfiguration.java index 5b6d619..96d00f9 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ParsingConfiguration.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ParsingConfiguration.java @@ -18,6 +18,7 @@ */ package org.apache.freemarker.core; +import java.io.Writer; import java.nio.charset.Charset; import org.apache.freemarker.core.arithmetic.ArithmeticEngine; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java b/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java index f305d3c..9bf96e2 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/util/CallableUtils.java @@ -41,8 +41,8 @@ import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateFunctionModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateNumberModel; -import org.apache.freemarker.core.model.TemplateStringModel; import org.apache.freemarker.core.model.TemplateSequenceModel; +import org.apache.freemarker.core.model.TemplateStringModel; /** * Utilities for implementing and calling {@link TemplateCallableModel}-s (such as {@link TemplateDirectiveModel}-s @@ -597,7 +597,7 @@ public final class CallableUtils { /** * See {@link #castArgumentValue(TemplateModel, int, Class, boolean, TemplateModel, TemplateCallableModel, * boolean)}; this does the same, but with {@link TemplateNumberModel} as {@code type} and with the restriction that - * the number must be convertable to {@code int} losselessly, and with {@link int} return value. + * the number must be convertable to {@code int} losselessly, and with {@code int} return value. */ public static int castArgumentValueToInt( TemplateModel argValue, int argIdx, boolean optional, int defaultValue, TemplateCallableModel callable, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/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 1e484fc..9faa83c 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 @@ -64,6 +64,7 @@ import org.apache.freemarker.core.util._CollectionUtils; import org.apache.freemarker.core.util._SecurityUtils; import org.apache.freemarker.core.util._StringUtils; import org.apache.freemarker.servlet.jsp.TaglibFactory; +import org.apache.freemarker.servlet.jsp.TaglibFactory.Builder; import org.apache.freemarker.servlet.jsp.TaglibFactory.ClasspathMetaInfTldSource; import org.apache.freemarker.servlet.jsp.TaglibFactory.MetaInfTldSource; import org.slf4j.Logger; @@ -241,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 * classpath:.*myoverride.*\.jar$, webInfPerLibJars, classpath:.*taglib.*\.jar$}, or {@code * classpath}. (Whitespace around the commas and list items will be ignored.) See - * {@link TaglibFactory.Builder#setMetaInfTldSources(List)} for more information. Defaults to a list that contains + * {@link 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 @@ -253,7 +254,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; * Jetty's {@code "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"} servlet context attribute. * *
  • {@value #INIT_PARAM_CLASSPATH_TLDS} (since 2.3.22): Comma separated list of paths; see - * {@link TaglibFactory.Builder#setClasspathTlds(List)}. Whitespace around the list items will be ignored. Defaults to + * {@link 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.
    • @@ -556,7 +557,7 @@ public class FreemarkerServlet extends HttpServlet { // Process all other init-params: for (Enumeration initPNames = getServletConfig().getInitParameterNames(); initPNames.hasMoreElements();) { - final String name = (String) initPNames.nextElement(); + final String name = initPNames.nextElement(); final String value = getInitParameter(name); if (name == null) { throw new MalformedWebXmlException( http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-spring/src/main/java/org/apache/freemarker/spring/SpringResourceTemplateLoader.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/SpringResourceTemplateLoader.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/SpringResourceTemplateLoader.java index 2607e57..bf430b7 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/SpringResourceTemplateLoader.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/SpringResourceTemplateLoader.java @@ -55,7 +55,6 @@ public class SpringResourceTemplateLoader implements TemplateLoader, ResourceLoa /** * Base resource location which can be prepended to the template name internally when resolving a resource. - * @return */ public String getBaseLocation() { return baseLocation; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java index e827db5..4f286a1 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java @@ -43,7 +43,7 @@ public class FreeMarkerView extends AbstractFreeMarkerView { /** * Internal servlet instance to provide a page object in JSP tag library usages. - * @see {@link javax.servlet.jsp.PageContext#getPage()} + * @see javax.servlet.jsp.PageContext#getPage() */ private GenericServlet pageContextServlet; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/5c65373c/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerViewResolver.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerViewResolver.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerViewResolver.java index 101f5be..3a5a554 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerViewResolver.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerViewResolver.java @@ -56,7 +56,7 @@ public class FreeMarkerViewResolver extends AbstractTemplateViewResolver impleme /** * Internal servlet instance to provide a page object in JSP tag library usages. - * @see {@link javax.servlet.jsp.PageContext#getPage()} + * @see javax.servlet.jsp.PageContext#getPage() */ private GenericServlet pageContextServlet;