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/27 18:09:43 UTC
[2/2] incubator-freemarker git commit: Fixed JavaDoc errors.
Fixed 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/830b9cdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/830b9cdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/830b9cdf
Branch: refs/heads/3
Commit: 830b9cdf9d0be048198ef283ae83646a58cb4483
Parents: ebe3285
Author: ddekany <dd...@apache.org>
Authored: Mon Mar 27 20:09:37 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Mon Mar 27 20:09:37 2017 +0200
----------------------------------------------------------------------
src/main/java/org/apache/freemarker/core/CustomStateKey.java | 2 +-
.../freemarker/core/valueformat/TemplateDateFormatFactory.java | 3 ++-
.../freemarker/core/valueformat/TemplateNumberFormatFactory.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/830b9cdf/src/main/java/org/apache/freemarker/core/CustomStateKey.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/CustomStateKey.java b/src/main/java/org/apache/freemarker/core/CustomStateKey.java
index fd6f4d5..fedf096 100644
--- a/src/main/java/org/apache/freemarker/core/CustomStateKey.java
+++ b/src/main/java/org/apache/freemarker/core/CustomStateKey.java
@@ -25,7 +25,7 @@ package org.apache.freemarker.core;
*
* <pre>
* static final CustomStateKey MY_STATE = new CustomStateKey() {
- * @Override
+ * @Override
* protected Object create() {
* return new ...;
* }
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/830b9cdf/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
index 07c2256..ca3b4bd 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.freemarker.core.CustomStateKey;
import org.apache.freemarker.core.MutableProcessingConfiguration;
import org.apache.freemarker.core.Configuration;
import org.apache.freemarker.core.Environment;
@@ -77,7 +78,7 @@ public abstract class TemplateDateFormatFactory extends TemplateValueFormatFacto
* says.
* @param env
* The runtime environment from which the formatting was called. This is mostly meant to be used for
- * {@link Environment#setCustomState(Object, Object)}/{@link Environment#getCustomState(Object)}.
+ * {@link Environment#getCustomState(CustomStateKey)}.
*
* @throws TemplateValueFormatException
* If any problem occurs while parsing/getting the format. Notable subclasses:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/830b9cdf/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
index 7e21cfe..a4cac22 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
@@ -20,6 +20,7 @@ package org.apache.freemarker.core.valueformat;
import java.util.Locale;
+import org.apache.freemarker.core.CustomStateKey;
import org.apache.freemarker.core.MutableProcessingConfiguration;
import org.apache.freemarker.core.Configuration;
import org.apache.freemarker.core.Environment;
@@ -54,7 +55,7 @@ public abstract class TemplateNumberFormatFactory extends TemplateValueFormatFac
* forever (i.e. locale changes in the {@link Environment} must not be followed).
* @param env
* The runtime environment from which the formatting was called. This is mostly meant to be used for
- * {@link Environment#setCustomState(Object, Object)}/{@link Environment#getCustomState(Object)}.
+ * {@link Environment#getCustomState(CustomStateKey)}.
*
* @throws TemplateValueFormatException
* if any problem occurs while parsing/getting the format. Notable subclasses: