From b1c3d338f015f671ba25c15e32859a4f7cb48636 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 18 Apr 2017 12:27:11 +0000 Subject: [PATCH] Automatic Cronjob Checkin: 20170418-142622 --- svnsync/Controllers/ControllersTray.cs | 13 ++-- svnsync/Controllers/ControllersWindow.cs | 8 +-- svnsync/Helpers/Handles.cs | 14 ++-- svnsync/Helpers/TreeBuilder.cs | 85 +++++++++++++---------- svnsync/Models/ModelsWindow.cs | 4 +- svnsync/Views/ViewsTray.cs | 1 - svnsync/Views/ViewsWindow.cs | 4 +- svnsync/Views/ViewsWindowForm.cs | 2 +- svnsync/Views/ViewsWindowFormError.cs | 4 +- svnsync/Views/ViewsWindowFormFileList.cs | 10 +-- svnsync/Views/ViewsWindowFormInterface.cs | 2 +- svnsync/svnsync.csproj | 2 +- svnsync/svnsync.csproj.user | 2 +- 13 files changed, 79 insertions(+), 72 deletions(-) diff --git a/svnsync/Controllers/ControllersTray.cs b/svnsync/Controllers/ControllersTray.cs index 66d5fb7..fb7221b 100644 --- a/svnsync/Controllers/ControllersTray.cs +++ b/svnsync/Controllers/ControllersTray.cs @@ -10,7 +10,6 @@ namespace svnsync.Controllers { private static ViewsTray viewTray; private static ControllersWindow controllerWindow; - //private string args; public delegate void _enableLoopRun(); public static event _enableLoopRun StartLoop; @@ -170,12 +169,12 @@ namespace svnsync.Controllers System.Windows.Forms.Application.Exit(); } - internal static void DeleteButton_Click(object sender, EventArgs e) { + internal static void DeleteButton_Click(Object sender, EventArgs e) { if(!(sender is System.Windows.Forms.Button)) { return; } System.Windows.Forms.TreeView t = (System.Windows.Forms.TreeView)((ViewsWindowFormFileList)((System.Windows.Forms.Button)sender).Parent).tree; - List l = TreeBuilder.getSelectedNodes(t.Nodes); + List l = TreeBuilder.GetSelectedNodes(t.Nodes); controllerWindow.Dispose(); System.Windows.Forms.Application.DoEvents(); InitControllerWindow(); @@ -186,7 +185,7 @@ namespace svnsync.Controllers } RunAgainButton_Click(sender, null); } - internal static void RunAgainButton_Click(object sender, EventArgs e) { + internal static void RunAgainButton_Click(Object sender, EventArgs e) { controllerWindow.Dispose(); System.Windows.Forms.Application.DoEvents(); InitControllerWindow(); @@ -194,7 +193,7 @@ namespace svnsync.Controllers Runner(); } - internal static void SvnOpenButton_Click(object sender, EventArgs e) { + internal static void SvnOpenButton_Click(Object sender, EventArgs e) { System.Diagnostics.Process p = new System.Diagnostics.Process(); p.StartInfo.FileName = "cmd"; p.StartInfo.WorkingDirectory = viewTray.Model.Args.GetArgumentData("-d"); @@ -202,12 +201,12 @@ namespace svnsync.Controllers p.Start(); } - internal static void AddButton_Click(object sender, EventArgs e) { + internal static void AddButton_Click(Object sender, EventArgs e) { if(!(sender is System.Windows.Forms.Button)) { return; } System.Windows.Forms.TreeView t = (System.Windows.Forms.TreeView)((ViewsWindowFormFileList)((System.Windows.Forms.Button)sender).Parent).tree; - List l = TreeBuilder.getSelectedNodes(t.Nodes); + List l = TreeBuilder.GetSelectedNodes(t.Nodes); controllerWindow.Dispose(); System.Windows.Forms.Application.DoEvents(); InitControllerWindow(); diff --git a/svnsync/Controllers/ControllersWindow.cs b/svnsync/Controllers/ControllersWindow.cs index 43e8bd8..79e8faa 100644 --- a/svnsync/Controllers/ControllersWindow.cs +++ b/svnsync/Controllers/ControllersWindow.cs @@ -12,8 +12,8 @@ namespace svnsync.Controllers private static ViewsWindow viewWindow; private Handles.FormType initAction = Handles.FormType.Normal; private String initMessage; - private List initDeletedFiles = new List(); - private List initNewFiles = new List(); + private List initDeletedFiles = new List(); + private List initNewFiles = new List(); /// /// Tray Controller /// @@ -62,7 +62,7 @@ namespace svnsync.Controllers viewWindow.Model.Message = p; } } - internal void SetDeletedFiles(List p) { + internal void SetDeletedFiles(List p) { if(viewWindow == null) { this.initDeletedFiles = p; } else { @@ -70,7 +70,7 @@ namespace svnsync.Controllers } } - internal void SetNewFiles(List list) { + internal void SetNewFiles(List list) { if(viewWindow == null) { this.initNewFiles = list; } else { diff --git a/svnsync/Helpers/Handles.cs b/svnsync/Helpers/Handles.cs index bd93064..4e59337 100644 --- a/svnsync/Helpers/Handles.cs +++ b/svnsync/Helpers/Handles.cs @@ -35,13 +35,13 @@ namespace svnsync.Helpers { } } public class TreePart { - public TreePart(String name, bool isFolder, List child) { - this.name = name; - this.child = child; - this.isFolder = isFolder; + public TreePart(String name, Boolean isFolder, List child) { + this.Name = name; + this.Child = child; + this.IsFolder = isFolder; } - public string name { get; private set; } - public List child { get; set; } - public bool isFolder { get; set; } + public String Name { get; private set; } + public List Child { get; set; } + public Boolean IsFolder { get; set; } } } diff --git a/svnsync/Helpers/TreeBuilder.cs b/svnsync/Helpers/TreeBuilder.cs index 7e480fa..2cd1b5a 100644 --- a/svnsync/Helpers/TreeBuilder.cs +++ b/svnsync/Helpers/TreeBuilder.cs @@ -8,96 +8,103 @@ using System.Windows.Forms; namespace svnsync.Helpers { public class TreeBuilder { - public static TreeNode[] createDirList(List tree, String root) { + public static TreeNode[] CreateDirList(List tree, String root) { List ntree = new List(); foreach(String node in tree) { String folder = node; folder = folder.Replace('\\', '/'); folder = (folder.StartsWith("/")) ? folder.Substring(1) : folder; folder = (folder.EndsWith("/")) ? folder.Substring(0, folder.Length - 1) : folder; - bool isFolder = System.IO.Directory.Exists(root + "/" + folder); + Boolean isFolder = System.IO.Directory.Exists(root + "/" + folder); String[] folders = folder.Split('/'); Array.Reverse(folders); List prev = null; foreach(String entry in folders) { String name = entry; - if(prev == null) + if(prev == null) { prev = new List() { new TreePart(name, isFolder, new List()) }; - else + } else { prev = new List() { new TreePart(name, isFolder, prev) }; - if(!isFolder) + } + if (!isFolder) { isFolder = true; + } } - ntree = treeMatch(ntree, prev); + ntree = TreeMatch(ntree, prev); } - return createListDirRender(ntree); + return CreateListDirRender(ntree); } - public static List treeMatch(List ntree, List input) { - String[] key1 = array_keys(input); - if(ntree.Count == 0 || (key1.Length > 0 && !array_key_exists(key1[0], ntree)) || key1.Length == 0) { + public static List TreeMatch(List ntree, List input) { + String[] key1 = Array_keys(input); + if(ntree.Count == 0 || (key1.Length > 0 && !Array_key_exists(key1[0], ntree)) || key1.Length == 0) { ntree.Add(input[0]); } else { - String[] key2 = array_keys(findName(key1[0], input)); + String[] key2 = Array_keys(FindName(key1[0], input)); if(key2.Length != 0) { - if(array_key_exists(key2[0], findName(key1[0], ntree))) { + if(Array_key_exists(key2[0], FindName(key1[0], ntree))) { /*setChild(key2[0], findName(key1[0], ntree),*/ - treeMatch(findName(key1[0], ntree), findName(key1[0], input)); + TreeMatch(FindName(key1[0], ntree), FindName(key1[0], input)); } else { - findName(key1[0], ntree).Add(findName(key1[0], input)[0]); + FindName(key1[0], ntree).Add(FindName(key1[0], input)[0]); } } } return ntree; } - public static string[] array_keys(List input) { + public static String[] Array_keys(List input) { List ret = new List(); foreach(TreePart item in input) { - ret.Add(item.name); + ret.Add(item.Name); } return ret.ToArray(); } - public static bool array_key_exists(string p, List ntree) { + public static Boolean Array_key_exists(String p, List ntree) { foreach(TreePart item in ntree) { - if(item.name == p) + if(item.Name == p) { return true; + } } return false; } - public static List findName(string key, List input) { + public static List FindName(String key, List input) { foreach(TreePart item in input) { - if(item.name == key) - return item.child; + if(item.Name == key) { + return item.Child; + } } return null; } - public static TreeNode[] createListDirRender(List ntree) { + public static TreeNode[] CreateListDirRender(List ntree) { TreeNode[] t = new TreeNode[ntree.Count]; - int i = 0; + Int32 i = 0; foreach(TreePart item in ntree) { - String name = item.name + ((item.isFolder) ? ".folder" : (item.name.LastIndexOf('.') == -1) ? ".file" : item.name.Substring(item.name.LastIndexOf('.'))); - if(item.child.Count == 0) + String name = item.Name + ((item.IsFolder) ? ".folder" : (item.Name.LastIndexOf('.') == -1) ? ".file" : item.Name.Substring(item.Name.LastIndexOf('.'))); + if(item.Child.Count == 0) { t[i++] = new TreeNode(name); - else - t[i++] = new TreeNode(name, createListDirRender(item.child)); + } else { + t[i++] = new TreeNode(name, CreateListDirRender(item.Child)); + } + t[i - 1].Checked = true; } return t; } - public static ImageList getImages(TreeNodeCollection treeNodeCollection) { + public static ImageList GetImages(TreeNodeCollection treeNodeCollection) { ImageList li = new ImageList(); - runThroughNodes(li.Images, treeNodeCollection); + RunThroughNodes(li.Images, treeNodeCollection); return li; } - public static void runThroughNodes(ImageList.ImageCollection imageCollection, TreeNodeCollection treeNodeCollection) { + public static void RunThroughNodes(ImageList.ImageCollection imageCollection, TreeNodeCollection treeNodeCollection) { foreach(TreeNode item in treeNodeCollection) { - imageCollection.Add(getImageType(item.Text)); + imageCollection.Add(GetImageType(item.Text)); item.ImageIndex = imageCollection.Count - 1; item.Text = item.Text.Substring(0, item.Text.LastIndexOf(".")); - if(item.Nodes.Count > 0) - runThroughNodes(imageCollection, item.Nodes); + if(item.Nodes.Count > 0) { + RunThroughNodes(imageCollection, item.Nodes); + } } } - public static Icon getImageType(string p) { + public static Icon GetImageType(String p) { switch(p.Substring(p.LastIndexOf("."))) { case ".folder": return Properties.Resources.Special_Folder; @@ -106,13 +113,15 @@ namespace svnsync.Helpers { } return Properties.Resources.Special_File; } - public static List getSelectedNodes(TreeNodeCollection treeNodeCollection) { + public static List GetSelectedNodes(TreeNodeCollection treeNodeCollection) { List l = new List(); foreach(TreeNode item in treeNodeCollection) { - if(item.Checked && item.Nodes.Count == 0) + if(item.Checked && item.Nodes.Count == 0) { l.Add(item); - if(item.Nodes.Count > 0) - l.AddRange(getSelectedNodes(item.Nodes)); + } + if (item.Nodes.Count > 0) { + l.AddRange(GetSelectedNodes(item.Nodes)); + } } return l; } diff --git a/svnsync/Models/ModelsWindow.cs b/svnsync/Models/ModelsWindow.cs index cc32700..2034485 100644 --- a/svnsync/Models/ModelsWindow.cs +++ b/svnsync/Models/ModelsWindow.cs @@ -28,13 +28,13 @@ namespace svnsync.Models } private List DeletedFilesValue; - public List DeletedFiles { + public List DeletedFiles { get { return this.DeletedFilesValue; } set { this.DeletedFilesValue = value; this.Update(); } } private List NewFilesValue; - public List NewFiles { + public List NewFiles { get { return this.NewFilesValue; } set { this.NewFilesValue = value; this.Update(); } } diff --git a/svnsync/Views/ViewsTray.cs b/svnsync/Views/ViewsTray.cs index f2a3675..fcdab20 100644 --- a/svnsync/Views/ViewsTray.cs +++ b/svnsync/Views/ViewsTray.cs @@ -5,7 +5,6 @@ using System.Windows.Forms; using System.Drawing; using svnsync.Properties; using svnsync.Helpers; -using System; namespace svnsync.Views { diff --git a/svnsync/Views/ViewsWindow.cs b/svnsync/Views/ViewsWindow.cs index 9426cd0..8b7602a 100644 --- a/svnsync/Views/ViewsWindow.cs +++ b/svnsync/Views/ViewsWindow.cs @@ -7,7 +7,7 @@ namespace svnsync.Views { public class ViewsWindow : OwnView { - private ViewsWindowFormInterface form; + private IViewsWindowFormInterface form; public ModelsWindow Model { get; private set; } public ViewsWindow() @@ -39,7 +39,7 @@ namespace svnsync.Views this.form.UpdateForm(); } - private void SwitchContext(ViewsWindowFormInterface newform) { + private void SwitchContext(IViewsWindowFormInterface newform) { this.form = newform; this.form.SetModel(this.Model); this.form.Show(); diff --git a/svnsync/Views/ViewsWindowForm.cs b/svnsync/Views/ViewsWindowForm.cs index a26745a..63e80d5 100644 --- a/svnsync/Views/ViewsWindowForm.cs +++ b/svnsync/Views/ViewsWindowForm.cs @@ -12,7 +12,7 @@ using svnsync.Controllers; namespace svnsync.Views { - public partial class ViewsWindowForm : Form, ViewsWindowFormInterface + public partial class ViewsWindowForm : Form, IViewsWindowFormInterface { private ModelsWindow model; public ViewsWindowForm() diff --git a/svnsync/Views/ViewsWindowFormError.cs b/svnsync/Views/ViewsWindowFormError.cs index 28cb110..f100f69 100644 --- a/svnsync/Views/ViewsWindowFormError.cs +++ b/svnsync/Views/ViewsWindowFormError.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; namespace svnsync.Views { - public partial class ViewsWindowFormError : Form, ViewsWindowFormInterface { + public partial class ViewsWindowFormError : Form, IViewsWindowFormInterface { private ModelsWindow model; public ViewsWindowFormError() { InitializeComponent(); @@ -31,7 +31,7 @@ namespace svnsync.Views { Match r = new Regex("svn:.*(([WE])[0-9]*): (.*)",RegexOptions.IgnoreCase).Match(message); if(r.Success) { String ecode = r.Groups[2].Value.ToLower() == "w" ? "Warnung" : "Fehler"; - this.errorgrid.Rows.Add(new string[] { r.Groups[1].Value, ecode, r.Groups[3].Value}); + this.errorgrid.Rows.Add(new String[] { r.Groups[1].Value, ecode, r.Groups[3].Value}); } } })); diff --git a/svnsync/Views/ViewsWindowFormFileList.cs b/svnsync/Views/ViewsWindowFormFileList.cs index 11d8760..760241e 100644 --- a/svnsync/Views/ViewsWindowFormFileList.cs +++ b/svnsync/Views/ViewsWindowFormFileList.cs @@ -12,7 +12,7 @@ using svnsync.Controllers; using svnsync.Helpers; namespace svnsync.Views { - public partial class ViewsWindowFormFileList : Form, ViewsWindowFormInterface { + public partial class ViewsWindowFormFileList : Form, IViewsWindowFormInterface { private ModelsWindow model; public ViewsWindowFormFileList() { InitializeComponent(); @@ -27,15 +27,15 @@ namespace svnsync.Views { case Helpers.Handles.FormType.DeletedFiles: this.title.Text = "Diese Daten sind gelöscht worden:"; this.runButton.Text = "Löschen"; - this.tree.Nodes.AddRange(TreeBuilder.createDirList(this.model.DeletedFiles, this.model.Args.GetArgumentData("-d"))); - this.tree.ImageList = TreeBuilder.getImages(this.tree.Nodes); + this.tree.Nodes.AddRange(TreeBuilder.CreateDirList(this.model.DeletedFiles, this.model.Args.GetArgumentData("-d"))); + this.tree.ImageList = TreeBuilder.GetImages(this.tree.Nodes); this.runButton.Click += new EventHandler(ControllersTray.DeleteButton_Click); break; case Handles.FormType.UnversionFiles: this.title.Text = "Diese Daten sind unversioniert:"; this.runButton.Text = "Hinzufügen"; - this.tree.Nodes.AddRange(TreeBuilder.createDirList(this.model.NewFiles, this.model.Args.GetArgumentData("-d"))); - this.tree.ImageList = TreeBuilder.getImages(this.tree.Nodes); + this.tree.Nodes.AddRange(TreeBuilder.CreateDirList(this.model.NewFiles, this.model.Args.GetArgumentData("-d"))); + this.tree.ImageList = TreeBuilder.GetImages(this.tree.Nodes); this.runButton.Click += new EventHandler(ControllersTray.AddButton_Click); break; } diff --git a/svnsync/Views/ViewsWindowFormInterface.cs b/svnsync/Views/ViewsWindowFormInterface.cs index 3aafb7d..8f09f41 100644 --- a/svnsync/Views/ViewsWindowFormInterface.cs +++ b/svnsync/Views/ViewsWindowFormInterface.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using svnsync.Models; namespace svnsync.Views { - public interface ViewsWindowFormInterface { + public interface IViewsWindowFormInterface { void UpdateForm(); void SetModel(ModelsWindow window); void Show(); diff --git a/svnsync/svnsync.csproj b/svnsync/svnsync.csproj index 8f7a753..feb94bf 100644 --- a/svnsync/svnsync.csproj +++ b/svnsync/svnsync.csproj @@ -31,7 +31,7 @@ true - x86 + AnyCPU true full false diff --git a/svnsync/svnsync.csproj.user b/svnsync/svnsync.csproj.user index 10ef26c..98001e5 100644 --- a/svnsync/svnsync.csproj.user +++ b/svnsync/svnsync.csproj.user @@ -1,7 +1,7 @@  - -d "D:\\Visual Studio 2012\\Projects" -cron -externals-own + -d "E:\\Eigene Dateien\\Dokumente\\Visual Studio 2017\\Projects" -cron -externals-own false Project