Commit: 8 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 8 (tree)
• Time: 2013-12-30 19:03:32
• Author: c477

Log Message

例外処理の改善と条件付リソース（オーバーライド）の基本インターフェース

Change Summary

• modified: starter/Starter.cs
• modified: ui_jp/ui/system/ErrorMessageBox.cs

Incremental Difference

--- starter/Starter.cs	(revision 7)
+++ starter/Starter.cs	(revision 8)
@@ -24,7 +24,8 @@
                 try {
                     run(args);
                 } catch (Exception e) {
-                    UIUtil.ShowException("エラーが発生しました", e, UIInformLevel.normal);
+                    if(UIUtil.ShowException("エラーが発生しました", e, UIInformLevel.normal))
+                        throw;
                 }
             }
 		}
@@ -35,7 +36,8 @@
 		}
 
         static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) {
-            UIUtil.ShowException(e.Exception.Message, e.Exception, UIInformLevel.severe);
+            if(UIUtil.ShowException(e.Exception.Message, e.Exception, UIInformLevel.severe))
+                throw e.Exception;
         }
 	}
 }

--- ui_jp/ui/system/ErrorMessageBox.cs	(revision 7)
+++ ui_jp/ui/system/ErrorMessageBox.cs	(revision 8)
@@ -21,10 +21,10 @@
 		/// Displays a dialog box and returns after the dialog is closed.
 		/// </summary>
 		/// <param name="owner">can be null.</param>
-		public static bool Show( IWin32Window owner, string msg, Exception e ) {
+        public static DialogResult Show(IWin32Window owner, string msg, Exception e) {
 			using( Form f = new ErrorMessageBox(msg,e) ) {
                 DialogResult res = f.ShowDialog(owner);
-				return (res == DialogResult.Abort);
+				return res;
 			}
 		}
 
@@ -188,6 +188,7 @@
             // throwButton
             // 
             this.throwButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.throwButton.DialogResult = System.Windows.Forms.DialogResult.Retry;
             this.throwButton.Location = new System.Drawing.Point(190, 220);
             this.throwButton.Name = "throwButton";
             this.throwButton.Size = new System.Drawing.Size(134, 23);
@@ -194,7 +195,6 @@
             this.throwButton.TabIndex = 7;
             this.throwButton.Text = "再throw(開発用)";
             this.throwButton.UseVisualStyleBackColor = true;
-            this.throwButton.Click += new System.EventHandler(this.throwButton_Click);
             // 
             // abortButton
             // 
@@ -238,8 +238,7 @@
         }
 
         private void throwButton_Click(object sender, EventArgs e) {
-            Debug.WriteLine(detail.Text);
-            throw exception;
+
         }
 	}
 }