#2243 refactoring

src/main/java/org/codelibs/fess/taglib/FessFunctions.java

@@ -363,7 +363,7 @@ public class FessFunctions {
         return input.toString().replaceAll(regex, replacement);
     }
 
-    public static String formatCode(final String prefix, final String input, final String style) {
+    public static String formatCode(final String prefix, final String style, final String mimetype, final String input) {
         if (input == null) {
             return StringUtil.EMPTY;
         }

src/main/webapp/WEB-INF/fe.tld

@@ -254,7 +254,7 @@
     <description>Format a content as code.</description>
     <name>formatCode</name>
     <function-class>org.codelibs.fess.taglib.FessFunctions</function-class>
-    <function-signature>java.lang.String formatCode(java.lang.String, java.lang.String, java.lang.String)</function-signature>
-    <example>${fe:formatCode("L", doc.content_description, "prettyprint")}</example>
+    <function-signature>java.lang.String formatCode(java.lang.String, java.lang.String, java.lang.String, java.lang.String)</function-signature>
+    <example>${fe:formatCode("L", "prettyprint", doc.mimetype, doc.content_description)}</example>
   </function>
 </taglib>

src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java

@@ -65,39 +65,39 @@ public class FessFunctionsTest extends UnitFessTestCase {
         String value;
 
         code = "";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint\"></pre>", value);
 
         code = "aaa";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint\">aaa</pre>", value);
 
         code = "aaa\nbbb";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint\">aaa\nbbb</pre>", value);
 
         code = "aaa\nbbb\nccc";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint\">aaa\nbbb\nccc</pre>", value);
 
         code = "L10:aaa";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint linenums:10\">aaa</pre>", value);
 
         code = "L10:aaa\nL11:bbb";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint linenums:10\">aaa\nbbb</pre>", value);
 
         code = "L10:aaa\nL11:bbb\nL12:ccc";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint linenums:10\">aaa\nbbb\nccc</pre>", value);
 
         code = "aaa\nL11:bbb\nL12:ccc";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint linenums:11\">bbb\nccc</pre>", value);
 
         code = "L10:aaa\nL11:bbb\nL12:ccc...";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("<pre class=\"prettyprint linenums:10\">aaa\nbbb</pre>", value);
 
     }