提交: a5aa3188af7ce071817add77b4c5dfbf35bc0d81 - Moxkiriya7 (git)

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

Commit MetaInfo

• 修订版: a5aa3188af7ce071817add77b4c5dfbf35bc0d81 (tree)
• 时间: 2018-09-30 13:13:55
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• 細かい修正をいくつか
  
• HistoryBack/Forward機能を追加
  

更改概述

• modified: src/com/wiki/standalone/moxkiriya/Main.java
• modified: src/com/wiki/standalone/moxkiriya/WikiEngine.java
• add: src/com/wiki/standalone/moxkiriya/WikiHistory.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

差异

--- a/src/com/wiki/standalone/moxkiriya/Main.java
+++ b/src/com/wiki/standalone/moxkiriya/Main.java
@@ -64,6 +64,7 @@ public class Main extends Application {
 	@Override
 	public void start(Stage primaryStage) {
 		primaryStage_   = primaryStage;
+
 		settingManager_ = SettingManager.getInstance();
 		
 		try {
@@ -81,7 +82,7 @@ public class Main extends Application {
 				 */
 				Stage stage  = new Stage(StageStyle.UNDECORATED);
 				stage.initOwner(primaryStage);
-				showInitialSettingsDialog(stage);
+				showConfigSettingsDialog(stage);
 				AppRoot     = settingManager_.get(SettingManager.SETINGKEY_MOXKIRIYAROOT);
 			}
 
@@ -108,11 +109,11 @@ public class Main extends Application {
 	}
 
 	/**
-	 * WikirootInputDialogを表示する。
+	 * WikiConfigSettingDialogを表示する。
 	 * @param primaryStage
 	 * @throws Exception 
 	 */
-	private void showInitialSettingsDialog(Stage stage) throws Exception {
+	private void showConfigSettingsDialog(Stage stage) throws Exception {
 		ConfigSettingsDialog dialog = new ConfigSettingsDialog();
 		dialog.showDialog(stage, resources_);
 	}

--- a/src/com/wiki/standalone/moxkiriya/WikiEngine.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiEngine.java
@@ -42,10 +42,14 @@ public class WikiEngine {
 	/** Page data map. */
 	private HashMap<String, PageData> pageDataMap_ = null;
 
+	/** Wiki history manager. */
+	private WikiHistory wikiHistory_ = null;
+
 	/**
 	 * Constructor.
 	 */
 	public WikiEngine() {
+		wikiHistory_ = new WikiHistory();
 	}
 
 	/**
@@ -161,68 +165,39 @@ public class WikiEngine {
 	 * @throws Exception 
 	 */
 	public String parse() throws Exception {
-		WikiBodyBlockParser bodyBlockParser = new WikiBodyBlockParser(wikiRepository_);
-		String              bodyHtml        = "";
-
-		PageData currentPageData = null;
+		PageData pageData = null;
+		String   bodyHtml = "";
 
 		if(pageDataMap_.size() == 1) {
-			currentPageData = pageDataMap_.values().iterator().next();
-		
-			/*
-			 * Contentsのparse & Body部の構築.
-			 */
-			if(currentPageData != null) {
-				/*
-				 * ページタイトルのparse.
-				 */
-				bodyBlockParser.parsePageTitle(currentPageData.getTitle());
-				BufferedReader buffreader = FileIO.bufferedReader(new StringReader(currentPageData.getContent()));
-	
-				bodyHtml   = bodyBlockParser.parse(buffreader)
-							+ buildCategoryList(currentPageData);
-				
-				buffreader.close();
-			}
+			pageData = pageDataMap_.values().iterator().next();
+			wikiHistory_.add(pageData);
+			bodyHtml = markupContents(pageData);
 		}
 		else {
-			StringBuffer   bodybuf = new StringBuffer();
-			ResourceBundle resources_ = ResourceBundle.getBundle("com.wiki.standalone.moxkiriya.resources.moxkiriya");
+			bodyHtml = markupContentsList();
+		}
 
-			bodybuf.append("<h1>" + resources_.getString("key.Search.Result") + "</h1>\n");
-			if(pageDataMap_.size() > 1) {
-				bodybuf.append("<div>\n");
-				bodybuf.append(resources_.getString("key.Message.found.pages") + "\n");
-				bodybuf.append("</div>\n");
-		
-				for(String uuid: pageDataMap_.keySet()) {
-					PageData pageData = pageDataMap_.get(uuid);
-					
-					bodybuf.append("<h3>\n");
-					bodybuf.append("<a href="
-							+ "\"" + pageData.getTitle() + "\" "
-							+ ATTRIBUTE_JCR_UUID + "="
-							+ pageData.getNode().getProperty(Property.JCR_UUID).getString()
-							+ ">");
-					bodybuf.append(pageData.getTitle());
-					bodybuf.append("</a>\n");
-					bodybuf.append("</h3>\n");
-					bodybuf.append("<div>\n");
-					bodybuf.append(pageData.getIntroduction());
-					bodybuf.append("</div>\n");
-				}
-			}
-			else {
-				/*
-				 * No page was found.
-				 */
-				bodybuf.append("<div>\n");
-				bodybuf.append(resources_.getString("key.search.result.message.nopage") + "\n");
-				bodybuf.append("</div>\n");				
-			}
+		/*
+		 * Header部の構築
+		 */
+		String         headerHtml = buildHtmlHeader();
+		StringBuffer   buf        = new StringBuffer();
 
-			bodyHtml = bodybuf.toString();
-		}
+		buf.append(headerHtml);
+		buf.append(bodyHtml);
+		buf.append("</html>");
+
+		return buf.toString();
+	}
+
+	/**
+	 * Wikiシンタックスの文字列をHTML形式に変換する。
+	 * @param pageData
+	 * @return HTMLコンテンツ
+	 * @throws Exception 
+	 */
+	public String parse(PageData pageData) throws Exception {
+		String bodyHtml = markupContents(pageData);
 
 		/*
 		 * Header部の構築
@@ -233,9 +208,76 @@ public class WikiEngine {
 		buf.append(headerHtml);
 		buf.append(bodyHtml);
 		buf.append("</html>");
-		
+
 		return buf.toString();
 	}
+
+	/**
+	 * Wikiシンタックスの文字列をHTML形式に変換する。
+	 * @return HTMLコンテンツ
+	 * @throws Exception 
+	 */
+	public String markupContents(PageData pageData) throws Exception {
+		WikiBodyBlockParser bodyBlockParser = new WikiBodyBlockParser(wikiRepository_);
+		String              bodyHtml        = "";
+
+		/*
+		 * Contentsのparse & Body部の構築.
+		 */
+		bodyBlockParser.parsePageTitle(pageData.getTitle());
+		BufferedReader buffreader = FileIO.bufferedReader(new StringReader(pageData.getContent()));
+
+		bodyHtml = bodyBlockParser.parse(buffreader)
+				+ buildCategoryList(pageData);
+
+		buffreader.close();
+
+		return bodyHtml;
+	}
+
+	/**
+	 * PageリストをHTML形式で生成する。
+	 * @return HTMLコンテンツ
+	 * @throws Exception 
+	 */
+	public String markupContentsList() throws Exception {
+		StringBuffer   bodybuf = new StringBuffer();
+		ResourceBundle resources_ = ResourceBundle.getBundle("com.wiki.standalone.moxkiriya.resources.moxkiriya");
+
+		bodybuf.append("<h1>" + resources_.getString("key.Search.Result") + "</h1>\n");
+		if(pageDataMap_.size() > 1) {
+			bodybuf.append("<div>\n");
+			bodybuf.append(resources_.getString("key.Message.found.pages") + "\n");
+			bodybuf.append("</div>\n");
+	
+			for(String uuid: pageDataMap_.keySet()) {
+				PageData pageData = pageDataMap_.get(uuid);
+				
+				bodybuf.append("<h3>\n");
+				bodybuf.append("<a href="
+						+ "\"" + pageData.getTitle() + "\" "
+						+ ATTRIBUTE_JCR_UUID + "="
+						+ pageData.getNode().getProperty(Property.JCR_UUID).getString()
+						+ ">");
+				bodybuf.append(pageData.getTitle());
+				bodybuf.append("</a>\n");
+				bodybuf.append("</h3>\n");
+				bodybuf.append("<div>\n");
+				bodybuf.append(pageData.getIntroduction());
+				bodybuf.append("</div>\n");
+			}
+		}
+		else {
+			/*
+			 * No page was found.
+			 */
+			bodybuf.append("<div>\n");
+			bodybuf.append(resources_.getString("key.search.result.message.nopage") + "\n");
+			bodybuf.append("</div>\n");				
+		}
+		
+		return bodybuf.toString();
+	}
 	
 	/**
 	 * HTMLヘッダ部を構築する。
@@ -405,8 +447,45 @@ public class WikiEngine {
 				PageData pageData = pageDataMap_.values().iterator().next();
 				String   uuid     = pageData.getNode().getProperty(Property.JCR_UUID).getString();
 				
-				pageDataMap_ = wikiRepository_.queryPageUUID(uuid);				
+				pageDataMap_ = wikiRepository_.queryPageUUID(uuid);
 			}
 		}
 	}
+	
+	/**
+	 * Is there an older node on a history list.
+	 * @return boolean
+	 */
+	public boolean canBack() {
+		return wikiHistory_.canBack();
+	}
+
+	/**
+	 * Is there an newer node on a history list.
+	 * @return boolean
+	 */
+	public boolean canForward() {
+		return wikiHistory_.canForward();
+	} 
+
+	/**
+	 * Execute history back.
+	 * @throws Exception 
+	 */
+	public String back() throws Exception {
+		PageData pageData = wikiHistory_.back();
+		setPageDataMap(pageData);
+		return parse(pageData);
+	}
+
+	/**
+	 * Execute history forward.
+	 * @return PageData
+	 * @throws Exception 
+	 */
+	public String forward() throws Exception {
+		PageData pageData = wikiHistory_.forward();
+		setPageDataMap(pageData);
+		return parse(pageData);
+	}
 }

--- /dev/null
+++ b/src/com/wiki/standalone/moxkiriya/WikiHistory.java
@@ -0,0 +1,123 @@
+/**
+ * Moxkiriya standalone Wiki.
+ * WikiHistory.
+ * 
+ * @author Ryuhei Terada
+ * See the '<a href="{@docRoot}/copyright.html">Copyright</a>'
+ */
+package com.wiki.standalone.moxkiriya;
+
+import java.util.ArrayList;
+
+import javax.jcr.Property;
+
+/**
+ * Manage wiki history.
+ * 
+ *
+ */
+public class WikiHistory {
+	/** History list*/
+	private ArrayList<PageData> histories_ = new ArrayList<PageData>();
+
+	/** Position on history list. */
+	private int position_ = 0;
+	
+	/**
+	 * Constructor.
+	 */
+	public WikiHistory() {
+		histories_.clear();
+	}
+
+	/**
+	 * Is there an older node on a history list.
+	 * @return boolean
+	 */
+	public boolean canBack() {
+		boolean canBack = false;
+		
+		if(histories_.size() > 1) {
+			if(position_ > 0) {
+				canBack = true;
+			}
+		}
+		
+		return canBack;
+	}
+
+	/**
+	 * Is there an newer node on a history list.
+	 * @return boolean
+	 */
+	public boolean canForward() {
+		boolean canForward = false;
+		
+		if(histories_.size() > 0) {
+			if(position_ < histories_.size() - 1) {
+				canForward = true;
+			}
+		}
+		
+		return canForward;
+	}
+
+	/**
+	 * Execute history back.
+	 * @return PageData
+	 */
+	public PageData back() {
+		PageData pageData = null;
+
+		if(canBack() == true) {
+			position_--;
+			pageData = histories_.get(position_);
+		}
+		
+		return pageData;
+	}
+
+	/**
+	 * Execute history forward.
+	 * @return PageData
+	 */
+	public PageData forward() {
+		PageData pageData = null;
+		
+		if(canForward() == true) {
+			position_++;
+			pageData = histories_.get(position_);
+		}
+		
+		return pageData;
+	}
+
+	/**
+	 * Add PageData to history list.
+	 * @param pageData
+	 * @throws Exception
+	 */
+	public void add(PageData pageData) throws Exception {
+		if(histories_.size() > 0) {
+			PageData latestPage = histories_.get(position_);
+			String   uuid       = latestPage.getNode().getProperty(Property.JCR_UUID).getString();
+
+			if(pageData.getNode().getProperty(Property.JCR_UUID).getString().equals(uuid) == true) {
+				/*
+				 * History中に同じページを連続登録しようとした場合、
+				 */
+				histories_.remove(position_);
+			}
+			else {
+				position_++;				
+			}
+		}
+		
+		for(int count = position_; count < histories_.size(); count++) {
+			histories_.remove(count);
+		}
+		
+		histories_.add(pageData);
+		position_ = histories_.size() - 1;
+	}
+}

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -51,7 +51,7 @@
                 <Font size="17.0" fx:id="x1" />
               </font>
             </Button>
-            <Button fx:id="webViewMenuAnchorPaneButtonForward" disable="true" font="$x1" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" prefHeight="35.0" prefWidth="45.0" text="⇨" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="4.0" />
+            <Button fx:id="webViewMenuAnchorPaneButtonForward" disable="true" font="$x1" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" onAction="#onActionButtonForward" prefHeight="35.0" prefWidth="45.0" text="⇨" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="4.0" />
             <Button fx:id="webViewMenuAnchorPaneButtonReload" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" onAction="#onActionButtonReload" prefHeight="35.0" prefWidth="45.0" text="↻" AnchorPane.leftAnchor="250.0" AnchorPane.topAnchor="4.0">
               <font>
                 <Font size="20.0" fx:id="x2" />
@@ -90,7 +90,7 @@
           </items>
         </ComboBox>
         <Hyperlink fx:id="hyperlinkRedraw" onMouseClicked="#onMouseClickedHyperlinkRedraw" prefHeight="30.0" prefWidth="-1.0" text="%key.PageList.Label.Redraw" AnchorPane.leftAnchor="410.0" AnchorPane.topAnchor="80.0" />
-        <TableView id="TableViewContentList" fx:id="tableViewContentList" editable="true" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="400.0" prefWidth="825.0" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="110.0">
+        <TableView id="TableViewContentList" fx:id="tableViewContentList" editable="true" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="400.0" prefWidth="825.0" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="110.0">
           <columns>
             <TableColumn maxWidth="5000.0" minWidth="10.0" prefWidth="45.0" text="" fx:id="tableColumnCheck" />
             <TableColumn maxWidth="5000.0" minWidth="10.0" prefWidth="190.0" text="%key.Table.Row.Title" fx:id="tableColumnTitle" />
@@ -110,7 +110,7 @@
         <Button fx:id="buttonSave" mnemonicParsing="false" onAction="#onActionButtonSave" prefWidth="90.0" text="%key.Button.Save" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="120.0" />
         <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" />
+        <Label id="textLabelAttacheFile" fx:id="labelAttacheFile" disable="true" prefHeight="30.0" prefWidth="166.0" text="%key.Edit.Label.AttachFile" AnchorPane.bottomAnchor="65.0" AnchorPane.leftAnchor="150.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>

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -39,6 +39,7 @@ import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
@@ -109,6 +110,7 @@ public class WikiMainWindowController implements Initializable {
 	@FXML	private AnchorPane      AnchorPaneEdit;
 	@FXML	private TextField       textFieldTitle;
 	@FXML	private TextArea        textAreaContents;
+	@FXML   private Label           labelAttacheFile;
 	@FXML   private TextField       textFieldAttachFile;
 	@FXML   private Button          buttonChoiceFile;
 
@@ -373,16 +375,51 @@ public class WikiMainWindowController implements Initializable {
 	
 	@FXML
 	public void onActionButtonBack(ActionEvent event) {
-		/*
-		 * TODO implement.
-		 */
+		try {
+			String    content = wikiEngine_.back();
+			WebEngine webEngine = webView.getEngine();
+			webEngine.loadContent(content);
+			
+			HashMap<String, PageData> map     = wikiEngine_.getPageDataMap();
+			boolean                   canEdit = (map.size() != 1) ? true : false;
+
+			choiceViewHyperlinkEdit.setDisable(canEdit);		
+			menuItemNew.setDisable(false);
+
+			AnchorPaneEdit.setVisible(false);
+			AnchorPaneContentList.setVisible(false);
+			AnchorPaneWebView.setVisible(true);
+
+			webViewMenuAnchorPaneButtonBack.setDisable(!wikiEngine_.canBack());
+			webViewMenuAnchorPaneButtonForward.setDisable(!wikiEngine_.canForward());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 
 	@FXML
 	public void onActionButtonForward(ActionEvent event) {
-		/*
-		 * TODO implement.
-		 */
+		try {
+			String    content = wikiEngine_.forward();
+			WebEngine webEngine = webView.getEngine();
+			webEngine.loadContent(content);
+
+			HashMap<String, PageData> map     = wikiEngine_.getPageDataMap();
+			boolean                   canEdit = (map.size() != 1) ? true : false;
+
+			choiceViewHyperlinkEdit.setDisable(canEdit);
+			menuItemNew.setDisable(false);
+
+			AnchorPaneEdit.setVisible(false);
+			AnchorPaneContentList.setVisible(false);
+			AnchorPaneWebView.setVisible(true);
+
+			webViewMenuAnchorPaneButtonBack.setDisable(!wikiEngine_.canBack());
+			webViewMenuAnchorPaneButtonForward.setDisable(!wikiEngine_.canForward());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@FXML
@@ -577,10 +614,12 @@ public class WikiMainWindowController implements Initializable {
 						PageData pageData  = new PageData();
 						String   pageTitle = title;
 
-						namespace = title.substring(0, title.indexOf(":"));
-
 						pageData.setNamespace(WikiRepository.PROPERTY_MAIN);						
 
+						if(title.contains(":")) {
+							namespace = title.substring(0, title.indexOf(":"));
+						}
+
 						if(namespace.isEmpty() != true) {
 							pageTitle = title.substring(namespace.length() + ":".length(), title.length());
 							if(wikiEngine_.isContainsNamespaceList(namespace) == true) {
@@ -597,14 +636,12 @@ public class WikiMainWindowController implements Initializable {
 				}
 			}
 
-			if(namespace.equals(WikiEngine.NAMESPACE_FILE) == true) {
-				textFieldAttachFile.setDisable(false);
-				buttonChoiceFile.setDisable(false);
-			}
-			else {
-				textFieldAttachFile.setDisable(true);
-				buttonChoiceFile.setDisable(true);
-			}
+			boolean cannotAttacheFile = namespace.equals(WikiEngine.NAMESPACE_FILE) == true
+									? false
+									: true;
+			textFieldAttachFile.setDisable(cannotAttacheFile);
+			labelAttacheFile.setDisable(cannotAttacheFile);
+			buttonChoiceFile.setDisable(cannotAttacheFile);
 
 			/*
 			 * 各コントロールの初期値を入力する。
@@ -632,19 +669,22 @@ public class WikiMainWindowController implements Initializable {
 	 */
 	public void loadWikiContent() {
 		try {
+			WebEngine webEngine = webView.getEngine();
+			webEngine.loadContent(wikiEngine_.parse());
+
 			HashMap<String, PageData> map     = wikiEngine_.getPageDataMap();
 			boolean                   canEdit = (map.size() != 1) ? true : false;
 
 			choiceViewHyperlinkEdit.setDisable(canEdit);
 
-			WebEngine webEngine = webView.getEngine();
-
-			webEngine.loadContent(wikiEngine_.parse());
-
+			
 			menuItemNew.setDisable(false);
 			AnchorPaneEdit.setVisible(false);
 			AnchorPaneContentList.setVisible(false);
 			AnchorPaneWebView.setVisible(true);
+
+			webViewMenuAnchorPaneButtonBack.setDisable(!wikiEngine_.canBack());
+			webViewMenuAnchorPaneButtonForward.setDisable(!wikiEngine_.canForward());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

--- a/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -20,14 +20,12 @@ 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;
@@ -215,18 +213,18 @@ public class WikiRepository {
 		FileData fileData = pageData.getFileData();
 
 		if(fileData != null) {
-			Node fileNode     = node.getNode(WikiRepository.NODE_FILE);
-			
-			if(fileNode == null) {
+			Node fileNode;			
+			if(node.hasNode(WikiRepository.NODE_FILE) == true) {
+				fileNode = node.getNode(WikiRepository.NODE_FILE);
+			}
+			else {
 				fileNode     = node.addNode(WikiRepository.NODE_FILE, NodeType.NT_FILE);
 				fileNode.addNode(Property.JCR_CONTENT, NodeType.NT_RESOURCE);
 			}
 
-			Node nodeResource = fileNode.getNode(Property.JCR_CONTENT);
-
+			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()));
@@ -419,7 +417,7 @@ public class WikiRepository {
 		createCategoryPages(node);
 		
 		String uuid = node.getProperty(Property.JCR_UUID).getString();
-
+		
 		return new PageData(session_.getNodeByIdentifier(uuid));
 	}