This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit 4a476e6530b344f2d074496388c5b03fad121adb Author: Michael Bien <[email protected]> AuthorDate: Wed Jul 14 07:26:09 2021 +0200 renamed EscapeSourceCodePlugin to EncodePreTagsPlugin. --- ...apeSourceCodePlugin.java => EncodePreTagsPlugin.java} | 16 ++++++++-------- .../org/apache/roller/weblogger/config/roller.properties | 2 +- ...eCodePluginTest.java => EncodePreTagsPluginTest.java} | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePlugin.java b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPlugin.java similarity index 84% rename from app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePlugin.java rename to app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPlugin.java index 845b08e..2689496 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePlugin.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPlugin.java @@ -28,9 +28,9 @@ import org.apache.roller.weblogger.pojos.WeblogEntry; import static java.util.regex.Pattern.*; /** - * Escapes angle brackets inside pre tags (code tags which follow right after pre are not escaped). + * Encodes angle brackets inside pre tags (code tags which follow right after pre are not encoded). */ -public class EscapeSourceCodePlugin implements WeblogEntryPlugin { +public class EncodePreTagsPlugin implements WeblogEntryPlugin { private static final String LT = "<"; // '<' @@ -42,12 +42,12 @@ public class EscapeSourceCodePlugin implements WeblogEntryPlugin { @Override public String getName() { - return "Sourcecode Escaper"; + return "Pre Tag Encoder"; } @Override public String getDescription() { - return "Escapes angle brackets inside pre tags, code tags are retained."; + return "Encodes angle brackets inside pre tags, code tags are kept unaltered."; } @Override @@ -69,9 +69,9 @@ public class EscapeSourceCodePlugin implements WeblogEntryPlugin { if (code_matcher.find()) { String code_inner = code_matcher.group(1); - pre_matcher.appendReplacement(result, pre_full.replace(code_inner, escape(code_inner))); + pre_matcher.appendReplacement(result, pre_full.replace(code_inner, encode(code_inner))); } else { - pre_matcher.appendReplacement(result, pre_full.replace(pre_inner, escape(pre_inner))); + pre_matcher.appendReplacement(result, pre_full.replace(pre_inner, encode(pre_inner))); } } @@ -80,8 +80,8 @@ public class EscapeSourceCodePlugin implements WeblogEntryPlugin { return result.toString(); } - // we only have to escape the opening angle bracket for valid html/xhtml - private static String escape(String code_inner) { + // we only have to encode the opening angle bracket for valid html/xhtml + private static String encode(String code_inner) { return code_inner.replace("<", LT); } diff --git a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties index af29d08..2d439ea 100644 --- a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties +++ b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties @@ -549,7 +549,7 @@ plugins.page=\ org.apache.roller.weblogger.business.plugins.entry.ConvertLineBreaksPlugin \ ,org.apache.roller.weblogger.business.plugins.entry.ObfuscateEmailPlugin \ ,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin\ -,org.apache.roller.weblogger.business.plugins.entry.EscapeSourceCodePlugin +,org.apache.roller.weblogger.business.plugins.entry.EncodePreTagsPlugin # The list of configured WeblogEntryEditors available to users diff --git a/app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePluginTest.java b/app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPluginTest.java similarity index 94% rename from app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePluginTest.java rename to app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPluginTest.java index ff7b585..4dfbe18 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EscapeSourceCodePluginTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPluginTest.java @@ -25,12 +25,12 @@ import static org.junit.jupiter.api.Assertions.*; /** * @author mbien */ -public class EscapeSourceCodePluginTest { +public class EncodePreTagsPluginTest { @Test public void passthrough() { - EscapeSourceCodePlugin instance = new EscapeSourceCodePlugin(); + EncodePreTagsPlugin instance = new EncodePreTagsPlugin(); String input = "Stay a while and listen."; assertEquals(input, instance.render(null, input)); @@ -63,7 +63,7 @@ public class EscapeSourceCodePluginTest { @Test public void substitution1() { - EscapeSourceCodePlugin instance = new EscapeSourceCodePlugin(); + EncodePreTagsPlugin instance = new EncodePreTagsPlugin(); String input = "<pre><></pre>"; String expected = "<pre><></pre>"; @@ -75,7 +75,7 @@ public class EscapeSourceCodePluginTest { @Test public void substitution2() { - EscapeSourceCodePlugin instance = new EscapeSourceCodePlugin(); + EncodePreTagsPlugin instance = new EncodePreTagsPlugin(); String input = "\n<!DOCTYPE html>\n" + "<html>\n" + @@ -103,7 +103,7 @@ public class EscapeSourceCodePluginTest { @Test public void substitution3() { - EscapeSourceCodePlugin instance = new EscapeSourceCodePlugin(); + EncodePreTagsPlugin instance = new EncodePreTagsPlugin(); String input = "<!DOCTYPE html>\n" + "<html>\n" +
