提交: 318d35df6e23b82183ff6a3dd6dc80dc1085a7b5 - Moxkiriya7 (git)

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

Commit MetaInfo

• 修订版: 318d35df6e23b82183ff6a3dd6dc80dc1085a7b5 (tree)
• 时间: 2018-10-20 22:20:54
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• HistoryコンテンツViewにRestore this
  versionボタンを追加(選択バージョンへリストアする機能を追加)
  
• Histori list Viewで現在のベースバージョンを強調表紙するように修正
  

更改概述

• 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/application.css
• modified: src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties

差异

--- a/src/com/wiki/standalone/moxkiriya/WikiEngine.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiEngine.java
@@ -20,6 +20,7 @@ import java.util.ResourceBundle;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.Value;
+import javax.jcr.version.Version;
 import javax.jcr.version.VersionIterator;
 
 import com.wiki.standalone.moxkiriya.parser.blockparser.WikiBodyBlockParser;
@@ -538,6 +539,32 @@ public class WikiEngine {
 		return wikiRepository_.getVersionHistory(uuid);
 	}
 
+	/**
+	 * Base version getter.
+	 * @return Version
+	 * @throws Exception
+	 */
+	public Version getBaseVersion() throws Exception {
+		PageData pageData = pageDataMap_.values().iterator().next();
+
+		return wikiRepository_.getBaseVersion(pageData.getNode());
+	}
+	
+	/**
+	 * Restore version.
+	 * @param version
+	 * @throws Exception 
+	 */
+	public void restoreVersion(Version version) throws Exception {
+		PageData pageData = pageDataMap_.values().iterator().next();
+		wikiRepository_.restoreVersion(version, pageData.getNode());
+	}
+
+	/**
+	 * Import system vies.
+	 * @param outputFile
+	 * @throws Exception
+	 */
 	public void importSystemView(File outputFile) throws Exception {
 		wikiRepository_.importSystemView(outputFile);
 	}

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -104,7 +104,7 @@
         </AnchorPane>
         <AnchorPane id="webViewHistoryAnchorPane" fx:id="webViewAnchorPaneHistory" prefHeight="528.0" prefWidth="843.0" style="" styleClass="webViewMainAnchorPane" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="180.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="85.0">
           <children>
-            <AnchorPane fx:id="webViewHistoryBreadcrumbs" prefHeight="35.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="5.0">
+            <AnchorPane fx:id="webViewHistoryBreadcrumbs" prefHeight="35.0" prefWidth="200.0" visible="true" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="5.0">
               <children>
                 <FlowPane fx:id="webViewHistoryBreadcrumbsPane" prefHeight="40.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                   <padding>
@@ -119,10 +119,11 @@
             <ListView fx:id="webViewHistoryListView" prefHeight="200.0" prefWidth="200.0" visible="true" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="40.0" />
             <AnchorPane fx:id="webViewHistoryAnchorPaneContent" prefHeight="200.0" prefWidth="200.0" styleClass="webViewHistoryContentAnchorPane" visible="false" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="40.0">
               <children>
