From c793466e5e0863a569e5ece4fadc7127b57320ac Mon Sep 17 00:00:00 2001
From: BlubbFish <git@blubbfish.net>
Date: Sun, 23 Apr 2017 21:07:41 +0000
Subject: [PATCH] [WP] Refactoring so its in common to C#

---
 svnsync/Helpers/Handles.cs               |  2 +-
 svnsync/Libraries/Svn.cs                 | 13 ++++++++++++-
 svnsync/Program.cs                       |  7 ++++---
 svnsync/Views/ViewsTray.cs               |  2 +-
 svnsync/Views/ViewsWindow.cs             |  5 -----
 svnsync/Views/ViewsWindowFormError.cs    |  7 ++-----
 svnsync/Views/ViewsWindowFormFileList.cs |  7 ++-----
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/svnsync/Helpers/Handles.cs b/svnsync/Helpers/Handles.cs
index 4e59337..e22a4a9 100644
--- a/svnsync/Helpers/Handles.cs
+++ b/svnsync/Helpers/Handles.cs
@@ -31,7 +31,7 @@ namespace svnsync.Helpers
     public SvnLockedException(String message) : base(message) { }
     public SvnLockedException(String message, System.Exception inner) : base(message, inner) { }
     protected SvnLockedException(System.Runtime.Serialization.SerializationInfo info,
-      System.Runtime.Serialization.StreamingContext context)
+      System.Runtime.Serialization.StreamingContext context) : base(info, context)
     { }
   }
   public class TreePart {
diff --git a/svnsync/Libraries/Svn.cs b/svnsync/Libraries/Svn.cs
index e9e6d21..494510a 100644
--- a/svnsync/Libraries/Svn.cs
+++ b/svnsync/Libraries/Svn.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace svnsync.Libraries {
-  class Svn {
+  class Svn : IDisposable {
     private String dir;
     private Process p = new Process();
     private List<String> modified;
@@ -202,5 +202,16 @@ namespace svnsync.Libraries {
     internal void ClearError() {
       this.SvnError = "";
     }
+
+    protected virtual void Dispose(Boolean disposing) {
+      if (disposing) {
+        this.p.Close();
+      }
+    }
+
+    public void Dispose() {
+      Dispose(true);
+      GC.SuppressFinalize(this);
+    }
   }
 }
diff --git a/svnsync/Program.cs b/svnsync/Program.cs
index 6146fff..c8616f7 100644
--- a/svnsync/Program.cs
+++ b/svnsync/Program.cs
@@ -65,11 +65,12 @@ namespace svnsync
     }
 
     private static void Update() {
-      Updater.Instance.SetPath("https://svn.blubbfish.net:18082/");
-      Updater.Instance.UpdateResult += Instance_UpdateResult;
+      Updater.Instance.SetPath("https://svn.blubbfish.net:18082/", new String[] { typeof(Program).Assembly.GetName().Version.ToString(), typeof(Updater).Assembly.GetName().Version.ToString() });
+      Updater.Instance.UpdateResult += HasUpdate;
+      Updater.Instance.Check();
     }
 
-    private static void Instance_UpdateResult(Object sender, Updater.UpdaterEventArgs e) {
+    private static void HasUpdate(Object sender, Updater.UpdaterEventArgs e) {
       if(e.HasUpdates) {
         ((Updater)sender).Update("SvnSync.exe", "https://");
       }
diff --git a/svnsync/Views/ViewsTray.cs b/svnsync/Views/ViewsTray.cs
index fcdab20..8377bd2 100644
--- a/svnsync/Views/ViewsTray.cs
+++ b/svnsync/Views/ViewsTray.cs
@@ -20,7 +20,7 @@ namespace svnsync.Views
     /// View of a Tray
     /// </summary>
     public ViewsTray() {
-      this.Init();
+      
       this.Model = ModelsTray.Instance;
       this.Model.SetObserver(this);
     }
diff --git a/svnsync/Views/ViewsWindow.cs b/svnsync/Views/ViewsWindow.cs
index 8b7602a..67c4c4a 100644
--- a/svnsync/Views/ViewsWindow.cs
+++ b/svnsync/Views/ViewsWindow.cs
@@ -9,11 +9,6 @@ namespace svnsync.Views
   {
     private IViewsWindowFormInterface form;
     public ModelsWindow Model { get; private set; }
-    
-    public ViewsWindow()
-    {
-      this.Init();
-    }
 
     public override void Update()
     {
diff --git a/svnsync/Views/ViewsWindowFormError.cs b/svnsync/Views/ViewsWindowFormError.cs
index f100f69..f40398f 100644
--- a/svnsync/Views/ViewsWindowFormError.cs
+++ b/svnsync/Views/ViewsWindowFormError.cs
@@ -41,11 +41,8 @@ namespace svnsync.Views {
       this.model = window;
     }
     new public void Dispose() {
-      this.BeginInvoke((Action)(() => {
-        this.Visible = false;
-        this.ShowInTaskbar = false;
-      }));
-      base.Dispose(true);
+      Dispose(true);
+      GC.SuppressFinalize(this);
     }
   }
 }
diff --git a/svnsync/Views/ViewsWindowFormFileList.cs b/svnsync/Views/ViewsWindowFormFileList.cs
index 760241e..619eee4 100644
--- a/svnsync/Views/ViewsWindowFormFileList.cs
+++ b/svnsync/Views/ViewsWindowFormFileList.cs
@@ -46,11 +46,8 @@ namespace svnsync.Views {
       this.model = window;
     }
     new public void Dispose() {
-      this.BeginInvoke((Action)(() => {
-        this.Visible = false;
-        this.ShowInTaskbar = false;
-      }));
-      base.Dispose(true);
+      Dispose(true);
+      GC.SuppressFinalize(this);
     }
   }
 }