提交: 5a43448089149519d2dea859fcb03abcb6980c2d - Moxkiriya7 (git)

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

Commit MetaInfo

• 修订版: 5a43448089149519d2dea859fcb03abcb6980c2d (tree)
• 时间: 2018-10-09 17:49:30
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

*
SelectPartyダイアログでCancelした場合、_party.configにゴミデータを挿入するバグを修正
*
ConfigSettingダイアログを強制クローズした場合、ゴミファイルを生成後、NullPointerExceptionで落ちるバグを修正

更改概述

• modified: src/com/wiki/standalone/moxkiriya/Main.java
• modified: src/com/wiki/standalone/moxkiriya/SettingManager.java
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java

差异

--- a/src/com/wiki/standalone/moxkiriya/Main.java
+++ b/src/com/wiki/standalone/moxkiriya/Main.java
@@ -88,6 +88,11 @@ public class Main extends Application {
 			} while(closeType != WikiMainWindow.CloseType.EXIT);
 		} catch(Exception e) {
 			e.printStackTrace();
+		} finally {
+			if(wikiMainWindow_ != null) {
+				wikiMainWindow_.closeSession();
+			}
+			primaryStage_.hide();
 		}
 	}
 
@@ -97,26 +102,29 @@ public class Main extends Application {
 	 */
 	private WikiMainWindow.CloseType showWikiMainWindow() throws Exception {
 		WikiMainWindow.CloseType closeType = WikiMainWindow.CloseType.EXIT;
+		String                   appRoot   = settingManager_.get(SettingManager.SETINGKEY_MOXKIRIYAROOT);
 
-		String  appRoot      = settingManager_.get(SettingManager.SETINGKEY_MOXKIRIYAROOT);
-		File    wikirootPath = new File(appRoot + "/" + WikiEngine.WIKIROOT_DIRECTORY);
-
-		if (wikirootPath != null) {
-			wikirootPath.mkdirs();
-
-			wikiMainWindow_ = new WikiMainWindow(primaryStage_, resources_);
-
-			/*
-			 * wikirootに MainPageを構築する。
-			 */
-			wikiMainWindow_.buildWikiMainTree(wikirootPath);
-
-			/*
-			 * 外部リンクアイコン画像をApprootにアップロードする。
-			 */
-			wikiMainWindow_.uploadResourcefile(appRoot + "/", "icon/Icon_External_Link.png");
-
-			closeType = wikiMainWindow_.show();
+		if(appRoot != null) {
+			File    wikirootPath = new File(appRoot + "/" + WikiEngine.WIKIROOT_DIRECTORY);
+	
+			if (wikirootPath != null) {
+				wikirootPath.mkdirs();
+	
+				wikiMainWindow_ = new WikiMainWindow(primaryStage_, resources_);
+	
+				/*
+				 * wikirootに MainPageを構築する。
+				 */
+				wikiMainWindow_.buildWikiMainTree(wikirootPath);
+	
+				/*
+				 * 外部リンクアイコン画像をApprootにアップロードする。
+				 */
+				wikiMainWindow_.uploadResourcefile(appRoot + "/icon/Icon_External_Link.png",
+						"icon/Icon_External_Link.png");
+	
+				closeType = wikiMainWindow_.show();
+			}
 		}
 		
 		return closeType;
@@ -164,9 +172,15 @@ public class Main extends Application {
 		Hashtable<String, String> settingsTable = dialog.getSettingsTable();
 		String                    path          = settingManager_.get(SettingManager.SETTINGSKEY_MOXKIRIYA_USER_DIR);
 
-		settingManager_.putParty(selectedParty, dialog.getDefaultPartyCheckValue());
-		settingManager_.savePartyConfig(path);
-		settingManager_.saveSettingConfig(path, selectedParty, settingsTable);
-		settingManager_.loadSettingFiles(path);
+		if(selectedParty.isEmpty() == true) {
+			selectedParty = dialog.getPartyName();
+		}
+
+		if(selectedParty.isEmpty() != true) {
+			settingManager_.putParty(selectedParty, dialog.getDefaultPartyCheckValue());
+			settingManager_.savePartyConfig(path);
+			settingManager_.saveSettingConfig(path, selectedParty, settingsTable);
+			settingManager_.loadSettingFiles(path);
+		}
 	}
 }

--- a/src/com/wiki/standalone/moxkiriya/SettingManager.java
+++ b/src/com/wiki/standalone/moxkiriya/SettingManager.java
@@ -279,14 +279,16 @@ public class SettingManager {
 	 * @param isDefault
 	 */
 	public void putParty(String partyName, boolean isDefault) {
-		if(isDefault == true) {
-			Set<String> keySet = partyTable_.keySet();
-			
-			for(String key: keySet) {
-				partyTable_.put(key, false);
+		if(partyName.isEmpty() != true) {
+			if(isDefault == true) {
+				Set<String> keySet = partyTable_.keySet();
+				
+				for(String key: keySet) {
+					partyTable_.put(key, false);
+				}
 			}
+			partyTable_.put(partyName, isDefault);
 		}
-		partyTable_.put(partyName, isDefault);
 	}
 	
 	/**

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -399,14 +399,12 @@ public class WikiMainWindowController implements Initializable {
 				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();
 				}				
@@ -452,7 +450,6 @@ public class WikiMainWindowController implements Initializable {
 					editMode_ = EditMode.NONE;
 					wikiEngine_.cancelCheckout();
 					stage_.hide();
-					stage_.getOwner().hide();
 				}
 			}
 			else {