freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [04/32] incubator-freemarker git commit: Removed @Override-s that aren't valid for (some?) Java 5 compilers.
Date Sat, 26 Mar 2016 15:41:18 GMT
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
Commit: 738b16ba6b82d940402d7e130a9d00d213dd6bf5
Parents: 99d939c
Author: ddekany <ddekany@apache.org>
Authored: Sun Jan 24 22:56:24 2016 +0100
Committer: ddekany <ddekany@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);
     }


Mime
View raw message