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/09/06 15:42:17 UTC
[2/3] incubator-freemarker git commit: (JavaDoc errors)
(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 <dd...@apache.org>
Authored: Wed Sep 6 14:38:42 2017 +0200
Committer: ddekany <dd...@apache.org>
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
* <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.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.</li>
*
* <li><strong>{@value #INIT_PARAM_CLASSPATH_TLDS}</strong> (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.</li>
@@ -556,7 +557,7 @@ public class FreemarkerServlet extends HttpServlet {
// Process all other init-params:
for (Enumeration<String> 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;