Commit: 2c20144e0f106515aefef5692fbb3f4313bbf763 - Moxkiriya7 (git)

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

Commit MetaInfo

• Révision: 2c20144e0f106515aefef5692fbb3f4313bbf763 (tree)
• l'heure: 2018-10-09 14:19:00
• Auteur: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Message de Log

[Moxkiriya7]

• コンテンツのExport/Import機能を追加
  
• Alertダイアログのキャンセルボタンの表示/非表示の制御を修正
  *
  コンテンツを削除した場合、JCRのItemStatus例外が起こる場合があるバグを修正
  

Change Summary

• modified: src/com/wiki/standalone/moxkiriya/WikiEngine.java
• modified: 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
• modified: src/com/wiki/standalone/moxkiriya/dialog/AlertDialog.java
• modified: src/com/wiki/standalone/moxkiriya/dialog/AlertDialogController.java
• modified: src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties

Modification

--- a/src/com/wiki/standalone/moxkiriya/WikiEngine.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiEngine.java
@@ -493,6 +493,13 @@ public class WikiEngine {
 	}
 
 	/**
+	 * History clear.
+	 */
+	public void clearHistory() {
+		wikiHistory_.clear();
+	}
+	
+	/**
 	 * VersionHistory getter.
 	 * @return VersionIterator
 	 * @throws Exception 
@@ -503,6 +510,19 @@ public class WikiEngine {
 
 		return wikiRepository_.getVersionHistory(uuid);
 	}
+
+	public void importSystemView(File outputFile) throws Exception {
+		wikiRepository_.importSystemView(outputFile);
+	}
+	
+	/**
+	 * Export system view.
+	 * @param outputFile
+	 * @throws Exception 
+	 */
+	public void exportSystemView(File outputFile) throws Exception {
+		wikiRepository_.exportSystemView(outputFile);
+	}
 	
 	/**
 	 * Session closer.

--- a/src/com/wiki/standalone/moxkiriya/WikiHistory.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiHistory.java
@@ -120,4 +120,12 @@ public class WikiHistory {
 		histories_.add(pageData);
 		position_ = histories_.size() - 1;
 	}
+
+	/**
+	 * Clear history.
+	 */
+	public void clear() {
+		histories_.clear();
+		position_ = 0;
+	}
 }

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -19,6 +19,8 @@
         <Menu mnemonicParsing="false" text="%key.Menu.File">
           <items>
             <MenuItem mnemonicParsing="false" onAction="#onActionMenuItemNew" text="%key.MenuItem.New" fx:id="menuItemNew" />
