Revert "Code cleanup"

Author: JulienKluge

Deploy/SpeditUpdater/Program.cs

@@ -1,6 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Threading;
 using System.Diagnostics;
+using System.Windows;
 using System.Windows.Forms;
 using System.IO;
 using System.IO.Compression;
@@ -12,66 +17,61 @@ public static class Program
         [STAThread]
         public static void Main()
         {
-            var process = Process.GetProcessesByName("Spedit.exe");
-
-            if (process.Length > 0)
+            Process[] p = Process.GetProcessesByName("Spedit.exe");
+            if (p.Length > 0)
             {
-                foreach (var p in process)
+                for (int i = 0; i < p.Length; ++i)
+                {
                     try
                     {
-                        p.WaitForExit();
-                    }
-                    catch (Exception)
-                    {
-                        // ignored
+                        p[i].WaitForExit();
                     }
+                    catch (Exception) { }
+                }
             }
-
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(true);
-
-            var um = new UpdateMarquee();
+            UpdateMarquee um = new UpdateMarquee();
             um.Show();
-
-            Application.DoEvents();
-
-            var t = new Thread(Worker);
+            Application.DoEvents(); //execute Visual
+            Thread t = new Thread(new ParameterizedThreadStart(Worker));
             t.Start(um);
-
             Application.Run(um);
         }
 
         private static void Worker(object arg)
         {
-            var um = (UpdateMarquee) arg;
-            var zipFile = Path.Combine(Environment.CurrentDirectory, "updateZipFile.zip");
-            var zipFileContent = Properties.Resources.spedit1_2_0_1Update;
+            UpdateMarquee um = (UpdateMarquee)arg;
+            string zipFile = Path.Combine(Environment.CurrentDirectory, "updateZipFile.zip");
+
+            byte[] zipFileContent = SpeditUpdater.Properties.Resources.spedit1_2_0_1Update;
 
             File.WriteAllBytes(zipFile, zipFileContent);
 
-            var zipInfo = new FileInfo(zipFile);
-            var extractPath = Environment.CurrentDirectory;
+            FileInfo zipInfo = new FileInfo(zipFile);
 
-            using (var archieve = ZipFile.OpenRead(zipInfo.FullName))
+            string extractPath = Environment.CurrentDirectory;
+            using (ZipArchive archieve = ZipFile.OpenRead(zipInfo.FullName))
             {
                 var entries = archieve.Entries;
-
                 foreach (var entry in entries)
                 {
-                    var full = Path.Combine(extractPath, entry.FullName);
-                    var fInfo = new FileInfo(full);
-
+                    string full = Path.Combine(extractPath, entry.FullName);
+                    FileInfo fInfo = new FileInfo(full);
                     if (!Directory.Exists(fInfo.DirectoryName))
-                        if (fInfo.DirectoryName != null)
-                            Directory.CreateDirectory(fInfo.DirectoryName);
-
+                    {
+                        Directory.CreateDirectory(fInfo.DirectoryName);
+                    }
                     entry.ExtractToFile(fInfo.FullName, true);
                 }
             }
 
             zipInfo.Delete();
 
-            um.Invoke((InvokeDel) (() => { um.SetToReadyState(); }));
+            um.Invoke((InvokeDel)(() =>
+            {
+                um.SetToReadyState();
+            }));
         }
 
         public delegate void InvokeDel();

Deploy/SpeditUpdater/UpdateMarquee.cs

@@ -1,4 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace SpeditUpdater
@@ -8,21 +15,21 @@ public partial class UpdateMarquee : Form
         public UpdateMarquee()
         {
             InitializeComponent();
-
-            pictureBox1.Image = Properties.Resources.IconPng;
+            Bitmap bmp = SpeditUpdater.Properties.Resources.IconPng;
+            pictureBox1.Image = (Image)bmp;
         }
 
         public void SetToReadyState()
         {
-            label1.Text = @"SPEdit got updated!";
+            label1.Text = "SPEdit got updated!";
             progressBar1.Visible = false;
             button1.Visible = true;
-            UseWaitCursor = false;
+            this.UseWaitCursor = false;
         }
 
         private void button1_Click(object sender, EventArgs e)
         {
-            Close();
+            this.Close();
         }
     }
 }