From 317a6fde309287d8b2b38d3fa27d13e50badcc88 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 23 Sep 2015 19:12:21 +0900 Subject: [PATCH] (refs #913)Remove Java8 dependency --- src/main/scala/gitbucket/core/view/Markdown.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala index 2e126eb6c..9a3c1e541 100644 --- a/src/main/scala/gitbucket/core/view/Markdown.scala +++ b/src/main/scala/gitbucket/core/view/Markdown.scala @@ -2,7 +2,7 @@ package gitbucket.core.view import java.text.Normalizer import java.util.regex.Pattern -import java.util.{Optional, Locale} +import java.util.Locale import gitbucket.core.controller.Context import gitbucket.core.service.{RepositoryService, RequestCache} @@ -70,8 +70,8 @@ object Markdown { out.toString() } - override def code(code: String, lang: Optional[String], escaped: Boolean): String = { - "
" +
+    override def code(code: String, lang: String, escaped: Boolean): String = {
+      "
" +
         (if(escaped) code else escape(code, true)) + "
" } @@ -108,11 +108,11 @@ object Markdown { t2 } - override def link(href: String, title: Optional[String], text: String): String = { + override def link(href: String, title: String, text: String): String = { super.link(fixUrl(href, true), title, text) } - override def image(href: String, title: Optional[String], text: String): String = { + override def image(href: String, title: String, text: String): String = { super.image(fixUrl(href, true), title, text) }