http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateNotFoundException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateNotFoundException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateNotFoundException.java index 37ba911..2e27255 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateNotFoundException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/TemplateNotFoundException.java @@ -29,8 +29,7 @@ import org.apache.freemarker.core.templateresolver.MalformedTemplateNameExceptio * This extends {@link FileNotFoundException} for backward compatibility, but in fact has nothing to do with files, as * FreeMarker can load templates from many other sources. * - * @since 2.3.22 - * + * * @see MalformedTemplateNameException * @see Configuration#getTemplate(String) */
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/TokenMgrError.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/TokenMgrError.java b/freemarker-core/src/main/java/org/apache/freemarker/core/TokenMgrError.java index 4587358..7096379 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/TokenMgrError.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/TokenMgrError.java @@ -159,7 +159,6 @@ public String getMessage() { } /** - * @since 2.3.21 */ public TokenMgrError(String detail, int reason, int errorLine, int errorColumn, @@ -176,8 +175,6 @@ public String getMessage() { /** * Overload for JavaCC 6 compatibility. - * - * @since 2.3.24 */ TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) { this(EOFSeen, lexState, errorLine, errorColumn, errorAfter, (char) curChar, reason); @@ -195,8 +192,6 @@ public String getMessage() { /** * 1-based line number of the unexpected character(s). - * - * @since 2.3.20 */ public Integer getLineNumber() { return lineNumber; @@ -204,8 +199,6 @@ public String getMessage() { /** * 1-based column number of the unexpected character(s). - * - * @since 2.3.20 */ public Integer getColumnNumber() { return columnNumber; @@ -215,8 +208,6 @@ public String getMessage() { * Returns the 1-based line at which the last character of the wrong section is. This will be usually (but not * always) the same as {@link #getLineNumber()} because the lexer can only point to the single character that * doesn't match any patterns. - * - * @since 2.3.21 */ public Integer getEndLineNumber() { return endLineNumber; @@ -226,8 +217,6 @@ public String getMessage() { * Returns the 1-based column at which the last character of the wrong section is. This will be usually (but not * always) the same as {@link #getColumnNumber()} because the lexer can only point to the single character that * doesn't match any patterns. - * - * @since 2.3.21 */ public Integer getEndColumnNumber() { return endColumnNumber; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/UnexpectedTypeException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/UnexpectedTypeException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/UnexpectedTypeException.java index 0f9a013..939d8d2 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/UnexpectedTypeException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/UnexpectedTypeException.java @@ -23,8 +23,6 @@ import org.apache.freemarker.core.model.TemplateModel; /** * The type of a value differs from what was expected. - * - * @since 2.3.20 */ public class UnexpectedTypeException extends TemplateException { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/Version.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Version.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Version.java index 273f9f7..3a542d1 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Version.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Version.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * to parse the version strings of 3rd party libraries. * * @see Configuration#getVersion() - * - * @since 2.3.20 */ public final class Version implements Serializable { @@ -130,8 +128,6 @@ public final class Version implements Serializable { /** * Creates an object based on the {@code int} value that uses the same kind of encoding as {@link #intValue()}. - * - * @since 2.3.24 */ public Version(int intValue) { this.intValue = intValue; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/WrongTemplateCharsetException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/WrongTemplateCharsetException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/WrongTemplateCharsetException.java index 799efb4..f8d323e 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/WrongTemplateCharsetException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/WrongTemplateCharsetException.java @@ -32,7 +32,6 @@ public class WrongTemplateCharsetException extends ParseException { private final Charset constructorSpecifiedEncoding; /** - * @since 2.3.22 */ public WrongTemplateCharsetException(Charset templateSpecifiedEncoding, Charset constructorSpecifiedEncoding) { this.templateSpecifiedEncoding = templateSpecifiedEncoding; @@ -47,14 +46,12 @@ public class WrongTemplateCharsetException extends ParseException { } /** - * @since 2.3.22 */ public Charset getTemplateSpecifiedEncoding() { return templateSpecifiedEncoding; } /** - * @since 2.3.22 */ public Charset getConstructorSpecifiedEncoding() { return constructorSpecifiedEncoding; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperAndUnwrapper.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperAndUnwrapper.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperAndUnwrapper.java index 3494eb7..1161cca 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperAndUnwrapper.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperAndUnwrapper.java @@ -31,8 +31,6 @@ package org.apache.freemarker.core.model; * <p> * <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it * shouldn't be implemented outside FreeMarker yet. - * - * @since 2.3.22 */ public interface ObjectWrapperAndUnwrapper extends ObjectWrapper { @@ -41,8 +39,6 @@ public interface ObjectWrapperAndUnwrapper extends ObjectWrapper { * desired class, nor it can be {@code null}. * * @see #tryUnwrapTo(TemplateModel, Class) - * - * @since 2.3.22 */ Object CANT_UNWRAP_TO_TARGET_CLASS = new Object(); @@ -57,8 +53,6 @@ public interface ObjectWrapperAndUnwrapper extends ObjectWrapper { * If the unwrapping fails from any reason. * * @see #tryUnwrapTo(TemplateModel, Class) - * - * @since 2.3.22 */ Object unwrap(TemplateModel tm) throws TemplateModelException; @@ -82,8 +76,6 @@ public interface ObjectWrapperAndUnwrapper extends ObjectWrapper { * {@link #CANT_UNWRAP_TO_TARGET_CLASS} return value. * * @see #unwrap(TemplateModel) - * - * @since 2.3.22 */ Object tryUnwrapTo(TemplateModel tm, Class<?> targetClass) throws TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java index 102a2f0..22b1f63 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ObjectWrapperWithAPISupport.java @@ -26,8 +26,6 @@ package org.apache.freemarker.core.model; * <p> * <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it * shouldn't be implemented outside FreeMarker yet. - * - * @since 2.3.22 */ public interface ObjectWrapperWithAPISupport extends ObjectWrapper { @@ -38,8 +36,6 @@ public interface ObjectWrapperWithAPISupport extends ObjectWrapper { * The object for which the API model has to be returned. Shouldn't be {@code null}. * * @return The {@link TemplateModel} through which the API of the object can be accessed. Can't be {@code null}. - * - * @since 2.3.22 */ TemplateHashModel wrapAsAPI(Object obj) throws TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java index 5dfa3be..59a5e46 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/RichObjectWrapper.java @@ -26,8 +26,6 @@ package org.apache.freemarker.core.model; * <p> * <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it * shouldn't be implemented outside FreeMarker yet. - * - * @since 2.3.22 */ public interface RichObjectWrapper extends ObjectWrapperAndUnwrapper, ObjectWrapperWithAPISupport { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCollectionModelEx.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCollectionModelEx.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCollectionModelEx.java index 92f0e3a..2da95c1 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCollectionModelEx.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCollectionModelEx.java @@ -25,8 +25,6 @@ import java.util.Collection; * "extended collection" template language data type: Adds size/emptiness querybility and "contains" test to * {@link TemplateCollectionModel}. The added extra operations is provided by all Java {@link Collection}-s, and * this interface was added to make that accessible for templates too. - * - * @since 2.3.22 */ public interface TemplateCollectionModelEx extends TemplateCollectionModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveBody.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveBody.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveBody.java index bb54eb4..787d9d8 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveBody.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveBody.java @@ -29,8 +29,6 @@ import org.apache.freemarker.core.TemplateException; * class is passed to {@link TemplateDirectiveModel#execute(org.apache.freemarker.core.Environment, * java.util.Map, TemplateModel[], TemplateDirectiveBody)}. The implementation of the method is * free to invoke it for any number of times, with any writer. - * - * @since 2.3.11 */ public interface TemplateDirectiveBody { /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java index c4020c9..d9b2f96 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java @@ -34,8 +34,6 @@ import org.apache.freemarker.core.util.DeepUnwrap; * * <p>They are used in templates like {@code <@myDirective foo=1 bar="wombat">...</@myDirective>} (or as * {@code <@myDirective foo=1 bar="wombat" />} - the nested content is optional). - * - * @since 2.3.11 */ public interface TemplateDirectiveModel extends TemplateModel { /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateHashModelEx2.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateHashModelEx2.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateHashModelEx2.java index 86a72b1..ef62f86 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateHashModelEx2.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateHashModelEx2.java @@ -26,8 +26,6 @@ import java.util.NoSuchElementException; * with {@link #keys()} and then {@link #get(String)}, that has some problems. One is that {@link #get(String)} only * accepts string keys, while {@link #keys()} can return non-string keys too. The other is that calling {@link #keys()} * and then {@link #get(String)} for each key can be slower than listing the key-value pairs in one go. - * - * @since 2.3.25 */ public interface TemplateHashModelEx2 extends TemplateHashModelEx { @@ -38,8 +36,6 @@ public interface TemplateHashModelEx2 extends TemplateHashModelEx { /** * A key-value pair in a hash; used for {@link KeyValuePairIterator}. - * - * @since 2.3.25 */ interface KeyValuePair { @@ -57,8 +53,6 @@ public interface TemplateHashModelEx2 extends TemplateHashModelEx { /** * Iterates over the key-value pairs in a hash. This is very similar to an {@link Iterator}, but has a oms item * type, can throw {@link TemplateModelException}-s, and has no {@code remove()} method. - * - * @since 2.3.25 */ interface KeyValuePairIterator { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateMarkupOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateMarkupOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateMarkupOutputModel.java index 2215926..bd03438 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateMarkupOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateMarkupOutputModel.java @@ -39,8 +39,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; * @param <MO> * Refers to the interface's own type, which is useful in interfaces that extend * {@link TemplateMarkupOutputModel} (Java Generics trick). - * - * @since 2.3.24 */ public interface TemplateMarkupOutputModel<MO extends TemplateMarkupOutputModel<MO>> extends TemplateModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateModelWithAPISupport.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateModelWithAPISupport.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateModelWithAPISupport.java index c1a01fe..8ca2233 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateModelWithAPISupport.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateModelWithAPISupport.java @@ -25,8 +25,6 @@ package org.apache.freemarker.core.model; * <p> * <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it * shouldn't be implemented outside FreeMarker yet. - * - * @since 2.3.22 */ public interface TemplateModelWithAPISupport extends TemplateModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModel.java index afa9da6..d5df64c 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModel.java @@ -30,8 +30,6 @@ package org.apache.freemarker.core.model; * * <p>See the <a href="http://freemarker.org/docs/xgui.html"; target="_blank">XML * Processing Guide</a> for a concrete application. - * - * @since FreeMarker 2.3 */ public interface TemplateNodeModel extends TemplateModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModelEx.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModelEx.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModelEx.java index 0fa7e46..41d9d42 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModelEx.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateNodeModelEx.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core.model; /** * A {@link TemplateNodeModel} that supports navigating to the previous and next sibling nodes. - * - * @since 2.3.26 */ public interface TemplateNodeModelEx extends TemplateNodeModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/APIModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/APIModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/APIModel.java index 7ae5a71..41a77b2 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/APIModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/APIModel.java @@ -29,8 +29,6 @@ package org.apache.freemarker.core.model.impl; * <li>But methods will always shadow properties and fields with identical name, regardless of {@link DefaultObjectWrapper} * settings</li> * </ul> - * - * @since 2.3.22 */ final class APIModel extends BeanModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BeanModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BeanModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BeanModel.java index 91fe9dc..1f51892 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BeanModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BeanModel.java @@ -93,7 +93,6 @@ public class BeanModel this(object, wrapper, true); } - /** @since 2.3.21 */ BeanModel(Object object, DefaultObjectWrapper wrapper, boolean inrospectNow) { this.object = object; this.wrapper = wrapper; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java index 2159f31..348aab8 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java @@ -860,8 +860,6 @@ class ClassIntrospector { /** * Corresponds to {@link DefaultObjectWrapper#clearClassIntrospecitonCache()}. - * - * @since 2.3.20 */ void clearCache() { if (getHasSharedInstanceRestrictons()) { @@ -895,8 +893,6 @@ class ClassIntrospector { /** * Corresponds to {@link DefaultObjectWrapper#removeFromClassIntrospectionCache(Class)}. - * - * @since 2.3.20 */ void remove(Class<?> clazz) { synchronized (sharedLock) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java index 2db536d..fc310c3 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java @@ -49,8 +49,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see SimpleSequence * @see DefaultListAdapter * @see TemplateSequenceModel - * - * @since 2.3.22 */ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implements TemplateSequenceModel, AdapterTemplateModel, WrapperTemplateModel, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java index 6fd2680..b778573 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java @@ -44,8 +44,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * Thread safety: A {@link DefaultIterableAdapter} is as thread-safe as the {@link Iterable} that it wraps is. Normally * you only have to consider read-only access, as the FreeMarker template language doesn't provide mean to call * {@link Iterator} modifier methods (though of course, Java methods called from the template can violate this rule). - * - * @since 2.3.25 */ @SuppressWarnings("serial") public class DefaultIterableAdapter extends WrappingTemplateModel implements TemplateCollectionModel, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java index 60d9243..0524475 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java @@ -49,8 +49,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; * <p> * This adapter is used by {@link DefaultObjectWrapper} if its {@code useAdaptersForCollections} property is * {@code true}, which is the default when its {@code incompatibleImprovements} property is 2.3.22 or higher. - * - * @since 2.3.22 */ public class DefaultIteratorAdapter extends WrappingTemplateModel implements TemplateCollectionModel, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java index e58cc5e..3c99a73 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java @@ -53,8 +53,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see SimpleSequence * @see DefaultArrayAdapter * @see TemplateSequenceModel - * - * @since 2.3.22 */ public class DefaultListAdapter extends WrappingTemplateModel implements TemplateSequenceModel, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java index e3b3115..e17b0b7 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java @@ -50,8 +50,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * <p> * This adapter is used by {@link DefaultObjectWrapper} if its {@code useAdaptersForCollections} property is * {@code true}, which is the default when its {@code incompatibleImprovements} property is 2.3.22 or higher. - * - * @since 2.3.22 */ public class DefaultMapAdapter extends WrappingTemplateModel implements TemplateHashModelEx2, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java index 3b128fd..4e7bbde 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java @@ -44,8 +44,6 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * Thread safety: A {@link DefaultNonListCollectionAdapter} is as thread-safe as the {@link Collection} that it wraps * is. Normally you only have to consider read-only access, as the FreeMarker template language doesn't allow writing * these collections (though of course, Java methods called from the template can violate this rule). - * - * @since 2.3.22 */ public class DefaultNonListCollectionAdapter extends WrappingTemplateModel implements TemplateCollectionModelEx, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java index 09e1e16..0efe315 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java @@ -230,8 +230,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * its last argument was {@code false}; makes the instance read-only if necessary, then registers the model * factories in the class introspector. No further changes should be done after calling this, if * {@code writeProtected} was {@code true}. - * - * @since 2.3.22 */ protected void finalizeConstruction() { // Attention! At this point, the DefaultObjectWrapper must be fully initialized, as when the model factories are @@ -287,7 +285,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { */ /** - * @since 2.3.21 */ public int getExposureLevel() { return classIntrospector.getExposureLevel(); @@ -317,8 +314,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * was created; with a public constructor (then this is {@code false}), or with {@link Builder} * (then it's {@code true}). Note that in the last case it's possible that the introspection cache * will not be actually shared because there's no one to share with, but this will {@code true} even then. - * - * @since 2.3.21 */ public boolean isClassIntrospectionCacheRestricted() { return classIntrospector.getHasSharedInstanceRestrictons(); @@ -355,8 +350,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * Returns the version given with {@link Builder (Version)}, normalized to the lowest version * where a change has occurred. Thus, this is not necessarily the same version than that was given to the * constructor. - * - * @since 2.3.21 */ public Version getIncompatibleImprovements() { return incompatibleImprovements; @@ -495,15 +488,12 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * This object will be used "as is", like without unwrapping it if it's a {@link TemplateModelAdapter}. * @param method The method to call, which must be an (inherited) member of the class of {@code object}, as * described by {@link Method#invoke(Object, Object...)} - * - * @since 2.3.22 */ public TemplateMethodModelEx wrap(Object object, Method method) { return new JavaMethodModel(object, method, method.getParameterTypes(), this); } /** - * @since 2.3.22 */ @Override public TemplateHashModel wrapAsAPI(Object obj) throws TemplateModelException { @@ -552,7 +542,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { } /** - * @since 2.3.22 */ @Override public Object tryUnwrapTo(TemplateModel model, Class<?> targetClass) throws TemplateModelException { @@ -1100,8 +1089,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * Use this if you know that a class is not used anymore in templates. * If the class will be still used, the cache entry will be silently * re-created, so this isn't a dangerous operation. - * - * @since 2.3.20 */ public void removeFromClassIntrospectionCache(Class<?> clazz) { classIntrospector.remove(clazz); @@ -1114,8 +1101,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { * the cache entries for the classes that will be used later in templates. * * @throws IllegalStateException if {@link #isClassIntrospectionCacheRestricted()} is {@code true}. - * - * @since 2.3.20 */ public void clearClassIntrospecitonCache() { classIntrospector.clearCache(); @@ -1204,8 +1189,6 @@ public class DefaultObjectWrapper implements RichObjectWrapper { /** * Returns the lowest version number that is equivalent with the parameter version. - * - * @since 2.3.22 */ protected static Version normalizeIncompatibleImprovementsVersion(Version incompatibleImprovements) { _CoreAPI.checkVersionNotNullAndSupported(incompatibleImprovements); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java index 85be491..00e6608 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java @@ -32,8 +32,6 @@ import org.apache.freemarker.core.model.TemplateModelException; /** * Implementation of {@link KeyValuePairIterator} for a {@link TemplateHashModelEx2} that wraps or otherwise uses a * {@link Map} internally. - * - * @since 2.3.25 */ public class MapKeyValuePairIterator implements KeyValuePairIterator { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java index c60599d..49b19ef 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/MethodAppearanceFineTuner.java @@ -27,8 +27,6 @@ import java.lang.reflect.Method; * Used for customizing how the methods are visible from templates, via * {@link DefaultObjectWrapper.ExtendableBuilder#setMethodAppearanceFineTuner(MethodAppearanceFineTuner)}. * The object that implements this should also implement {@link SingletonCustomizer} whenever possible. - * - * @since 2.3.21 */ public interface MethodAppearanceFineTuner { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java index f520c3d..3c56b51 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java @@ -234,7 +234,6 @@ public class SimpleHash extends WrappingTemplateModel implements TemplateHashMod /** * Tells if the map contains a key or not, regardless if the associated value is {@code null} or not. - * @since 2.3.20 */ public boolean containsKey(String key) { return map.containsKey(key); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java index 79a8820..388498a 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java @@ -63,8 +63,6 @@ implements TemplateScalarModel, Serializable { /** * Same as calling the constructor, except that for a {@code null} parameter it returns null. - * - * @since 2.3.23 */ public static SimpleScalar newInstanceOrNull(String s) { return s != null ? new SimpleScalar(s) : null; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java index 1b949f1..ab60ed9 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java @@ -93,8 +93,6 @@ public class SimpleSequence extends WrappingTemplateModel implements TemplateSeq * * @param wrapper * See the similar parameter of {@link SimpleSequence#SimpleSequence(ObjectWrapper)}. - * - * @since 2.3.21 */ public SimpleSequence(int capacity, ObjectWrapper wrapper) { super(wrapper); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SingletonCustomizer.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SingletonCustomizer.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SingletonCustomizer.java index e4a0e5a..5b0866f 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SingletonCustomizer.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SingletonCustomizer.java @@ -43,8 +43,6 @@ import org.apache.freemarker.core.model.ObjectWrapper; * } * * }</pre> - * - * @since 2.3.21 */ public interface SingletonCustomizer { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java index 760f28b..d4341ef 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java @@ -26,8 +26,6 @@ import org.apache.freemarker.core.model.TemplateModelException; /** * Common superclass for implementing {@link MarkupOutputFormat}-s that use a {@link CommonTemplateMarkupOutputModel} * subclass. - * - * @since 2.3.24 */ public abstract class CommonMarkupOutputFormat<MO extends CommonTemplateMarkupOutputModel> extends MarkupOutputFormat<MO> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java index c6a7894..6185105 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java @@ -28,8 +28,6 @@ import org.apache.freemarker.core.model.TemplateMarkupOutputModel; * Thread-safe after proper publishing. Calculated fields (typically, the markup calculated from plain text) might will * be re-calculated for multiple times if accessed from multiple threads (this only affects performance, not * functionality). - * - * @since 2.3.24 */ public abstract class CommonTemplateMarkupOutputModel<MO extends CommonTemplateMarkupOutputModel<MO>> implements TemplateMarkupOutputModel<MO> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java index aac7d54..8707a3c 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java @@ -44,8 +44,6 @@ import org.apache.freemarker.core.outputformat.impl.TemplateHTMLOutputModel; * * @param <MO> * The {@link TemplateMarkupOutputModel} class this output format can deal with. - * - * @since 2.3.24 */ public abstract class MarkupOutputFormat<MO extends TemplateMarkupOutputModel> extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java index 8004ae2..9aa9e52 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * @see Configuration#getOutputFormat() * @see Configuration#getRegisteredCustomOutputFormats() * @see MarkupOutputFormat - * - * @since 2.3.24 */ public abstract class OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java index 86dbfa3..d7ce830 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.Configuration; /** * Thrown by {@link Configuration#getOutputFormat(String)}. - * - * @since 2.3.24 */ @SuppressWarnings("serial") public class UnregisteredOutputFormatException extends Exception { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java index 6a03d54..54f59a4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; /** * Represents the CSS output format (MIME type "text/css", name "CSS"). This format doesn't support escaping. - * - * @since 2.3.24 */ public class CSSOutputFormat extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java index 5239e3f..e3e1c51 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java @@ -27,8 +27,6 @@ import org.apache.freemarker.core.outputformat.MarkupOutputFormat; /** * Represents two markup formats nested into each other. For example, markdown nested into HTML. - * - * @since 2.3.24 */ public final class CombinedMarkupOutputFormat extends CommonMarkupOutputFormat<TemplateCombinedMarkupOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java index 0cebf64..0adadc0 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * Represents the HTML output format (MIME type "text/html", name "HTML"). This format escapes by default (via * {@link _StringUtil#XHTMLEnc(String)}). The {@code ?html}, {@code ?xhtml} and {@code ?xml} built-ins silently bypass * template output values of the type produced by this output format ({@link TemplateHTMLOutputModel}). - * - * @since 2.3.24 */ public final class HTMLOutputFormat extends CommonMarkupOutputFormat<TemplateHTMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java index c420e69..436c267 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; /** * Represents the JSON output format (MIME type "application/json", name "JSON"). This format doesn't support escaping. - * - * @since 2.3.24 */ public class JSONOutputFormat extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java index b2e8176..1b63986 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java @@ -23,8 +23,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; /** * Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript"). This format doesn't * support escaping. - * - * @since 2.3.24 */ public class JavaScriptOutputFormat extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java index 13cddc8..44e5873 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java @@ -29,8 +29,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; * output format into itself (unless they can be converted to plain text), while {@link UndefinedOutputFormat} would * just insert the foreign "markup" as is. Also, this format has {"text/plain"} MIME type, while * {@link UndefinedOutputFormat} has {@code null}. - * - * @since 2.3.24 */ public final class PlainTextOutputFormat extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java index be38b89..39a1bca 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF"). This format escapes by * default (via {@link _StringUtil#RTFEnc(String)}). The {@code ?rtf} built-in silently bypasses template output values * of the type produced by this output format ({@link TemplateRTFOutputModel}). - * - * @since 2.3.24 */ public final class RTFOutputFormat extends CommonMarkupOutputFormat<TemplateRTFOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java index 345a197..4108e6f 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.CommonTemplateMarkupOutputModel; /** * Stores combined markup to be printed; used with {@link CombinedMarkupOutputFormat}. - * - * @since 2.3.24 */ public final class TemplateCombinedMarkupOutputModel extends CommonTemplateMarkupOutputModel<TemplateCombinedMarkupOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java index 7bff952..554a7e4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.CommonTemplateMarkupOutputModel; /** * Stores HTML markup to be printed; used with {@link HTMLOutputFormat}. - * - * @since 2.3.24 */ public final class TemplateHTMLOutputModel extends CommonTemplateMarkupOutputModel<TemplateHTMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java index f01ff07..6a348af 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.CommonTemplateMarkupOutputModel; /** * Stores RTF markup to be printed; used with {@link RTFOutputFormat}. - * - * @since 2.3.24 */ public final class TemplateRTFOutputModel extends CommonTemplateMarkupOutputModel<TemplateRTFOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java index f0fbf1d..4d79748 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.CommonTemplateMarkupOutputModel; /** * Stores HTML markup to be printed; used with {@link HTMLOutputFormat}. - * - * @since 2.3.24 */ public final class TemplateXHTMLOutputModel extends CommonTemplateMarkupOutputModel<TemplateXHTMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java index 62e7867..4238718 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java @@ -22,8 +22,6 @@ import org.apache.freemarker.core.outputformat.CommonTemplateMarkupOutputModel; /** * Stores XML markup to be printed; used with {@link XMLOutputFormat}. - * - * @since 2.3.24 */ public final class TemplateXMLOutputModel extends CommonTemplateMarkupOutputModel<TemplateXMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java index b5412e2..55e0fe3 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java @@ -29,8 +29,6 @@ import org.apache.freemarker.core.outputformat.OutputFormat; * {@link TemplateMarkupOutputModel}-s as is (doesn't try to convert them). * * @see PlainTextOutputFormat - * - * @since 2.3.24 */ public final class UndefinedOutputFormat extends OutputFormat { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java index 4334ba3..769b33f 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML"). This format escapes by default * (via {@link _StringUtil#XHTMLEnc(String)}). The {@code ?xml} built-in silently bypasses template output values of the * type produced by this output format ({@link TemplateXHTMLOutputModel}). - * - * @since 2.3.24 */ public final class XHTMLOutputFormat extends CommonMarkupOutputFormat<TemplateXHTMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java index 644f323..4b03d31 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java @@ -30,8 +30,6 @@ import org.apache.freemarker.core.util._StringUtil; * Represents the XML output format (MIME type "application/xml", name "XML"). This format escapes by default (via * {@link _StringUtil#XMLEnc(String)}). The {@code ?html}, {@code ?xhtml} and {@code ?xml} built-ins silently bypass * template output values of the type produced by this output format ({@link TemplateXHTMLOutputModel}). - * - * @since 2.3.24 */ public final class XMLOutputFormat extends CommonMarkupOutputFormat<TemplateXMLOutputModel> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java index 27b4156..4202283 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java @@ -22,8 +22,6 @@ import java.io.IOException; /** * Logical "and" operation among the given matchers. - * - * @since 2.3.24 */ public class AndMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java index 945d049..7c95e7d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java @@ -21,8 +21,6 @@ package org.apache.freemarker.core.templateresolver; /** * A cache storage that has a {@code getSize()} method for returning the current number of cache entries. - * - * @since 2.3.21 */ public interface CacheStorageWithGetSize extends CacheStorage { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java index 8fab61f..68df5fe 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java @@ -25,8 +25,6 @@ import org.apache.freemarker.core.TemplateConfiguration; /** * Returns the given {@link TemplateConfiguration} directly, or another {@link TemplateConfigurationFactory}'s result, when * the specified matcher matches the template source. - * - * @since 2.3.24 */ public class ConditionalTemplateConfigurationFactory extends TemplateConfigurationFactory { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java index c89a478..4482772 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java @@ -23,8 +23,6 @@ import java.io.IOException; /** * Matches the file extension; unlike other matchers, by default case <em>insensitive</em>. A name (a path) is * considered to have the given extension exactly if it ends with a dot plus the extension. - * - * @since 2.3.24 */ public class FileExtensionMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java index 7a9692a..3db052d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java @@ -28,8 +28,6 @@ import org.apache.freemarker.core.util._StringUtil; * the source name with the given glob. For example, the file name glob {@code *.ftlh} matches both {@code foo.ftlh} and * {@code foo/bar.ftlh}. With other words, that file name glob is equivalent with the {@code **}{@code /*.ftlh}) * <em>path</em> glob ( {@link PathGlobMatcher}). - * - * @since 2.3.24 */ public class FileNameGlobMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java index 58c9ea9..31d69b7 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java @@ -25,8 +25,6 @@ import org.apache.freemarker.core.Template; /** * Used for the return value of {@link TemplateResolver#getTemplate(String, Locale, Serializable)} . - * - * @since 3.0.0 */ //TODO DRAFT only [FM3] public final class GetTemplateResult { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java index cf19e93..211b7ee 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java @@ -32,8 +32,7 @@ import org.apache.freemarker.core.util._StringUtil; * backward compatibility, {@link DefaultTemplateNameFormatFM2} doesn't throw this exception, * {@link DefaultTemplateNameFormat} does. This exception extends {@link IOException} for backward compatibility. * - * @since 2.3.22 - * + * * @see TemplateNotFoundException * @see Configuration#getTemplate(String) */ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java index 9b3106f..2383325 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java @@ -26,8 +26,6 @@ import org.apache.freemarker.core.TemplateConfiguration; * Returns the merged results of all the child factories. The factories are merged in the order as they were added. * {@code null} results from the child factories will be ignored. If all child factories return {@code null}, the result * of this factory will be {@code null} too. - * - * @since 2.3.24 */ public class MergingTemplateConfigurationFactory extends TemplateConfigurationFactory { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java index d608282..0f73b64 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java @@ -22,8 +22,6 @@ import java.io.IOException; /** * Logical "not" operation on the given matcher. - * - * @since 2.3.24 */ public class NotMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java index 922f293..505ccf5 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java @@ -22,8 +22,6 @@ import java.io.IOException; /** * Logical "or" operation among the given matchers. - * - * @since 2.3.24 */ public class OrMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java index fa4213a..17d1b94 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java @@ -42,8 +42,6 @@ import org.apache.freemarker.core.util._StringUtil; * * <p>By default the glob is case sensitive, but this can be changed with {@link #setCaseInsensitive(boolean)} (or * {@link #caseInsensitive(boolean)}). - * - * @since 2.3.24 */ public class PathGlobMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java index d015b1e..347408b 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java @@ -27,8 +27,6 @@ import org.apache.freemarker.core.util._StringUtil; * Matches the whole template source name (also known as template source path) with the given regular expression. * Note that the template source name is relative to the template storage root defined by the {@link TemplateLoader}; * it's not the full path of a file on the file system. - * - * @since 2.3.24 */ public class PathRegexMatcher extends TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java index fe9255d..e61bb23 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java @@ -25,8 +25,6 @@ import org.apache.freemarker.core.TemplateConfiguration; /** * Creates (or returns) {@link TemplateConfiguration}-s for template sources. - * - * @since 2.3.24 */ public abstract class TemplateConfigurationFactory { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java index 26c4c7e..00939de 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java @@ -20,8 +20,6 @@ package org.apache.freemarker.core.templateresolver; /** * Non-I/O exception thrown by {@link TemplateConfigurationFactory}-s. - * - * @since 2.3.24 */ public class TemplateConfigurationFactoryException extends Exception { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java index 0a3b33a..7926a1f 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java @@ -29,8 +29,6 @@ import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateLookupStr /** * Used as the parameter of {@link TemplateLookupStrategy#lookup(TemplateLookupContext)}. * You can't invoke instances of this, only receive them from FreeMarker. - * - * @since 2.3.22 */ public abstract class TemplateLookupContext<R extends TemplateLookupResult> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java index d9a2594..14a1554 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java @@ -31,8 +31,6 @@ import org.apache.freemarker.core.templateresolver.impl.TemplateLoaderBasedTempl * Subclass this only if you are implementing a {@link TemplateLookupContext}; if the {@link TemplateLookupContext} that * you are implementing uses {@link TemplateLoader}-s, consider using {@link TemplateLoaderBasedTemplateLookupResult} * instead of writing your own subclass. - * - * @since 2.3.22 */ public abstract class TemplateLookupResult { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java index 7021b5b..d9e3997 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java @@ -51,8 +51,6 @@ import org.apache.freemarker.core.Template; * </ul> * * @see Configuration#getTemplateLookupStrategy() - * - * @since 2.3.22 */ public abstract class TemplateLookupStrategy { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java index bf7280a..c2c5c61 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java @@ -40,8 +40,6 @@ import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateResolver; * <li>{@link Configuration#getTemplateLookupStrategy() templateLookupStrategy} * <li>{@link Configuration#getCacheStorage() cacheStorage} * </ul> - * - * @since 3.0.0 */ //TODO DRAFT only [FM3] public abstract class TemplateResolver { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java index ca38c39..3c8f89d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java @@ -21,7 +21,6 @@ package org.apache.freemarker.core.templateresolver; import java.io.IOException; /** - * @since 2.3.24 */ public abstract class TemplateSourceMatcher { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java index ea1cc63..400693e 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java @@ -73,8 +73,6 @@ public class DefaultTemplateResolver extends TemplateResolver { /** * The default template update delay; see {@link Configuration#getTemplateUpdateDelayMilliseconds()}. - * - * @since 2.3.23 */ public static final long DEFAULT_TEMPLATE_UPDATE_DELAY_MILLIS = 5000L; @@ -115,8 +113,6 @@ public class DefaultTemplateResolver extends TemplateResolver { * {@link TemplateLoader} itself specifies a {@link TemplateConfiguration}). * @param config * The {@link Configuration} this cache will be used for. Can't be {@code null}. - * - * @since 2.3.24 */ public DefaultTemplateResolver( TemplateLoader templateLoader, @@ -166,21 +162,18 @@ public class DefaultTemplateResolver extends TemplateResolver { } /** - * @since 2.3.22 */ public TemplateLookupStrategy getTemplateLookupStrategy() { return templateLookupStrategy; } /** - * @since 2.3.22 */ public TemplateNameFormat getTemplateNameFormat() { return templateNameFormat; } /** - * @since 2.3.24 */ public TemplateConfigurationFactory getTemplateConfigurations() { return templateConfigurations; @@ -213,8 +206,6 @@ public class DefaultTemplateResolver extends TemplateResolver { * If reading the template has failed from a reason other than the template is missing. This method * should never be a {@link TemplateNotFoundException}, as that condition is indicated in the return * value. - * - * @since 2.3.22 */ @Override public GetTemplateResult getTemplate(String name, Locale locale, Serializable customLookupCondition) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java index e2437c1..4c9012d 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java @@ -255,8 +255,6 @@ public class FileTemplateLoader implements TemplateLoader { /** * Returns the base directory in which the templates are searched. This comes from the constructor argument, but * it's possibly a canonicalized version of that. - * - * @since 2.3.21 */ public File getBaseDirectory() { return baseDir; @@ -272,8 +270,6 @@ public class FileTemplateLoader implements TemplateLoader { * * <p>The default in {@link FileTemplateLoader} is {@code false}, but subclasses may change they by overriding * {@link #getEmulateCaseSensitiveFileSystemDefault()}. - * - * @since 2.3.23 */ public void setEmulateCaseSensitiveFileSystem(boolean emulateCaseSensitiveFileSystem) { // Ensure that the cache exists exactly when needed: @@ -290,8 +286,6 @@ public class FileTemplateLoader implements TemplateLoader { /** * Getter pair of {@link #setEmulateCaseSensitiveFileSystem(boolean)}. - * - * @since 2.3.23 */ public boolean getEmulateCaseSensitiveFileSystem() { return emulateCaseSensitiveFileSystem; @@ -302,8 +296,6 @@ public class FileTemplateLoader implements TemplateLoader { * {@code false}, unless the {@link #SYSTEM_PROPERTY_NAME_EMULATE_CASE_SENSITIVE_FILE_SYSTEM} system property was * set to {@code true}, but this can be overridden here in custom subclasses. For example, if your environment * defines something like developer mode, you may want to override this to return {@code true} on Windows. - * - * @since 2.3.23 */ protected boolean getEmulateCaseSensitiveFileSystemDefault() { return EMULATE_CASE_SENSITIVE_FILE_SYSTEM_DEFAULT; @@ -311,8 +303,6 @@ public class FileTemplateLoader implements TemplateLoader { /** * Show class name and some details that are useful in template-not-found errors. - * - * @since 2.3.21 */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8d00e4da/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java index 9f004fe..85f2be5 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java @@ -210,8 +210,6 @@ public class MruCacheStorage implements CacheStorageWithGetSize { /** * Returns the configured upper limit of the number of strong cache entries. - * - * @since 2.3.21 */ public int getStrongSizeLimit() { return strongSizeLimit; @@ -219,8 +217,6 @@ public class MruCacheStorage implements CacheStorageWithGetSize { /** * Returns the configured upper limit of the number of soft cache entries. - * - * @since 2.3.21 */ public int getSoftSizeLimit() { return softSizeLimit; @@ -230,7 +226,6 @@ public class MruCacheStorage implements CacheStorageWithGetSize { * Returns the <em>current</em> number of strong cache entries. * * @see #getStrongSizeLimit() - * @since 2.3.21 */ public int getStrongSize() { return strongSize; @@ -240,7 +235,6 @@ public class MruCacheStorage implements CacheStorageWithGetSize { * Returns a close approximation of the <em>current</em> number of soft cache entries. * * @see #getSoftSizeLimit() - * @since 2.3.21 */ public int getSoftSize() { removeClearedReferences(); @@ -252,7 +246,6 @@ public class MruCacheStorage implements CacheStorageWithGetSize { * * @see #getStrongSize() * @see #getSoftSize() - * @since 2.3.21 */ @Override public int getSize() {
