You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/01/25 00:57:47 UTC
[1/2] incubator-freemarker git commit: Removed @Override-s that
aren't valid for (some?) Java 5 compilers.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3.24-gae-stabilization 99d939c99 -> e4510739b
Removed @Override-s that aren't valid for (some?) Java 5 compilers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/738b16ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/738b16ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/738b16ba
Branch: refs/heads/2.3.24-gae-stabilization
Commit: 738b16ba6b82d940402d7e130a9d00d213dd6bf5
Parents: 99d939c
Author: ddekany <dd...@apache.org>
Authored: Sun Jan 24 22:56:24 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Jan 24 22:56:24 2016 +0100
----------------------------------------------------------------------
src/main/java/freemarker/ext/servlet/FreemarkerServlet.java | 3 ---
.../java/freemarker/core/AppMetaTemplateDateFormatFactory.java | 2 --
.../java/freemarker/manual/UnitAwareTemplateNumberModel.java | 1 -
.../freemarker/test/CopyrightCommentRemoverTemplateLoader.java | 4 ----
4 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/738b16ba/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
index 498466e..4bc7504 100644
--- a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
+++ b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
@@ -1635,7 +1635,6 @@ public class FreemarkerServlet extends HttpServlet {
this.initParamValue = initParamValue;
}
- @Override
public String getInitParamValue() {
return initParamValue;
}
@@ -1653,7 +1652,6 @@ public class FreemarkerServlet extends HttpServlet {
this.initParamValue = initParamValue;
}
- @Override
public String getInitParamValue() {
return initParamValue;
}
@@ -1669,7 +1667,6 @@ public class FreemarkerServlet extends HttpServlet {
this.initParamValue = initParamValue;
}
- @Override
public String getInitParamValue() {
return initParamValue;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/738b16ba/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java b/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
index cc518ee..c7e4f13 100644
--- a/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
+++ b/src/test/java/freemarker/core/AppMetaTemplateDateFormatFactory.java
@@ -102,12 +102,10 @@ public class AppMetaTemplateDateFormatFactory extends TemplateDateFormatFactory
this.appMeta = appMeta;
}
- @Override
public Date getAsDate() throws TemplateModelException {
return date;
}
- @Override
public int getDateType() {
return dateType;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/738b16ba/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java b/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
index 99a453d..74aacbd 100644
--- a/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
+++ b/src/test/java/freemarker/manual/UnitAwareTemplateNumberModel.java
@@ -31,7 +31,6 @@ public class UnitAwareTemplateNumberModel implements TemplateNumberModel {
this.unit = unit;
}
- @Override
public Number getAsNumber() throws TemplateModelException {
return value;
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/738b16ba/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
index 8099e03..0b5ca05 100644
--- a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
+++ b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
@@ -34,17 +34,14 @@ public class CopyrightCommentRemoverTemplateLoader implements TemplateLoader {
this.innerTemplateLoader = innerTemplateLoader;
}
- @Override
public Object findTemplateSource(String name) throws IOException {
return innerTemplateLoader.findTemplateSource(name);
}
- @Override
public long getLastModified(Object templateSource) {
return innerTemplateLoader.getLastModified(templateSource);
}
- @Override
public Reader getReader(Object templateSource, String encoding) throws IOException {
Reader reader = innerTemplateLoader.getReader(templateSource, encoding);
try {
@@ -55,7 +52,6 @@ public class CopyrightCommentRemoverTemplateLoader implements TemplateLoader {
}
}
- @Override
public void closeTemplateSource(Object templateSource) throws IOException {
innerTemplateLoader.closeTemplateSource(templateSource);
}
[2/2] incubator-freemarker git commit: Test fix: Avoiding strange
rounding difference on Java 8 (Double 10.305 0.## half-up is 10.31 on Java 6,
but 10.3 on Java 8.)
Posted by dd...@apache.org.
Test fix: Avoiding strange rounding difference on Java 8 (Double 10.305 0.## half-up is 10.31 on Java 6, but 10.3 on Java 8.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e4510739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e4510739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e4510739
Branch: refs/heads/2.3.24-gae-stabilization
Commit: e4510739bae639366126dc3dc46e71b93aff4e19
Parents: 738b16b
Author: ddekany <dd...@apache.org>
Authored: Mon Jan 25 00:57:18 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Jan 25 00:57:18 2016 +0100
----------------------------------------------------------------------
src/test/java/freemarker/manual/CustomFormatsExample.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e4510739/src/test/java/freemarker/manual/CustomFormatsExample.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/manual/CustomFormatsExample.java b/src/test/java/freemarker/manual/CustomFormatsExample.java
index e438b54..2f8778e 100644
--- a/src/test/java/freemarker/manual/CustomFormatsExample.java
+++ b/src/test/java/freemarker/manual/CustomFormatsExample.java
@@ -19,6 +19,7 @@
package freemarker.manual;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -53,7 +54,7 @@ public class CustomFormatsExample extends ExamplesTest {
cfg.setCustomDateFormats(customDateFormats);
addToDataModel("p", 10000);
- addToDataModel("w", 10.305);
+ addToDataModel("w", new BigDecimal("10.305"));
addToDataModel("fd", new Date(1450904944213L));
addToDataModel("let", new Date(1450904944213L));