Commit: 6fdbb9035a145682d848f15a12331b99b02892b0 - Moxkiriya7 (git)

Moxkiriyaプロジェクト事前開発用の作業部屋

Commit MetaInfo

• Revision: 6fdbb9035a145682d848f15a12331b99b02892b0 (tree)
• Zeit: 2018-08-21 06:40:32
• Autor: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• 内部リンクにtextNodeを指定し表示する処理を追加
  
• 画像リンクにalt属性、title属性を付加する処理を追加
  

Ändern Zusammenfassung

• modified: src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java

Diff

--- a/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
+++ b/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
@@ -41,6 +41,8 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 
 	private static final String PANGENAME_PREFIX_COLONFILE = ":File:";
 
+	private static final String PAGENAME_HASH_TITLE = "#title";
+	
 	/** リンク先のページ名 */
 	private String pagename_;
 	
@@ -98,7 +100,13 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 						buf.append(IMAGE_START_TAG);
 						buf.append("\"");
 						buf.append(file.toURI().toURL());
-						buf.append("\">");
+						buf.append("\"");
+						buf.append(" alt=\"");
+						buf.append(textNode);
+						buf.append("\"");
+						buf.append(" title=\"");
+						buf.append(textNode);
+						buf.append("\" >");
 						buf.append(IMAGE_END_TAG);
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -159,9 +167,23 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 
 	@Override
 	public String deleteWikiToken(String line) {
-		String deleteTop = line.replaceFirst(Pattern.quote(WIKI_TOKEN_START), "");
-		pagename_        = deleteTop.substring(0, deleteTop.lastIndexOf(WIKI_TOKEN_END));
-		return pagename_;
+		String deleteTop   = line.replaceFirst(Pattern.quote(WIKI_TOKEN_START), "");
+		String deleteToken = deleteTop.substring(0, deleteTop.lastIndexOf(WIKI_TOKEN_END));
+		String textNode    = deleteToken;
+		
+		if(deleteToken.contains("|") == true) {
+			pagename_ = deleteToken.substring(0, deleteToken.indexOf("|"));
+			textNode  = deleteToken.substring(deleteToken.indexOf("|") + "|".length());
+
+			if(textNode.equals(PAGENAME_HASH_TITLE) == true) {
+				textNode = pagename_.substring(pagename_.lastIndexOf(".") + ".".length());
+			}
+		}
+		else {
+			pagename_ = deleteToken;
+		}
+		
+		return textNode;
 	}
 
 	@Override