-                <Label font="$x3" prefHeight="30.0" text="%key.History.Content.Title" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="30.0" />
-                <TextField fx:id="webViewHistoryTextFieldTitle" alignment="CENTER_LEFT" editable="false" focusTraversable="false" prefHeight="30.0" prefWidth="200.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="60.0" />
-                <Label prefHeight="30.0" text="%key.Edit.Label.Contents" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="110.0" />
-                <TextArea fx:id="webViewHistorytextAreaContents" editable="false" focusTraversable="false" prefWidth="200.0" wrapText="true" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="140.0" />
+                <Label font="$x3" prefHeight="30.0" text="%key.History.Content.Title" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="10.0" />
+                <TextField fx:id="webViewHistoryTextFieldTitle" alignment="CENTER_LEFT" editable="false" focusTraversable="false" prefHeight="30.0" prefWidth="200.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="40.0" />
+                <Label prefHeight="30.0" text="%key.Edit.Label.Contents" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="90.0" />
+                <TextArea fx:id="webViewHistorytextAreaContents" editable="false" focusTraversable="false" prefWidth="200.0" wrapText="true" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="30.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="120.0" />
+                <Button fx:id="webViewHistoryButtonRestoreVersion" maxHeight="-Infinity" mnemonicParsing="false" onAction="#onActionButtonRestoreVersion" prefHeight="30.0" text="%key.Button.Restore.Version" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="30.0" />
               </children>
               <stylesheets>
                 <URL value="@application.css" />

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -132,6 +132,7 @@ public class WikiMainWindowController implements Initializable {
 	@FXML   private AnchorPane webViewHistoryAnchorPaneContent;
 	@FXML   private TextField  webViewHistoryTextFieldTitle;
 	@FXML	private TextArea   webViewHistorytextAreaContents;
+	@FXML   private Button     webViewHistoryButtonRestoreVersion;
 
 	/*
 	 * editAnchorPane controls.
@@ -180,6 +181,9 @@ public class WikiMainWindowController implements Initializable {
 	 * Version history list item
 	 */
 	public class VersionHistoryListItem {
+		/** version */
+		private Version version_;
+		
 		/** Created data. */
 		private Date created_;
 		
@@ -191,12 +195,21 @@ public class WikiMainWindowController implements Initializable {
 		 * @param created
 		 * @param node
 		 */
-		public VersionHistoryListItem(Date created, Node node) {
+		public VersionHistoryListItem(Version version, Date created, Node node) {
+			version_ = version;
 			created_ = created;
 			node_    = node;
 		}
 
 		/**
+		 * Version getter.
+		 * @return Version
+		 */
+		public Version getVersion() {
+			return version_;
+		}
+		
+		/**
 		 * Created getter.
 		 * @return Date
 		 */
@@ -301,47 +314,59 @@ public class WikiMainWindowController implements Initializable {
 				return new ListCell<VersionHistoryListItem>() {
 					@Override
 					protected void updateItem(VersionHistoryListItem item, boolean empty) {
-						super.updateItem(item, empty);
-						if(empty != true) {
-							Hyperlink hyperlinkCreated = new Hyperlink(item.getCreated().toString());
-							
-							hyperlinkCreated.setUserData(item.getNode());
-							hyperlinkCreated.setOnAction(new EventHandler<ActionEvent>() {
-								@Override
-								public void handle(ActionEvent event) {
-									try {
-										ObservableList<javafx.scene.Node> breadcrumbsList = webViewHistoryBreadcrumbsPane.getChildren();
-										
-										breadcrumbsList.clear();
-										breadcrumbsList.add(createBreadcrumbsHyperlink("key.History.Breadcrumbs.List", 
-												new EventHandler<ActionEvent>() {
-											@Override
-											public void handle(ActionEvent event) {
-												ObservableList<javafx.scene.Node> breadcrumbsList = webViewHistoryBreadcrumbsPane.getChildren();
-												
-												breadcrumbsList.clear();
-												breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.List"));
-												webViewHistoryListView.setVisible(true);
-												webViewHistoryAnchorPaneContent.setVisible(false);
-											}
-										}));
-										breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.Separator"));
-										breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.Content"));
+						try {
+							super.updateItem(item, empty);
+							if(empty != true) {
+								Hyperlink hyperlinkCreated = new Hyperlink(item.getCreated().toString());
+								Version   version          = item.getVersion();
+								Version   baseVersion      = wikiEngine_.getBaseVersion();
+								
+								if(version.getIdentifier().equals(baseVersion.getIdentifier()) == true) {
+									hyperlinkCreated.setId("webViewHistoryBaseVersion");
+								}
+								
+								hyperlinkCreated.setUserData(item);
+								hyperlinkCreated.setOnAction(new EventHandler<ActionEvent>() {
+									@Override
+									public void handle(ActionEvent event) {
+										try {
+											ObservableList<javafx.scene.Node> breadcrumbsList = webViewHistoryBreadcrumbsPane.getChildren();
+											
+											breadcrumbsList.clear();
+											breadcrumbsList.add(createBreadcrumbsHyperlink("key.History.Breadcrumbs.List", 
+													new EventHandler<ActionEvent>() {
+												@Override
+												public void handle(ActionEvent event) {
+													ObservableList<javafx.scene.Node> breadcrumbsList = webViewHistoryBreadcrumbsPane.getChildren();
+													
+													breadcrumbsList.clear();
+													breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.List"));
+													webViewHistoryListView.setVisible(true);
+													webViewHistoryAnchorPaneContent.setVisible(false);
+												}
+											}));
+											breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.Separator"));
+											breadcrumbsList.add(createBreadcrumbsLabel("key.History.Breadcrumbs.Content"));
+		
+											Hyperlink              target = (Hyperlink)event.getTarget();
+											VersionHistoryListItem item   = (VersionHistoryListItem)target.getUserData();
+											Node                   node   = item.getNode();
 	
-										Hyperlink target = (Hyperlink)event.getTarget();
-										Node      node   = (Node)target.getUserData();
-
-										webViewHistoryTextFieldTitle.setText(node.getProperty(WikiRepository.PROPERTY_TITLE).getString());
-										webViewHistorytextAreaContents.setText((node.getProperty(WikiRepository.PROPERTY_CONTENT).getString()));
-
-										webViewHistoryListView.setVisible(false);
-										webViewHistoryAnchorPaneContent.setVisible(true);
-									} catch (Exception e) {
-										e.printStackTrace();
-									}
-								}								
-							});
-							setGraphic(hyperlinkCreated);
+											webViewHistoryTextFieldTitle.setText(node.getProperty(WikiRepository.PROPERTY_TITLE).getString());
+											webViewHistorytextAreaContents.setText((node.getProperty(WikiRepository.PROPERTY_CONTENT).getString()));
+											webViewHistoryAnchorPaneContent.setUserData(item);
+	
+											webViewHistoryListView.setVisible(false);
+											webViewHistoryAnchorPaneContent.setVisible(true);
+										} catch (Exception e) {
+											e.printStackTrace();
+										}
+									}								
+								});
+								setGraphic(hyperlinkCreated);
+							}
+						} catch (Exception e1) {
+							e1.printStackTrace();
 						}
 					}
 				};
@@ -747,7 +772,7 @@ public class WikiMainWindowController implements Initializable {
 				while(nodeIter.hasNext() == true) {
 					Node node = nodeIter.nextNode();
 					
-					list.add(new VersionHistoryListItem(version.getCreated().getTime(), node));
+					list.add(new VersionHistoryListItem(version, version.getCreated().getTime(), node));
 				}
 			}
 
@@ -762,6 +787,24 @@ public class WikiMainWindowController implements Initializable {
 			e.printStackTrace();
 		}
 	}
+
+	@FXML
+	public void onActionButtonRestoreVersion(ActionEvent event) {
+		try {
+			VersionHistoryListItem item = (VersionHistoryListItem)webViewHistoryAnchorPaneContent.getUserData();
+			wikiEngine_.restoreVersion(item.getVersion());
+
+			wikiEngine_.refreshSession();
+			loadWikiContent();
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
+			webViewAnchorPaneMain.setVisible(true);
+			webViewAnchorPaneHistory.setVisible(false);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 	
 	@FXML
 	public void onActionButtonDeletePages(ActionEvent event) {

--- a/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -34,6 +34,7 @@ import javax.jcr.Workspace;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
+import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
@@ -611,6 +612,32 @@ public class WikiRepository {
 	}
 
 	/**
+	 * Base version getter.
+	 * @param node
+	 * @return Version
+	 * @throws Exception
+	 */
+	public Version getBaseVersion(Node node) throws Exception {
+		Workspace      workspace      = session_.getWorkspace();
+		VersionManager versionMgr     = workspace.getVersionManager();
+		
+		return versionMgr.getBaseVersion(node.getPath());
+	}
+	
+	/**
+	 * Restore version.
+	 * @param version
+	 * @param node
+	 * @throws Exception
+	 */
+	public void restoreVersion(Version version, Node node) throws Exception {
+		Workspace      workspace      = session_.getWorkspace();
+		VersionManager versionMgr     = workspace.getVersionManager();
+
+		versionMgr.restore(version, true);
+	}
+	
+	/**
 	 * Import system view.
 	 * @param outputFile
 	 * @throws Exception

--- a/src/com/wiki/standalone/moxkiriya/application.css
+++ b/src/com/wiki/standalone/moxkiriya/application.css
@@ -52,4 +52,9 @@
 #webViewBreadcrumbs {	
 	-fx-alignment: center-left;
 	-fx-padding: 0.0 2.0 0.0 2.0;
+}
+
+#webViewHistoryBaseVersion {
+	-fx-font-weight: bold;
+	-fx-text-fill: crimson;
 }
\ No newline at end of file

--- a/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
+++ b/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
@@ -22,6 +22,7 @@ key.Button.Add.Category: Add new category
 key.Button.Delete.Pages: Delete selected pages
 key.Button.Add.Party: Add new party
 key.Button.Preview: Preview
+key.Button.Restore.Version: Restore this version
 
 key.Menu.File: File
 key.Menu.Edit: Edit