提交: 2989314ec31f1e439e4893116990e4898705d260 - Moxkiriya7 (git)

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

Commit MetaInfo

• 修订版: 2989314ec31f1e439e4893116990e4898705d260 (tree)
• 时间: 2018-09-29 16:41:32
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• Category名前空間のページの作成に対応
  
• File名前空間のページの作成に対応
  
• 透明tableスタイルの定義をfixedstylesheetへ移動
  

更改概述

• modified: src/com/wiki/standalone/moxkiriya/PageData.java
• modified: src/com/wiki/standalone/moxkiriya/SettingManager.java
• modified: src/com/wiki/standalone/moxkiriya/WikiEngine.java
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
• modified: src/com/wiki/standalone/moxkiriya/WikiRepository.java
• modified: src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
• modified: src/com/wiki/standalone/moxkiriya/resources/defaultstylesheet.css
• modified: src/com/wiki/standalone/moxkiriya/resources/fixedstylesheet.css

差异

--- a/src/com/wiki/standalone/moxkiriya/PageData.java
+++ b/src/com/wiki/standalone/moxkiriya/PageData.java
@@ -12,11 +12,13 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.StringReader;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.regex.Pattern;
 
 import javax.activation.FileTypeMap;
+import javax.activation.MimetypesFileTypeMap;
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
@@ -312,7 +314,7 @@ public class PageData {
 						count++;
 						if(charArrayContent[count] == ']') {
 							if(content.startsWith("]]", count) == true) {
-								int endCount   = count - 1;
+								int endCount   = count;
 								
 								String category = content.substring(startCount, endCount);
 								categories.add(category);
@@ -432,9 +434,7 @@ public class PageData {
 		 */
 		public void setInputStream(File file) throws Exception {
 			inputStream_ = new FileInputStream(file);
-			
-			FileTypeMap filetypeMap = FileTypeMap.getDefaultFileTypeMap();
-			mimeType_     = filetypeMap.getContentType(file);
+			mimeType_  = URLConnection.guessContentTypeFromName(file.getAbsolutePath());
 
 			lastModified_ = Calendar.getInstance();
 			lastModified_.setTimeInMillis(file.lastModified());

--- a/src/com/wiki/standalone/moxkiriya/SettingManager.java
+++ b/src/com/wiki/standalone/moxkiriya/SettingManager.java
@@ -50,7 +50,7 @@ public class SettingManager {
 	private static final String MOXKIRIYA_USER_DIR = "_moxkiriya";
 	
 	/** 設定ファイル名 */
-	private static final String INI_FILENAME = "_moxkiriya.ini";
+	private static final String CONFIG_FILENAME = "_moxkiriya.config";
 	
 	/** fixedstylesheetファイル名 */
 	public static final String FIXED_STYLESHEET_FILENAME = "fixedstylesheet.css";
@@ -114,7 +114,7 @@ public class SettingManager {
 	private void loadSettingFiles(String path) {
 		try {
 			if (path != null) {
-				File inifile = new File(path + "\\" + INI_FILENAME);
+				File inifile = new File(path + "\\" + CONFIG_FILENAME);
 				if (inifile.exists() != true) {
 					/* 
 					 * ファイルが存在しなかった場合、ファイルを新規作成
@@ -191,7 +191,7 @@ public class SettingManager {
 		
 		try {
 			String         path    = get(SETTINGSKEY_MOXKIRIYA_USER_DIR);
-			File           inifile = new File(path + "\\" + INI_FILENAME);
+			File           inifile = new File(path + "\\" + CONFIG_FILENAME);
 			BufferedWriter writer  = FileIO.bufferedWriter(inifile);
 			
 			writer.write(stringBuf.toString());

--- a/src/com/wiki/standalone/moxkiriya/WikiEngine.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiEngine.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.ResourceBundle;
 
+import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.Value;
 
@@ -29,6 +30,12 @@ public class WikiEngine {
 	/** jcr_uuid 独自属性 */
 	public static final String ATTRIBUTE_JCR_UUID = "data-jcr_uuid";
 
+	/** namespace "Cagegory" */
+	public static final String NAMESPACE_CATEGORY = WikiRepository.PROPERTY_CATEGORY;
+
+	/** namespace "File" */
+	public static final String NAMESPACE_FILE = WikiRepository.PROPERTY_FILE;
+	
 	/** Wiki Repository. */
 	private WikiRepository wikiRepository_;
 
@@ -91,46 +98,6 @@ public class WikiEngine {
 	public HashMap<String, PageData> getPageDataMap() {
 		return pageDataMap_;
 	}
-	
-	/**
-	 * Execute query node by namespace.
-	 * @param namespace
-	 * @return HashMap<String, PageData>
-	 * @throws Exception
-	 */
-	public HashMap<String, PageData> queryPageNamespace(String namespace) throws Exception {
-		return wikiRepository_.queryPageNamespace(namespace);
-	}
-
-	/**
-	 * Execute query node by UUID.
-	 * @param uuid
-	 * @return HashMap<String, PageData>
-	 * @throws Exception
-	 */
-	public HashMap<String, PageData> queryPageUUID(String uuid) throws Exception {
-		return wikiRepository_.queryPageUUID(uuid);
-	}
-
-	/**
-	 * Execute query node by pageTitle.
-	 * @param pageTitle
-	 * @return HashMap<String, PageData>
-	 * @throws Exception
-	 */
-	public HashMap<String, PageData> queryPageTitle(String pageTitle) throws Exception {
-		return wikiRepository_.queryPageTitle(pageTitle);
-	}
-
-	/**
-	 * Execute query full text search.
-	 * @param searchKey
-	 * @return HashMap<String, PageData>
-	 * @throws Exception
-	 */
-	public HashMap<String, PageData> queryPageFullTextSearch(String searchKey) throws Exception {
-		return wikiRepository_.queryPageFullTextSearch(searchKey);
-	}
 
 	/**
 	 * NamespaceList getter.
@@ -212,7 +179,9 @@ public class WikiEngine {
 				bodyBlockParser.parsePageTitle(currentPageData.getTitle());
 				BufferedReader buffreader = FileIO.bufferedReader(new StringReader(currentPageData.getContent()));
 	
-				bodyHtml   = bodyBlockParser.parse(buffreader);
+				bodyHtml   = bodyBlockParser.parse(buffreader)
+							+ buildCategoryList(currentPageData);
+				
 				buffreader.close();
 			}
 		}
@@ -321,14 +290,99 @@ public class WikiEngine {
 		return stringBuf.toString();
 	}
 
+	private String buildCategoryList(PageData pageData) throws Exception {
+		StringBuffer      buf = new StringBuffer("");
+		ArrayList<String> categoryies = pageData.getCategories();
+
+		for(String category: categoryies) {
+			if(category.isEmpty() != true) {
+				HashMap<String, PageData> categoryPageMap = queryPageTitle(category, NAMESPACE_CATEGORY);
+				
+				if(categoryPageMap.size() == 1) {
+					PageData categoryPage = categoryPageMap.values().iterator().next();
+					Node     node         = categoryPage.getNode();
+					
+					buf.append("<a href=" + "\"" + category + "\" ");
+					buf.append(ATTRIBUTE_JCR_UUID + "=\"");
+					buf.append(node.getProperty(Property.JCR_UUID).getString());
+					buf.append("\">");
+					buf.append(category);
+					buf.append("</a> ");
+				}
+			}
+		}
+		
+		String startElem = "";
+		String endElem   = "";
+		
+		if(buf.length() > 0) {
+			startElem = "<div class=\"categorylist\"> Categories: \n";
+			endElem   = "</div>";
+		}
+		
+		return startElem + buf.toString() + endElem;				
+	}
+	
+	
+	/**
+	 * Execute query node by namespace.
+	 * @param namespace
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	public HashMap<String, PageData> queryPageNamespace(String namespace) throws Exception {
+		return wikiRepository_.queryPageNamespace(namespace);
+	}
+
 	/**
-	 * Execute full text search.
-	 * @param key
-	 * @return String
+	 * Execute query node by UUID.
+	 * @param uuid
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	public HashMap<String, PageData> queryPageUUID(String uuid) throws Exception {
+		return wikiRepository_.queryPageUUID(uuid);
+	}
+
+	/**
+	 * Execute query node by pageTitle.
+	 * @param pageTitle
+	 * @param namespace
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	public HashMap<String, PageData> queryPageTitle(String pageTitle, String namespace) throws Exception {
+		return wikiRepository_.queryPageTitle(pageTitle, namespace);
+	}
+
+	/**
+	 * Execute query node by pageTitle.
+	 * @param pageTitle
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	public HashMap<String, PageData> queryPageTitle(String pageTitle) throws Exception {
+		return wikiRepository_.queryPageTitle(pageTitle);
+	}
+
+	/**
+	 * Execute query full text search.
+	 * @param searchKey
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	public HashMap<String, PageData> queryPageFullTextSearch(String searchKey) throws Exception {
+		return wikiRepository_.queryPageFullTextSearch(searchKey);
+	}
+
+	/**
+	 * Test namespace is contains namespaceList.
+	 * @param namespace
+	 * @return boolean
 	 * @throws Exception
 	 */
-	public HashMap<String, PageData> fullTextSearch(String key) throws Exception {
-		return wikiRepository_.queryPageFullTextSearch(key);
+	public boolean isContainsNamespaceList(String namespace) throws Exception {
+		return wikiRepository_.isContainsNamespaceList(namespace);
 	}
 
 	/**

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -101,7 +101,7 @@
         <Button fx:id="buttonDeletePages" mnemonicParsing="false" onAction="#onActionButtonDeletePages" prefHeight="30.0" text="%key.Button.Delete.Pages" AnchorPane.bottomAnchor="15.0" AnchorPane.leftAnchor="150.0" />
       </children>
     </AnchorPane>
-    <AnchorPane id="EditAnchorPane" fx:id="AnchorPaneEdit" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="450.0" prefWidth="590.0" visible="true" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="75.0">
+    <AnchorPane id="EditAnchorPane" fx:id="AnchorPaneEdit" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="450.0" prefWidth="590.0" visible="false" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="75.0">
       <children>
         <Label prefHeight="30.0" text="%key.Edit.Label.Title" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="15.0" />
         <TextField fx:id="textFieldTitle" prefHeight="30.0" prefWidth="380.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="9.0" AnchorPane.topAnchor="45.0" />
@@ -111,7 +111,7 @@
         <Button fx:id="buttonCancel" mnemonicParsing="false" onAction="#onActionButtonCancel" prefWidth="90.0" text="%key.Button.Cancel" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="10.0" />
         <TextField fx:id="textFieldAttachFile" disable="true" prefHeight="30.0" prefWidth="716.0" promptText="%key.Edit.TextField.InputPathname" AnchorPane.bottomAnchor="37.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="108.0" />
         <Label disable="true" prefHeight="30.0" prefWidth="166.0" text="%key.Edit.Label.AttachFile" AnchorPane.bottomAnchor="65.0" AnchorPane.leftAnchor="150.0" />
-        <Button disable="true" mnemonicParsing="false" prefHeight="30.0" prefWidth="45.0" text="..." AnchorPane.bottomAnchor="35.0" AnchorPane.rightAnchor="55.0" />
+        <Button fx:id="buttonChoiceFile" disable="true" mnemonicParsing="false" onAction="#onActionButtonChoiceFile" prefHeight="30.0" prefWidth="45.0" text="..." AnchorPane.bottomAnchor="35.0" AnchorPane.rightAnchor="55.0" />
       </children>
     </AnchorPane>
   </children>

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -110,6 +110,7 @@ public class WikiMainWindowController implements Initializable {
 	@FXML	private TextField       textFieldTitle;
 	@FXML	private TextArea        textAreaContents;
 	@FXML   private TextField       textFieldAttachFile;
+	@FXML   private Button          buttonChoiceFile;
 
 	/*
 	 * AnchorPaneContentList controls.
@@ -285,7 +286,7 @@ public class WikiMainWindowController implements Initializable {
 			String key = webViewMenuAnchorPaneTextFieldSearchWiki.getText();
 			
 			if(key.isEmpty() != true) {				
-				HashMap<String, PageData> map = wikiEngine_.fullTextSearch(key);
+				HashMap<String, PageData> map = wikiEngine_.queryPageFullTextSearch(key);
 
 				wikiEngine_.setPageDataMap(map);
 				loadWikiContent();
@@ -414,25 +415,6 @@ public class WikiMainWindowController implements Initializable {
 	}
 
 	@FXML
-	public void onMouseClickedHyperlinkEditAttachFiles() {
-		try {
-			PageData pageData = getSelectingPageData();
-			
-			if(pageData != null) {
-				FileChooser fileChooser = new FileChooser();
-				fileChooser.setTitle("Select " + pageData.getTitle());
-				File file = fileChooser.showOpenDialog(primaryStage_);
-				
-				if(file != null) {
-					textFieldAttachFile.setText(file.getPath());
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@FXML
 	public void onActionButtonDeletePages(ActionEvent event) {
 		try {
 			ObservableList<PageData> pageDataList = tableViewContentList.getItems();
@@ -463,6 +445,21 @@ public class WikiMainWindowController implements Initializable {
 	}
 	
 	@FXML
+	public void onActionButtonChoiceFile(ActionEvent event) {
+		try {
+			FileChooser fileChooser = new FileChooser();
+			fileChooser.setTitle("Select " + textFieldTitle.getText());
+			File file = fileChooser.showOpenDialog(primaryStage_);
+			
+			if(file != null) {
+				textFieldAttachFile.setText(file.getPath());
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@FXML
 	public void onActionButtonSave(ActionEvent event) {
 		try {			
 			String  title = textFieldTitle.getText();
@@ -479,12 +476,19 @@ public class WikiMainWindowController implements Initializable {
 				PageData pageData = (PageData)AnchorPaneEdit.getUserData();
 				
 				if(editMode_ == EditMode.NEW) {
-					pageData = new PageData();
-					pageData.setNamespace(WikiRepository.PROPERTY_MAIN);
+					if(pageData == null) {
+						pageData = new PageData();
+						pageData.setNamespace(WikiRepository.PROPERTY_MAIN);
+					}
 				}
 				
 				pageData.setTitle(title);
 				pageData.setContent(textAreaContents.getText());
+
+				String filename = textFieldAttachFile.getText();
+				if(filename.isEmpty() != true) {
+					pageData.setFileData(new File(filename));					
+				}
 				pageData  = wikiEngine_.checkin(pageData);
 				editMode_ = EditMode.NONE;
 
@@ -550,7 +554,8 @@ public class WikiMainWindowController implements Initializable {
 	 */
 	public void buildEditView(EditMode editMode, String title) {
 		try {
-			String content = "";
+			String content   = "";
+			String namespace = "";
 
 			editMode_ = editMode;
 
@@ -560,11 +565,45 @@ public class WikiMainWindowController implements Initializable {
 
 				AnchorPaneEdit.setUserData(pageData);
 				wikiEngine_.checkout();
-				title   = pageData.getTitle();
-				content = pageData.getContent();
+				title     = pageData.getTitle();
+				content   = pageData.getContent();
+				namespace = pageData.getNamespace();
 			}
 			else {
 				AnchorPaneEdit.setUserData(null);
+
+				if(editMode_ == EditMode.NEW) {
+					if(title.isEmpty() != true) {
+						PageData pageData  = new PageData();
+						String   pageTitle = title;
+
+						namespace = title.substring(0, title.indexOf(":"));
+
+						pageData.setNamespace(WikiRepository.PROPERTY_MAIN);						
+
+						if(namespace.isEmpty() != true) {
+							pageTitle = title.substring(namespace.length() + ":".length(), title.length());
+							if(wikiEngine_.isContainsNamespaceList(namespace) == true) {
+								pageData.setNamespace(namespace);								
+							}
+						}
+
+						pageData.setTitle(pageTitle);
+						AnchorPaneEdit.setUserData(pageData);
+
+						title     = pageData.getTitle();
+						namespace = pageData.getNamespace();
+					}
+				}
+			}
+
+			if(namespace.equals(WikiEngine.NAMESPACE_FILE) == true) {
+				textFieldAttachFile.setDisable(false);
+				buttonChoiceFile.setDisable(false);
+			}
+			else {
+				textFieldAttachFile.setDisable(true);
+				buttonChoiceFile.setDisable(true);
 			}
 
 			/*
@@ -572,6 +611,7 @@ public class WikiMainWindowController implements Initializable {
 			 */
 			textFieldTitle.setText(title);
 			textAreaContents.setText(content);
+			textFieldAttachFile.setText("");
 
 			menuItemNew.setDisable(true);
 
@@ -616,8 +656,10 @@ public class WikiMainWindowController implements Initializable {
 	 * @throws Exception 
 	 */
 	private void jumpToSectionLink(EventTarget target) throws Exception {
-		String targetString = target.toString();
-		String sectionName  = URLDecoder.decode(targetString.substring(targetString.indexOf("#") + "#".length()), "UTF-8");
+		HTMLAnchorElement anchor      = (HTMLAnchorElement)target;
+		String            href        = anchor.getAttribute("href");
+		String            pageTitle   = URLDecoder.decode(href, "UTF-8");
+		String            sectionName = pageTitle.substring(pageTitle.indexOf("#") + "#".length());
 		webView.getEngine().executeScript("scrollTo('" + sectionName + "')");
 	}
 
@@ -708,8 +750,9 @@ public class WikiMainWindowController implements Initializable {
 					@Override
 					public void handleEvent(org.w3c.dom.events.Event event) {
 						try {
-							MouseEvent  mouseEvent  = (MouseEvent)event;
-							EventTarget target      = mouseEvent.getCurrentTarget();
+							MouseEvent        mouseEvent  = (MouseEvent)event;
+							EventTarget       target      = mouseEvent.getCurrentTarget();
+
 							if(isExternalLink(target) == true) {
 								/*
 								 * WebEngineのデフォルトの動作(リンク先ページをロード)をキャンセル
@@ -737,16 +780,18 @@ public class WikiMainWindowController implements Initializable {
 							{ add("https://"); }
 							{ add("file://"); }
 						};
-						
-						boolean isExternal = false;
-						
+
+						HTMLAnchorElement aElem      = (HTMLAnchorElement)target;
+						String            href       = aElem.getAttribute("href");
+						boolean           isExternal = false;
+
 						for(String scheme: schemeList) {
-							if(target.toString().startsWith(scheme) == true) {
+							if(href.startsWith(scheme) == true) {
 								isExternal = true;
 								break;
 							}
 						}
-						
+
 						return isExternal;
 					}
 					
@@ -773,10 +818,10 @@ public class WikiMainWindowController implements Initializable {
 					 */
 					private void internalLinkHandle(EventTarget target) throws Exception {
 						HashMap<String, PageData> pageDataMap;
-						String                    pageTitle = URLDecoder.decode(target.toString(), "UTF-8");
-
-						HTMLAnchorElement anchor = (HTMLAnchorElement)target;
-						String            uuid   = anchor.getAttribute(WikiEngine.ATTRIBUTE_JCR_UUID);
+						HTMLAnchorElement         anchor    = (HTMLAnchorElement)target;
+						String                    href      = anchor.getAttribute("href");
+						String                    pageTitle = URLDecoder.decode(href, "UTF-8");
+						String                    uuid      = anchor.getAttribute(WikiEngine.ATTRIBUTE_JCR_UUID);
 
 						if(uuid != null) {
 							pageDataMap = wikiEngine_.queryPageUUID(uuid);
@@ -789,14 +834,14 @@ public class WikiMainWindowController implements Initializable {
 							loadWikiContent();
 						}
 						else {
-							if(target.toString().contains("#")) {
+							if(href.contains("#")) {
 								/*
 								 * ページ内セクションリンク
 								 */
 								jumpToSectionLink(target);
 							}
 							else {
-								buildEditView(target.toString());
+								buildEditView(href);
 							}
 						}
 

--- a/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -20,12 +20,14 @@ import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
+import javax.jcr.ValueFormatException;
 import javax.jcr.Workspace;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Query;
@@ -213,10 +215,18 @@ public class WikiRepository {
 		FileData fileData = pageData.getFileData();
 
 		if(fileData != null) {
-	    	Node fileNode     = node.addNode(WikiRepository.NODE_FILE, NodeType.NT_FILE);
-			Node nodeResource = fileNode.addNode(Property.JCR_CONTENT, NodeType.NT_RESOURCE);
+			Node fileNode     = node.getNode(WikiRepository.NODE_FILE);
+			
+			if(fileNode == null) {
+				fileNode     = node.addNode(WikiRepository.NODE_FILE, NodeType.NT_FILE);
+				fileNode.addNode(Property.JCR_CONTENT, NodeType.NT_RESOURCE);
+			}
+
+			Node nodeResource = fileNode.getNode(Property.JCR_CONTENT);
 
 			ValueFactory valueFactory = session_.getValueFactory();
+			
+			
 			nodeResource.setProperty(Property.JCR_DATA, valueFactory.createBinary(fileData.getInputStream()));
 			nodeResource.setProperty(Property.JCR_MIMETYPE, new StringValue(fileData.getMimeType()));
 			nodeResource.setProperty(Property.JCR_LAST_MODIFIED, valueFactory.createValue(fileData.getLastModified()));
@@ -228,7 +238,13 @@ public class WikiRepository {
         return node;
 	}
 
-	public HashMap<String, PageData> executeQuery(String sql) throws Exception {
+	/**
+	 * Execute query.
+	 * @param sql
+	 * @return HashMap<String, PageData>
+	 * @throws Exception
+	 */
+	private HashMap<String, PageData> executeQuery(String sql) throws Exception {
 		Workspace    workspace = session_.getWorkspace();
 		QueryManager queryMgr  = workspace.getQueryManager();
 		Query        query     = queryMgr.createQuery(sql, Query.JCR_SQL2);		
@@ -288,6 +304,17 @@ public class WikiRepository {
 			title     = pageTitle.substring(pageTitle.indexOf(":") + ":".length());
 		}
 		
+        return queryPageTitle(title, namespace);
+	}
+	
+	/**
+	 * Get node matched page title.
+	 * @param pageTitle
+	 * @param namespace
+	 * @return HashMap<String, PageData>
+	 * @throws Exception 
+	 */
+	public HashMap<String, PageData> queryPageTitle(String pageTitle, String namespace) throws Exception {
         return executeQuery(
         		"SELECT * " 
         		+ "	FROM [nt:unstructured]"
@@ -297,10 +324,10 @@ public class WikiRepository {
         		+ " AND"
         		+ " [" + PROPERTY_NAMESPACE + "] = '" + namespace + "'"
         		+ " AND"
-        		+ " [" + PROPERTY_TITLE + "] = '" + title + "'"
+        		+ " [" + PROPERTY_TITLE + "] = '" + pageTitle + "'"
 			);
 	}
-	
+
 	/**
 	 * Execute full text search.
 	 * @param searchKey
@@ -383,12 +410,14 @@ public class WikiRepository {
 		}
 		else {
 			String uuid = node.getProperty(Property.JCR_UUID).getString();
-			transformPageDataToNode(pageData, session_.getNodeByIdentifier(uuid));
-			session_.save();			
+
+			node = transformPageDataToNode(pageData, session_.getNodeByIdentifier(uuid));
+			session_.save();
 		}
 		
 		versionMgr.checkin(node.getPath());
-
+		createCategoryPages(node);
+		
 		String uuid = node.getProperty(Property.JCR_UUID).getString();
 
 		return new PageData(session_.getNodeByIdentifier(uuid));
@@ -481,4 +510,61 @@ public class WikiRepository {
 		
 		return buf.toString();
 	}
+
+	/**
+	 * 
+	 * @param node
+	 * @throws Exception 
+	 */
+	private void createCategoryPages(Node node) throws Exception {
+		Workspace      workspace  = session_.getWorkspace();
+		VersionManager versionMgr = workspace.getVersionManager();
+		Value[]        categories = node.getProperty(PROPERTY_category).getValues();
+
+		for(Value category: categories) {
+			String                    title = category.getString();
+
+			if(title.isEmpty() != true) {
+				HashMap<String, PageData> map   = queryPageTitle(title, PROPERTY_CATEGORY);
+				
+				if(map.size() == 0) {
+					/*
+					 * category pageが未作成の場合、
+					 */
+					PageData pageData = new PageData();
+					pageData.setNamespace(PROPERTY_CATEGORY);
+					pageData.setTitle(title);
+	
+					Node categoryNode = addPageNode(pageData);
+					session_.save();
+					versionMgr.checkout(categoryNode.getPath());
+					versionMgr.checkin(categoryNode.getPath());				
+				}
+			}
+		}
+	}
+
+	/**
+	 * Test namespace is contains namespaceList.
+	 * @param namespace
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public boolean isContainsNamespaceList(String namespace) throws Exception {
+        Node root          = session_.getRootNode();
+        Node wikiroot      = root.getNode(NODE_WIKIROOT);
+        Node namespaceNode = wikiroot.getNode(NODE_NAMESPACE);
+
+        Value[] list       = namespaceNode.getProperty(PROPERTY_NAMESPACE).getValues();
+        boolean isContains = false;
+
+        for(Value entry: list) {
+        	if(entry.getString().equals(namespace) == true) {
+        		isContains = true;
+        		break;
+        	}
+        }
+        
+        return isContains;
+	}
 }

--- a/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
+++ b/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
@@ -50,10 +50,16 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 	private static final String IMAGE_END_TAG = "</img>";
 
 	/** ページ名接頭辞 "File:" */
-	private static final String PANGENAME_PREFIX_FILE = "File:";
+	private static final String PAGENAME_PREFIX_FILE = WikiEngine.NAMESPACE_FILE + ":";
 
 	/** ページ名接頭辞 ":File:" */
-	private static final String PANGENAME_PREFIX_COLONFILE = ":File:";
+	private static final String PAGENAME_PREFIX_COLONFILE = ":" + WikiEngine.NAMESPACE_FILE + ":";
+
+	/** ページ名接頭辞 "Category:" */
+	private static final String PAGENAME_PREFIX_CATEGORY = WikiEngine.NAMESPACE_CATEGORY + ":";
+
+	/** ページ名接頭辞 ":Category:" */
+	private static final String PAGENAME_PREFIX_COLONCATEGORY = ":" + WikiEngine.NAMESPACE_CATEGORY + ":";
 
 	/** ページタイトルマクロ "#title" */
 	private static final String PAGENAME_HASH_TITLE = "#title";
@@ -72,7 +78,7 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 		NONE,
 		INNERLINK,
 		IMAGERENDER,
-		ATTACHFILE
+		ATTACHEDFILELINK
 	};
 	
 	/** リンクモード */
@@ -104,7 +110,14 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 			put(LinkMode.INNERLINK, new TextNodeProcessor() {
 				@Override
 				public void textNodeProcess(StringBuffer buf, String textNode) {
-					buf.append(textNode);
+					if(linkpath_.isEmpty() != true) {
+						if( (textNode.startsWith(PAGENAME_PREFIX_COLONFILE) == true)
+						 || (textNode.startsWith(PAGENAME_PREFIX_COLONCATEGORY) == true)) {
+							textNode = textNode.replaceFirst(Pattern.quote(":"), "");
+						}
+
+						buf.append(textNode);
+					}
 				}
 			});			
 		}
@@ -139,22 +152,25 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 									databuf.append(Base64.encode(byteBuf));
 								}
 							}
-						}
-						
-						buf.append(IMAGE_START_TAG);
-						if(databuf.length() > 0) {
-							buf.append("\"data:");
-							buf.append(mediaType + ";base64 ");
-							buf.append(databuf);
+
+							buf.append(IMAGE_START_TAG);
+							if(databuf.length() > 0) {
+								buf.append("\"data:");
+								buf.append(mediaType + ";base64,");
+								buf.append(databuf);
+								buf.append("\"");
+							}
+							buf.append(" alt=\"");
+							buf.append(textNode);
 							buf.append("\"");
+							buf.append(" title=\"");
+							buf.append(textNode);
+							buf.append("\" >");
+							buf.append(IMAGE_END_TAG);
+						}
+						else {
+							buf.append(textNode);
 						}
-						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();
 					}
@@ -162,7 +178,7 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 			});			
 		}
 		{
-			put(LinkMode.ATTACHFILE, new TextNodeProcessor() {
+			put(LinkMode.ATTACHEDFILELINK, new TextNodeProcessor() {
 				@Override
 				public void textNodeProcess(StringBuffer buf, String textNode) {
 					String basename = linkpath_.substring(linkpath_.lastIndexOf("\\") + "\\".length());
@@ -267,7 +283,7 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 		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());
@@ -288,23 +304,25 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 		try {
 			linkpath_ = buildLinkpathFromPagename(pagename_);
 
-			buf.append(START_TAG);
-			buf.append("\"");
-			buf.append(linkpath_ + "\" ");
-
-			HashMap<String, PageData> pageDataMap = wikiRepository_.queryPageTitle(linkpath_);			
-			if(pageDataMap.size() == 0) {
-				buf.append(STYLE_CLASS_NOEXIST);
-			}
-			else if(pageDataMap.size() == 1) {
-				Set<String> key      = pageDataMap.keySet();
-				PageData    pageData = pageDataMap.get(key.iterator().next());
-				Node        node     = pageData.getNode();
-				buf.append(" " + ATTRIBUTE_JCR_UUID + "=\"");
-				buf.append(node.getProperty(Property.JCR_UUID).getString());
+			if(linkpath_.isEmpty() != true) {
+				buf.append(START_TAG);
 				buf.append("\"");
+				buf.append(linkpath_ + "\" ");
+	
+				HashMap<String, PageData> pageDataMap = wikiRepository_.queryPageTitle(linkpath_);			
+				if(pageDataMap.size() == 0) {
+					buf.append(STYLE_CLASS_NOEXIST);
+				}
+				else if(pageDataMap.size() == 1) {
+					Set<String> key      = pageDataMap.keySet();
+					PageData    pageData = pageDataMap.get(key.iterator().next());
+					Node        node     = pageData.getNode();
+					buf.append(" " + ATTRIBUTE_JCR_UUID + "=\"");
+					buf.append(node.getProperty(Property.JCR_UUID).getString());
+					buf.append("\"");
+				}
+				buf.append(">");
 			}
-			buf.append(">");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -322,8 +340,10 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 
 	@Override
 	public void endElementProcess(StringBuffer buf) {
-		buf.append(END_TAG);
-		linkMode = LinkMode.ATTACHFILE;
+		if(linkpath_.isEmpty() != true) {
+			buf.append(END_TAG);
+		}
+		linkMode = LinkMode.NONE;
 	}
 
 	@Override
@@ -339,21 +359,21 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 	 */
 	private String buildLinkpathFromPagename(String pagename) throws Exception {
 		String linkpath = null;
-		
-		if(pagename.startsWith(PANGENAME_PREFIX_COLONFILE) == true) {
-			linkMode = LinkMode.ATTACHFILE;
-			linkpath = buildAttachLinkpath(pagename);
-		}
-		else if(pagename.startsWith(PANGENAME_PREFIX_FILE) == true) {
+
+		if(pagename.startsWith(PAGENAME_PREFIX_FILE) == true) {
 			if(FileTypeDeterminator.isImageFile(pagename) == true) {
 				linkMode = LinkMode.IMAGERENDER;
 				linkpath = buildImageLinkpath(pagename);
 			}
 			else {
-				linkMode = LinkMode.ATTACHFILE;
+				linkMode = LinkMode.ATTACHEDFILELINK;
 				linkpath = buildAttachLinkpath(pagename);
 			}
 		}
+		else if(pagename.startsWith(PAGENAME_PREFIX_CATEGORY) == true) {
+			linkMode = LinkMode.INNERLINK;
+			linkpath = "";
+		}
 		else {
 			linkMode = LinkMode.INNERLINK;
 			linkpath = buildInternalLinkpath(pagename);
@@ -390,6 +410,11 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 	 * @throws Exception
 	 */
 	private String buildInternalLinkpath(String pagename) throws Exception {
+		if( (pagename.startsWith(PAGENAME_PREFIX_COLONFILE) == true)
+		 || (pagename.startsWith(PAGENAME_PREFIX_COLONCATEGORY) == true)) {
+			pagename = pagename.replaceFirst(Pattern.quote(":"), "");
+		}
+		
 		return pagename;
 	}
 }

--- a/src/com/wiki/standalone/moxkiriya/resources/defaultstylesheet.css
+++ b/src/com/wiki/standalone/moxkiriya/resources/defaultstylesheet.css
@@ -57,20 +57,6 @@ table td {
 	padding-bottom: 0.5em;	
 }
 
-table.transparent {
-	border-collapse: collapse;
-	border: solid 0px;
-}
-
-table.transparent th, table.transparent td {
-	background: #ffffff;
-	border: solid 0px #000000;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;	
-}
-
 a.noexist {
 	color: #ff8c00;
 }
@@ -171,3 +157,11 @@ blockquote.quotation {
 	background: #efefef;
 }
 
+div.categorylist {
+	background: #f0f0f0;
+	border: solid 1px #c0c0c0;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;		
+}

--- a/src/com/wiki/standalone/moxkiriya/resources/fixedstylesheet.css
+++ b/src/com/wiki/standalone/moxkiriya/resources/fixedstylesheet.css
@@ -12,4 +12,19 @@
 
 #linethrough {
 	text-decoration: line-through;
-}
\ No newline at end of file
+}
+
+table.transparent {
+	border-collapse: collapse;
+	border: solid 0px;
+}
+
+table.transparent th, table.transparent td {
+	background: #ffffff;
+	border: solid 0px #000000;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;	
+}
+