+            <MenuItem mnemonicParsing="false" onAction="#onActionMenuItemImport" text="%key.MenuItem.Import" fx:id="menuItemImport" />
+            <MenuItem mnemonicParsing="false" onAction="#onActionMenuItemExport" text="%key.MenuItem.Export" fx:id="menuItemExport" />
             <MenuItem mnemonicParsing="false" onAction="#onActionMenuItemExit" text="%key.MenuItem.Exit" fx:id="menuItemExit" />
           </items>
         </Menu>

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -65,6 +65,7 @@ import javafx.scene.layout.FlowPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.FileChooser;
+import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -87,6 +88,8 @@ public class WikiMainWindowController implements Initializable {
 	 * MenuBar controls.
 	 */
 	@FXML	private MenuItem menuItemNew;
+	@FXML	private MenuItem menuItemImport;
+	@FXML	private MenuItem menuItemExport;
 	@FXML	private MenuItem menuItemExit;
 	@FXML	private MenuItem menuItemSelectParty;
 	@FXML	private MenuItem menuItemAboutMoxkiriya;
@@ -379,8 +382,65 @@ public class WikiMainWindowController implements Initializable {
 		textAreaContents.clear();
 		buildEditView("");
 	}
+
+	@FXML
+	public void onActionMenuItemImport(ActionEvent event) {
+		FileChooser fileChooser = new FileChooser();
+		
+		fileChooser.setTitle(resourceBundle_.getString("key.ImportDialog.Title"));
+		fileChooser.getExtensionFilters().addAll(new ExtensionFilter("XML Files", "*.xml"));
+
+		File selectedFile = fileChooser.showOpenDialog(stage_);
+
+		if(selectedFile != null) {
+			try {
+				wikiEngine_.importSystemView(selectedFile);
+
+				AlertDialog dialog = new AlertDialog(AlertDialog.MessageType.SuccessImport);
+				dialog.showDialog(stage_, resourceBundle_);				
+				stage_.hide();
+				stage_.getOwner().hide();
+			} catch (Exception e) {
+				e.printStackTrace();
+				try {
+					AlertDialog dialog = new AlertDialog(AlertDialog.MessageType.FailureImport);
+					dialog.showDialog(stage_, resourceBundle_);
+					stage_.hide();
+					stage_.getOwner().hide();
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}				
+			}
+		}
+	}
 	
 	@FXML
+	public void onActionMenuItemExport(ActionEvent event) {
+		FileChooser fileChooser = new FileChooser();
+		
+		fileChooser.setTitle(resourceBundle_.getString("key.ExportDialog.Title"));
+		fileChooser.getExtensionFilters().addAll(new ExtensionFilter("XML Files", "*.xml"));
+
+		File selectedFile = fileChooser.showSaveDialog(stage_);
+
+		if(selectedFile != null) {
+			try {
+				wikiEngine_.exportSystemView(selectedFile);
+				AlertDialog dialog = new AlertDialog(AlertDialog.MessageType.SuccessExport);
+				dialog.showDialog(stage_, resourceBundle_);				
+			} catch (Exception e) {
+				e.printStackTrace();
+				try {
+					AlertDialog dialog = new AlertDialog(AlertDialog.MessageType.FailureExport);
+					dialog.showDialog(stage_, resourceBundle_);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
+			}
+		}
+	}
+
+	@FXML
 	public void onActionMenuItemExit(ActionEvent event) {
 		try {
 			if (AnchorPaneEdit.isVisible() == true) {
@@ -392,6 +452,7 @@ public class WikiMainWindowController implements Initializable {
 					editMode_ = EditMode.NONE;
 					wikiEngine_.cancelCheckout();
 					stage_.hide();
+					stage_.getOwner().hide();
 				}
 			}
 			else {
@@ -700,6 +761,7 @@ public class WikiMainWindowController implements Initializable {
 				pageData  = wikiEngine_.checkin(pageData);
 			}
 
+			wikiEngine_.clearHistory();
 			wikiEngine_.setPageDataMap(WikiEngine.MAINPAGE_TITLE);
 			loadWikiContent();
 			webViewHyperlinkMain.setId("webViewHyperlinkActive");
@@ -911,7 +973,6 @@ public class WikiMainWindowController implements Initializable {
 
 			choiceViewHyperlinkEdit.setDisable(canEdit);
 
-			
 			menuItemNew.setDisable(false);
 			AnchorPaneEdit.setVisible(false);
 			AnchorPaneContentList.setVisible(false);

--- a/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -9,13 +9,17 @@
 package com.wiki.standalone.moxkiriya;
 	
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.net.NetworkInterface;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Iterator;
 
 import javax.jcr.Credentials;
+import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.Node;
@@ -605,4 +609,56 @@ public class WikiRepository {
 		
 		return versionHistory.getAllVersions();
 	}
+
+	/**
+	 * Import system view.
+	 * @param outputFile
+	 * @throws Exception
+	 */
+	public void importSystemView(File outputFile) throws Exception {
+		FileInputStream inStream = new FileInputStream(outputFile);
+
+		try {
+	    	Node root      = session_.getRootNode();
+	    	Node wikiroot  = root.getNode(NODE_WIKIROOT);
+	    	Node pagesNode = wikiroot.getNode(NODE_PAGES);
+	
+	    	session_.importXML(pagesNode.getPath(), inStream, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
+	    	session_.save();
+
+	        Node    namespaceNode = wikiroot.getNode(NODE_NAMESPACE);
+	        Value[] namespaces    = namespaceNode.getProperty(PROPERTY_NAMESPACE).getValues();
+	    	
+	        for(Value namespace: namespaces) {
+		    	HashMap<String,PageData> map = queryPageNamespace(namespace.getString());
+		    	Iterator<PageData>       iter = map.values().iterator();
+		    	while(iter.hasNext() == true) {
+		    		PageData pageData = iter.next();
+		    		checkout(pageData);
+		    		checkin(pageData);
+		    	}
+	        }
+		} finally {
+			inStream.close();
+		}
+	}
+
+	/**
+	 * Export system view.
+	 * @param outputFile
+	 * @throws Exception
+	 */
+	public void exportSystemView(File outputFile) throws Exception {
+		FileOutputStream outStream = new FileOutputStream(outputFile);
+
+		try {
+	    	Node root      = session_.getRootNode();
+	    	Node wikiroot  = root.getNode(NODE_WIKIROOT);
+	    	Node pagesNode = wikiroot.getNode(NODE_PAGES);
+	
+	    	session_.exportSystemView(pagesNode.getPath(), outStream, false, false);
+		} finally {
+			outStream.close();
+		}
+	}
 }

--- a/src/com/wiki/standalone/moxkiriya/dialog/AlertDialog.java
+++ b/src/com/wiki/standalone/moxkiriya/dialog/AlertDialog.java
@@ -19,6 +19,10 @@ public class AlertDialog extends DialogBase {
 	public enum MessageType {
 		ConfirmEditCancel,	// 編集キャンセル確認ダイアログ	
 		AlertTitleEmpty,	// Title未入力警告ダイアログ
+		SuccessImport,		// Import成功情報ダイアログ
+		FailureImport,		// Import失敗情報ダイアログ
+		SuccessExport,		// Export成功情報ダイアログ
+		FailureExport,		// Export失敗情報ダイアログ
 	};
 	
 	/**
@@ -32,6 +36,14 @@ public class AlertDialog extends DialogBase {
 	};
 
 	/**
+	 * Button種別列挙定数
+	 */
+	public enum ButtoType {
+		OK,
+		CANCEL_OK
+	}
+	
+	/**
 	 * メッセージタイプ
 	 */
 	private MessageType msgType_;

--- a/src/com/wiki/standalone/moxkiriya/dialog/AlertDialogController.java
+++ b/src/com/wiki/standalone/moxkiriya/dialog/AlertDialogController.java
@@ -4,7 +4,6 @@ import java.net.MalformedURLException;
 import java.util.LinkedHashMap;
 
 import com.wiki.standalone.moxkiriya.ResourceManager;
-import com.wiki.standalone.moxkiriya.dialog.AlertDialog.DialogType;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -36,15 +35,34 @@ public class AlertDialogController extends DialogControllerBase {
 	 * Dialogに表示するicon, メッセージ, 詳細を設定する。
 	 */
 	static class DialogProperty {
+		/**
+		 * Constructor
+		 * @param messageResourceKey
+		 * @param detailResourceKey
+		 * @param dialogType
+		 */
 		DialogProperty(String messageResourceKey, String detailResourceKey, AlertDialog.DialogType dialogType) {
+			this(messageResourceKey, detailResourceKey, dialogType, AlertDialog.ButtoType.CANCEL_OK);
+		};
+
+		/**
+		 * Constructor.
+		 * @param messageResourceKey
+		 * @param detailResourceKey
+		 * @param dialogType
+		 * @param buttonType
+		 */
+		DialogProperty(String messageResourceKey, String detailResourceKey, AlertDialog.DialogType dialogType, AlertDialog.ButtoType buttonType) {
 			messageResourceKey_ = messageResourceKey;
 			detailResourceKey_  = detailResourceKey;
 			dialogType_         = dialogType;
+			buttonType_         = buttonType;
 		};
 
 		String                 messageResourceKey_;
 		String                 detailResourceKey_;
 		AlertDialog.DialogType dialogType_;
+		AlertDialog.ButtoType  buttonType_;
 	};
 	
 	/**
@@ -62,7 +80,28 @@ public class AlertDialogController extends DialogControllerBase {
 			put(AlertDialog.MessageType.AlertTitleEmpty,
 					new DialogProperty("key.Dialog.Message.Empty.Title",
 							"key.Dialog.Detail.Input.Title",
-							AlertDialog.DialogType.Alert));
+							AlertDialog.DialogType.Alert,
+							AlertDialog.ButtoType.OK));
+			put(AlertDialog.MessageType.SuccessImport,
+					new DialogProperty("key.Dialog.Import.Result.Title",
+							"key.Dialog.Detail.Import.Success",
+							AlertDialog.DialogType.Info,
+							AlertDialog.ButtoType.OK));
+			put(AlertDialog.MessageType.FailureImport,
+					new DialogProperty("key.Dialog.Import.Result.Title",
+							"key.Dialog.Detail.Import.Failure",
+							AlertDialog.DialogType.Error,
+							AlertDialog.ButtoType.OK));
+			put(AlertDialog.MessageType.SuccessExport,
+					new DialogProperty("key.Dialog.Export.Result.Title",
+							"key.Dialog.Detail.Export.Success",
+							AlertDialog.DialogType.Info,
+							AlertDialog.ButtoType.OK));
+			put(AlertDialog.MessageType.FailureExport,
+					new DialogProperty("key.Dialog.Export.Result.Title",
+							"key.Dialog.Detail.Export.Failure",
+							AlertDialog.DialogType.Error,
+							AlertDialog.ButtoType.OK));
 		}
 	};
 
@@ -90,7 +129,7 @@ public class AlertDialogController extends DialogControllerBase {
 			/*
 			 * ボタンを設定する。
 			 */
-			if(dialogProperty.dialogType_ == DialogType.Alert) {
+			if(dialogProperty.buttonType_ == AlertDialog.ButtoType.OK) {
 				buttonCancel.setVisible(false);
 			}
 			else {

--- a/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
+++ b/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
@@ -26,6 +26,8 @@ key.Menu.Edit: Edit
 key.Menu.Help: Help
 
 key.MenuItem.New: New
+key.MenuItem.Import: Import
+key.MenuItem.Export: Export
 key.MenuItem.Exit: Exit
 key.MenuItem.Select.Party: Select a party
 key.MenuItem.About.Moxkiriya: About Moxkiriya.
@@ -87,6 +89,17 @@ key.Dialog.Detail.Cancel.Editing: Discard the editing content when you cancel ed
 key.Dialog.Message.Empty.Title: Title is empty.
 key.Dialog.Detail.Input.Title: Please input title.
 
+key.Dialog.Import.Result.Title: Import result.
+key.Dialog.Detail.Import.Success: Succeeded to import.\nExit application to refresh a repository.
+key.Dialog.Detail.Import.Failure: Failed to import.
+
+key.Dialog.Export.Result.Title: Export result.
+key.Dialog.Detail.Export.Success: Succeeded to Export.
+key.Dialog.Detail.Export.Failure: Failed to Export.
+
+key.ImportDialog.Title: Select an import file
+key.ExportDialog.Title: Select an export file
+
 key.EditAttachedFileDialog.Title: Edit attach files.
 key.EditAttachedFileDialog.Button.DeleteCheckedFiles: Delete checked files
 key.EditAttachedFileDialog.Addfiles.DialogTitle: Select attach files.