Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-05 07:09:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #913)Remove Java8 dependency

Browse Source
This commit is contained in:
Naoki Takezoe
2015-09-23 19:12:21 +09:00
parent ad08d385e6
commit 317a6fde30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/view/Markdown.scala
View File

@@ -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 = {
"<pre class=\"prettyprint" + (if(lang.isPresent) s" ${options.getLangPrefix}${lang.get}" else "" )+ "\">" +
override def code(code: String, lang: String, escaped: Boolean): String = {
"<pre class=\"prettyprint" + (if(lang != null) s" ${options.getLangPrefix}${lang}" else "" )+ "\">" +
(if(escaped) code else escape(code, true)) + "</pre>"
}
@@ -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)
}