From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java b/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java
index d57c3a0..aaf1a13 100644
--- a/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java
+++ b/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java
@@ -43,9 +43,9 @@
* snippet injector for something like a CMS. There are some cases where Wicket
* is not flexible enough to generate content, especially when you need to generate
* hybrid HTML/JS content outside the scope of Wicket.
- *
+ *
* @author James Moger
- *
+ *
*/
@SuppressWarnings("unchecked")
public class FreemarkerPanel extends Panel
@@ -62,10 +62,10 @@
private transient String stackTraceAsString;
private transient String evaluatedTemplate;
-
+
/**
* Construct.
- *
+ *
* @param id
* Component id
* @param template
@@ -77,10 +77,10 @@
{
this(id, template, Model.ofMap(values));
}
-
+
/**
* Construct.
- *
+ *
* @param id
* Component id
* @param templateResource
@@ -96,7 +96,7 @@
/**
* Gets the Freemarker template.
- *
+ *
* @return the Freemarker template
*/
private Template getTemplate()
@@ -155,7 +155,7 @@
/**
* Either print or rethrow the throwable.
- *
+ *
* @param exception
* the cause
* @param markupStream
@@ -179,7 +179,7 @@
/**
* Gets whether to escape HTML characters.
- *
+ *
* @return whether to escape HTML characters. The default value is false.
*/
public void setEscapeHtml(boolean value)
@@ -189,7 +189,7 @@
/**
* Evaluates the template and returns the result.
- *
+ *
* @param templateReader
* used to read the template
* @return the result of evaluating the velocity template
@@ -237,7 +237,7 @@
/**
* Gets whether to parse the resulting Wicket markup.
- *
+ *
* @return whether to parse the resulting Wicket markup. The default is false.
*/
public void setParseGeneratedMarkup(boolean value)
@@ -256,7 +256,7 @@
* want them to be able to have them correct them while the rest of the application keeps on
* working.
* </p>
- *
+ *
* @return Whether any Freemarker exceptions should be thrown or trapped. The default is false.
*/
public void setThrowFreemarkerExceptions(boolean value)
@@ -268,6 +268,7 @@
* @see org.apache.wicket.markup.IMarkupResourceStreamProvider#getMarkupResourceStream(org.apache
* .wicket.MarkupContainer, java.lang.Class)
*/
+ @Override
public final IResourceStream getMarkupResourceStream(MarkupContainer container,
Class< ? > containerClass)
{
@@ -289,6 +290,7 @@
* @see org.apache.wicket.markup.IMarkupCacheKeyProvider#getCacheKey(org.apache.wicket.
* MarkupContainer, java.lang.Class)
*/
+ @Override
public final String getCacheKey(MarkupContainer container, Class< ? > containerClass)
{
// don't cache the evaluated template
--
Gitblit v1.9.1