Repository: incubator-freemarker Updated Branches: refs/heads/3 4bffe5284 -> a21c7c3f3
Removed some deprecated methods... Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a21c7c3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a21c7c3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a21c7c3f Branch: refs/heads/3 Commit: a21c7c3f32922d89fddbba6974b95cd92206f5dd Parents: 4bffe52 Author: ddekany <ddek...@apache.org> Authored: Tue Feb 21 09:20:47 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Tue Feb 21 09:20:47 2017 +0100 ---------------------------------------------------------------------- .../freemarker/core/TemplateException.java | 31 -------------------- .../servlet/ServletContextHashModel.java | 12 -------- .../apache/freemarker/core/ExceptionTest.java | 2 +- 3 files changed, 1 insertion(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a21c7c3f/src/main/java/org/apache/freemarker/core/TemplateException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/TemplateException.java b/src/main/java/org/apache/freemarker/core/TemplateException.java index a5f2740..d1d9a02 100644 --- a/src/main/java/org/apache/freemarker/core/TemplateException.java +++ b/src/main/java/org/apache/freemarker/core/TemplateException.java @@ -214,17 +214,6 @@ public class TemplateException extends Exception { } } } - - /** - * @deprecated Java 1.4 has introduced {@link #getCause()} - use that instead, especially as this can't return - * runtime exceptions and errors as is. - */ - @Deprecated - public Exception getCauseException() { - return getCause() instanceof Exception - ? (Exception) getCause() - : new Exception("Wrapped to Exception: " + getCause(), getCause()); - } /** * Returns the snapshot of the FTL stack trace at the time this exception was created. @@ -472,26 +461,6 @@ public class TemplateException extends Exception { } /** - * Returns the name ({@link Template#getName()}) of the template where the error has occurred, or {@code null} if - * the information isn't available. This shouldn't be used for showing the error position; use - * {@link #getTemplateSourceName()} instead. - * - * @deprecated Use {@link #getTemplateSourceName()} instead, unless you are really sure that this is what you want. - * This method isn't really deprecated, it's just marked so to warn users about this. - * - * @since 2.3.21 - */ - @Deprecated - public String getTemplateName() { - synchronized (lock) { - if (!positionsCalculated) { - calculatePosition(); - } - return templateName; - } - } - - /** * Returns the source name ({@link Template#getSourceName()}) of the template where the error has occurred, or * {@code null} if the information isn't available. This is what should be used for showing the error position. * http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a21c7c3f/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java b/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java index 76023cb..ce68cfd 100644 --- a/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java +++ b/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java @@ -41,18 +41,6 @@ public final class ServletContextHashModel implements TemplateHashModel { servletctx = servlet.getServletContext(); this.wrapper = wrapper; } - - /** - * @deprecated use - * {@link #ServletContextHashModel(GenericServlet, ObjectWrapper)} instead. - */ - @Deprecated - public ServletContextHashModel( - ServletContext servletctx, ObjectWrapper wrapper) { - servlet = null; - this.servletctx = servletctx; - this.wrapper = wrapper; - } @Override public TemplateModel get(String key) throws TemplateModelException { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a21c7c3f/src/test/java/org/apache/freemarker/core/ExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ExceptionTest.java b/src/test/java/org/apache/freemarker/core/ExceptionTest.java index 3dcf97f..174a464 100644 --- a/src/test/java/org/apache/freemarker/core/ExceptionTest.java +++ b/src/test/java/org/apache/freemarker/core/ExceptionTest.java @@ -81,7 +81,7 @@ public class ExceptionTest extends TestCase { t.process(null, _NullWriter.INSTANCE); fail(); } catch (TemplateException e) { - assertEquals("foo.ftl", e.getTemplateName()); + assertEquals("foo.ftl", t.getName()); assertEquals("foo_en.ftl", e.getTemplateSourceName()); assertEquals(3, (int) e.getLineNumber()); assertEquals(6, (int) e.getColumnNumber());
