This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 6542f0a3716e07610562a2194ae02cad2e106dc6 Author: ddekany <[email protected]> AuthorDate: Mon Aug 5 21:53:33 2019 +0200 (JavaDoc error fix) --- .../java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java | 0 .../org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java | 0 .../core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java | 0 .../core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java | 0 .../core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java | 0 .../core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java | 0 .../apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java | 0 .../freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java | 0 .../core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java | 0 .../freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java | 2 +- .../freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java | 4 +++- 11 files changed, 4 insertions(+), 2 deletions(-) diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBean.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/BridgeMethodsBeanBase.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBean2.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8BridgeMethodsWithDefaultMethodBeanBase2.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBean.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultMethodsBeanBase.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java similarity index 100% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java diff --git a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java similarity index 99% rename from freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java rename to freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java index fdeac75..7ff1aab 100644 --- a/freemarker-core-test-java8/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java @@ -33,7 +33,7 @@ import org.junit.Test; public class Java8DefaultObjectWrapperTest { - private static final DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); + private static final DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); @Test public void testDefaultMethodRecognized() throws TemplateException { diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java b/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java index b142649..f193683 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/pluggablebuiltin/TruncateBuiltinAlgorithm.java @@ -1,10 +1,12 @@ package org.apache.freemarker.core.pluggablebuiltin; import org.apache.freemarker.core.Environment; +import org.apache.freemarker.core.MutableProcessingConfiguration; import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.model.TemplateMarkupOutputModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateStringModel; +import org.apache.freemarker.core.pluggablebuiltin.impl.DefaultTruncateBuiltinAlgorithm; /** * Used for implementing the "truncate" family of built-ins. There are several variations of the "truncate" built-ins, @@ -14,7 +16,7 @@ import org.apache.freemarker.core.model.TemplateStringModel; * * <p>New methods may be added in later versions, whoever they won't be abstract for backward compatibility. * - * @see Configurable#setTruncateBuiltinAlgorithm(TruncateBuiltinAlgorithm) + * @see MutableProcessingConfiguration#setTruncateBuiltinAlgorithm(TruncateBuiltinAlgorithm) * * @since 2.3.29 */
