Commit: d9c818af7bc1577f2964a5cb57d2e8eb44741f96 - FolderCategorizer (git)

ファイル整理用ツールのWinFormサンプル実装

Commit MetaInfo

• Revision: d9c818af7bc1577f2964a5cb57d2e8eb44741f96 (tree)
• Time: 2018-12-27 13:05:40
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

リファクタ - ドラッグ情報中のリストを配列に変更

Change Summary

• modified: FolderCategorizer/Infra/Helper/PathHelper.cs
• modified: FolderCategorizer/Presentation/View/MainForm.cs

Incremental Difference

--- a/FolderCategorizer/Infra/Helper/PathHelper.cs
+++ b/FolderCategorizer/Infra/Helper/PathHelper.cs
@@ -54,20 +54,20 @@ namespace FolderCategorizer.Infra.Helper
             return Path.GetFullPath(Path.Combine(dir, name));
         }
 
-        public static bool IsDstPathIncludedSrcPathList(string dstPath, List<string> srcPaths)
+        public static bool IsDstPathIncludedSrcPathList(string dstFolderPath, string[] srcFolderPaths)
         {
-            foreach (string srcPath in srcPaths)
+            foreach (string srcFolderPath in srcFolderPaths)
             {
-                string srcParent = Path.GetDirectoryName(srcPath);
+                string srcParent = Path.GetDirectoryName(srcFolderPath);
 
-                if (dstPath.StartsWith(srcPath))
+                if (dstFolderPath.StartsWith(srcFolderPath))
                 {
-                    string dstParent = Path.GetDirectoryName(dstPath);
+                    string dstParent = Path.GetDirectoryName(dstFolderPath);
 
                     if (srcParent == dstParent)
                     {
-                        string srcName = Path.GetFileName(srcPath);
-                        string dstName = Path.GetFileName(dstPath);
+                        string srcName = Path.GetFileName(srcFolderPath);
+                        string dstName = Path.GetFileName(dstFolderPath);
 
                         if (srcName == dstName)
                         {
@@ -82,7 +82,7 @@ namespace FolderCategorizer.Infra.Helper
                         return true;
                     }
                 }
-                else if (dstPath == srcParent)
+                else if (dstFolderPath == srcParent)
                 {
                     return true;
                     // 対象フォルダがソースの親の場合はフルパスが自分になるのでNG

--- a/FolderCategorizer/Presentation/View/MainForm.cs
+++ b/FolderCategorizer/Presentation/View/MainForm.cs
@@ -85,51 +85,48 @@ namespace FolderCategorizer.Presentation.View
         [Serializable]
         public class DraggedFileListEntriesHolder
         {
-            public List<FileListEntry> DroppedEntries { get; set; } = null;
+            public FileListEntry[] DroppedEntries { get; set; } = null;
 
             public string SrcRefreshPath { get; set; } = string.Empty;
 
-            public List<FileListEntry> SelectedFileListViewItems { get; set; } = null;
+            public FileListEntry[] SelectedListEntries { get; set; } = null;
 
-            public TreeNodeStatus[] SelectedFolderTreeViewNodeStatuses { get; set; } = null;
+            public TreeNodeStatus[] SelectedNodeStatuses { get; set; } = null;
 
-            public List<string> ProhibitedDropFolderTopPaths { get; set; } = null;
+            public string[] SrcFolderPaths { get; set; } = null;
 
             //public ImageList DraggedImageList { get; set; } = null;
 
             public DraggedFileListEntriesHolder()
             {
-                DroppedEntries = new List<FileListEntry>();
-                SelectedFileListViewItems = new List<FileListEntry>();
-                SelectedFolderTreeViewNodeStatuses = new TreeNodeStatus[0];
-                ProhibitedDropFolderTopPaths = new List<string>();
+                DroppedEntries = new FileListEntry[0];
+                SelectedListEntries = new FileListEntry[0];
+                SelectedNodeStatuses = new TreeNodeStatus[0];
+                SrcFolderPaths = new string[0];
             }
 
-            public DraggedFileListEntriesHolder(List<ListViewItem> selectedItems, TreeNode[] selectedNodes, List<string> prohibitedFolders, string srcRefreshPath)
+            public DraggedFileListEntriesHolder(FileListEntry[] selectedListEntries, TreeNodeStatus[] selectedNodeStatuses, string[] prohibitedFolders, string srcRefreshPath)
             {
-                SelectedFileListViewItems = FileListEntry.FromTagOf(selectedItems).ToList();
-                SelectedFolderTreeViewNodeStatuses = TreeNodeStatus.FromTagOf(selectedNodes);
-                ProhibitedDropFolderTopPaths = prohibitedFolders;
+                SelectedListEntries = selectedListEntries;
+                SelectedNodeStatuses = selectedNodeStatuses;
+                SrcFolderPaths = prohibitedFolders;
                 SrcRefreshPath = srcRefreshPath;
 
-                DroppedEntries = SelectedFileListViewItems;
+                DroppedEntries = SelectedListEntries;
             }
 
-            public DraggedFileListEntriesHolder(List<ListViewItem> selectedItems, TreeNode[] selectedNodes, TreeNode draggedNode)
+            public DraggedFileListEntriesHolder(FileListEntry[] selectedItems, TreeNodeStatus[] selectedNodes, TreeNode draggedNode)
             {
-                SelectedFileListViewItems = FileListEntry.FromTagOf(selectedItems).ToList();
-                SelectedFolderTreeViewNodeStatuses = TreeNodeStatus.FromTagOf(selectedNodes);
+                SelectedListEntries = selectedItems;
+                SelectedNodeStatuses = selectedNodes;
 
                 SrcRefreshPath = Path.GetDirectoryName(TreeNodeStatus.FromTagOf(draggedNode).RelativePath);
 
-                DroppedEntries = new List<FileListEntry>();
-                ProhibitedDropFolderTopPaths = new List<string>();
-
                 FileListEntry droppedEntry = new FileListEntry(
                         draggedNode.Name, Path.GetDirectoryName(TreeNodeStatus.FromTagOf(draggedNode).RelativePath), FileListEntry.EntryType.FOLDER);
 
-                DroppedEntries.Add(droppedEntry);
-                ProhibitedDropFolderTopPaths.Add(droppedEntry.RelativePath);
+                DroppedEntries = new FileListEntry[] { droppedEntry };
+                SrcFolderPaths = new string[] { droppedEntry.RelativePath };
             }
         }
 
@@ -186,7 +183,7 @@ namespace FolderCategorizer.Presentation.View
                 return ((TreeNodeStatus)node?.Tag);
             }
 
-            public static TreeNodeStatus[] FromTagOf(params TreeNode[] nodes)
+            public static TreeNodeStatus[] ToArrayFromTagsOf(params TreeNode[] nodes)
             {
                 return FromTagOf(nodes.AsEnumerable());
             }
@@ -394,18 +391,35 @@ namespace FolderCategorizer.Presentation.View
                 return (FileListEntry)item?.Tag;
             }
 
-            public static FileListEntry[] FromTagOf(IEnumerable<ListViewItem> items)
+            public static List<FileListEntry> ToListFromTagsOf(IEnumerable items)
             {
-                FileListEntry[] objs = new FileListEntry[items.Count()];
-
-                int i = 0;
+                List<FileListEntry> entries = new List<FileListEntry>();
 
                 foreach (ListViewItem item in items)
                 {
-                    objs[i++] = FileListEntry.FromTagOf(item);
+                    FileListEntry entry = FileListEntry.FromTagOf(item);
+
+                    switch (entry.Type)
+                    {
+                        case FileListEntry.EntryType.FOLDER:
+                        case FileListEntry.EntryType.FILE:
+                            break;
+
+                        default:
+                        case FileListEntry.EntryType.INVALID:
+                        case FileListEntry.EntryType.UPWARDS:
+                            continue;
+                    }
+
+                    entries.Add(entry);
                 }
 
-                return objs;
+                return entries;
+            }
+
+            public static FileListEntry[] ToArrayFromTagsOf(IEnumerable items)
+            {
+                return ToListFromTagsOf(items).ToArray(); ;
             }
 
             public static string ToTypeName(EntryType type)
@@ -479,6 +493,21 @@ namespace FolderCategorizer.Presentation.View
             public DateTime CreationTime { get; set; }
 
             public DateTime LastWriteTime { get; set; }
+
+            public bool IsFolder()
+            {
+                return Type == EntryType.FOLDER;
+            }
+
+            public bool IsFile()
+            {
+                return Type == EntryType.FILE;
+            }
+
+            public bool IsUpwards()
+            {
+                return Type == EntryType.UPWARDS;
+            }
         }
 
         private class FileListEntrySorter : IComparer
@@ -3226,18 +3255,6 @@ namespace FolderCategorizer.Presentation.View
             IGNORE_ALL_TARGET2_NOT_FOUND_ERROR = 3,
         }
 
-        private List<FileListEntry> CreateSelectedSrcEntries()
-        {
-            List<FileListEntry> entries = new List<FileListEntry>();
-
-            foreach (ListViewItem lvi in lvFileList.SelectedItems)
-            {
-                entries.Add(FileListEntry.FromTagOf(lvi));
-            }
-
-            return entries;
-        }
-
         private static bool CreateModifyMultiTargetFileList(
                 List<string> outTargetPaths, List<string> outTargetPathsForMsg1, List<string> outTargetPathsForMsg2,
                 AbstractFileSystemMultiTargetOperationRequest req)
@@ -3581,37 +3598,16 @@ namespace FolderCategorizer.Presentation.View
 
         private void DoDragTreeView_TreeNode(ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2, TreeNode draggedItem)
         {
-            List<ListViewItem> selectedItems = new List<ListViewItem>(lv.SelectedItems.Count);
-
-            foreach (ListViewItem lvi in lvFileList.SelectedItems)
-            {
-                FileListEntry entry = FileListEntry.FromTagOf(lvi);
-
-                switch (entry.Type)
-                {
-                    case FileListEntry.EntryType.UPWARDS:
-                    case FileListEntry.EntryType.FOLDER:
-                    case FileListEntry.EntryType.FILE:
-                        break;
-
-                    default:
-                    case FileListEntry.EntryType.INVALID:
-                        continue;
-                }
-
-                selectedItems.Add(lvi);
-            }
+            FileListEntry[] entries = FileListEntry.ToArrayFromTagsOf(lvFileList.SelectedItems);
 
             // ツリー上で、選択後にボタンを離さずファイルリストにドロップすると、
             // 選択ノードが切り替わらずにドラッグ動作が開始されるため、
             // ここで強制的にドラッグされたノードを選択状態にする
             SelectTreeViewNode(TreeNodeStatus.FromTagOf(draggedItem).RelativePath);
 
-            TreeNode[] selectedNodes = new TreeNode[] { tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode };
+            TreeNodeStatus[] statuses = TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
 
-            DraggedFileListEntries = new DraggedFileListEntriesHolder(selectedItems, selectedNodes, draggedItem);
-
-            lv.DoDragDrop(DraggedFileListEntries, DragDropEffects.Move | DragDropEffects.Copy);
+            DraggedFileListEntries = new DraggedFileListEntriesHolder(entries, statuses, draggedItem);
         }
 
         private DragDropEffects DragEnterTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder, TreeView tv, int keyState, DragDropEffects allowedEffect, Point p)
@@ -3621,7 +3617,7 @@ namespace FolderCategorizer.Presentation.View
             tv.Focus();
 
             return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
-                    DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(tv, p, holder.ProhibitedDropFolderTopPaths));
+                    DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(tv, p, holder.SrcFolderPaths));
         }
 
         private void DragEnterTreeView_DraggedFileListEntries_EnterDragMode()
@@ -3632,10 +3628,10 @@ namespace FolderCategorizer.Presentation.View
         private DragDropEffects DragOverTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder, TreeView tv, int keyState, DragDropEffects allowedEffect, Point p)
         {
             return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
-                    DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(tv, p, holder.ProhibitedDropFolderTopPaths));
+                    DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(tv, p, holder.SrcFolderPaths));
         }
 
-        private static bool DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(TreeView tv, Point p, List<string> srcPaths)
+        private static bool DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(TreeView tv, Point p, string[] srcFolderPaths)
         {
             TreeNode dstNode = DragDropTreeView_GetNodeAt(tv, p);
 
@@ -3648,7 +3644,7 @@ namespace FolderCategorizer.Presentation.View
 
             TreeNodeStatus dstStatus = TreeNodeStatus.FromTagOf(dstNode);
 
-            if (PathHelper.IsDstPathIncludedSrcPathList(dstStatus.RelativePath, srcPaths))
+            if (PathHelper.IsDstPathIncludedSrcPathList(dstStatus.RelativePath, srcFolderPaths))
             {
                 // invalid dst path
                 return false;
@@ -3661,14 +3657,14 @@ namespace FolderCategorizer.Presentation.View
 
         private void DragLeaveTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder)
         {
-            DragLeaveCommon_DraggedFileListEntries_RestoreSelectedNodes(holder.SelectedFolderTreeViewNodeStatuses);
+            DragLeaveCommon_DraggedFileListEntries_RestoreSelectedNodes(holder.SelectedNodeStatuses);
 
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
         }
 
         private void DragDropTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder, TreeView tv, Point p, DragDropEffects effect)
         {
-            DragLeaveCommon_DraggedFileListEntries_RestoreSelectedNodes(holder.SelectedFolderTreeViewNodeStatuses);
+            DragLeaveCommon_DraggedFileListEntries_RestoreSelectedNodes(holder.SelectedNodeStatuses);
 
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
 
@@ -3706,39 +3702,12 @@ namespace FolderCategorizer.Presentation.View
 
         private void DoDragDropFileList_DraggedFileListEntries_CreateEntries(ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2)
         {
-            List<ListViewItem> selectedItems = new List<ListViewItem>(lv.SelectedItems.Count);
-
-            List<string> prohibitedFolders = new List<string>();
-
-            foreach (ListViewItem lvi in lvFileList.SelectedItems)
-            {
-                FileListEntry entry = FileListEntry.FromTagOf(lvi);
-
-                switch (entry.Type)
-                {
-                    case FileListEntry.EntryType.UPWARDS:
-                        continue;
+            FileListEntry[] selectedListEntries = FileListEntry.ToArrayFromTagsOf(lvFileList.SelectedItems);
+            string[] prohibitedFolders = selectedListEntries.Where(x => x.IsFolder()).Select(x => x.RelativePath).ToArray();
 
-                    case FileListEntry.EntryType.FOLDER:
-                        prohibitedFolders.Add(entry.RelativePath);
-                        break;
+            TreeNodeStatus[] selectedNodeStatuses = TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
 
-                    case FileListEntry.EntryType.FILE:
-                        break;
-
-                    default:
-                    case FileListEntry.EntryType.INVALID:
-                        continue;
-                }
-
-                selectedItems.Add(lvi);
-            }
-
-            //ListViewHelper.DeselectAllItems(lv);
-
-            TreeNode[] selectedNodes = new TreeNode[] { tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode };
-
-            DraggedFileListEntries = new DraggedFileListEntriesHolder(selectedItems, selectedNodes, prohibitedFolders, GetCurrentRelativePath());
+            DraggedFileListEntries = new DraggedFileListEntriesHolder(selectedListEntries, selectedNodeStatuses, prohibitedFolders, GetCurrentRelativePath());
         }
 
         private DragDropEffects DragEnterFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
@@ -3747,8 +3716,7 @@ namespace FolderCategorizer.Presentation.View
 
             lv.Focus();
 
-            return DragOverFileList_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
-                    DragOverFileList_DraggedFileListEntries_EmphasisDstItem(lv, p, holder.ProhibitedDropFolderTopPaths));
+            return DragOverFileList_DraggedFileListEntries(holder, keyState, allowedEffect, lv, p);
         }
 
         private void DragEnterFileList_DraggedFileListEntries_EnterDragMode()
@@ -3758,13 +3726,19 @@ namespace FolderCategorizer.Presentation.View
             DisableFileCategorizeBox();
         }
 
+        private DragDropEffects DragOverFileList_DraggedFileListEntries_PreSwitchEffect(DragEventArgs e)
+        {
+            return DragOverCommon_DraggedFileListEntries_SwitchEffect(e.KeyState, e.AllowedEffect,
+                    DragDropFileList_GetItemAt(lvFileList, new Point(e.X, e.Y)) != null);
+        }
+
         private DragDropEffects DragOverFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
         {
-            return DragOverFileList_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
-                    DragOverFileList_DraggedFileListEntries_EmphasisDstItem(lv, p, holder.ProhibitedDropFolderTopPaths));
+            return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
+                    DragOverFileList_DraggedFileListEntries_EmphasisDstItem(lv, p, holder.SrcFolderPaths));
         }
 
-        private static bool DragOverFileList_DraggedFileListEntries_EmphasisDstItem(ListView lv, Point p, List<string> srcPaths)
+        private static bool DragOverFileList_DraggedFileListEntries_EmphasisDstItem(ListView lv, Point p, string[] srcFolderPaths)
         {
             ListViewItem dstItem = DragDropFileList_GetItemAt(lv, p);
 
@@ -3794,7 +3768,7 @@ namespace FolderCategorizer.Presentation.View
                     break;
             }
 
-            if (PathHelper.IsDstPathIncludedSrcPathList(dstEntry.RelativePath, srcPaths))
+            if (PathHelper.IsDstPathIncludedSrcPathList(dstEntry.RelativePath, srcFolderPaths))
             {
                 // invalid dst path
                 return false;
@@ -3805,14 +3779,9 @@ namespace FolderCategorizer.Presentation.View
             return true;
         }
 
-        private static DragDropEffects DragOverFileList_DraggedFileListEntries_SwitchEffect(int keyState, DragDropEffects allowedEffect, bool isValidDropTarget)
-        {
-            return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect, isValidDropTarget);
-        }
-
         private void DragLeaveFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder)
         {
-            DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(holder.SelectedFileListViewItems);
+            DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(holder.SelectedListEntries);
 
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
         }
@@ -3844,9 +3813,9 @@ namespace FolderCategorizer.Presentation.View
 
         private void DragDropFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, ListView lv, Point p, DragDropEffects effect)
         {
-            List<FileListEntry> srcEntries = holder.DroppedEntries;
+            FileListEntry[] srcEntries = holder.DroppedEntries;
 
-            DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(holder.SelectedFileListViewItems);
+            DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(holder.SelectedListEntries);
 
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
 
@@ -3921,7 +3890,7 @@ namespace FolderCategorizer.Presentation.View
         }
 
         private FileSystemOperationResult DragDropCommon_DraggedFileListEntries(
-                string dstRelativePath, string srcRefreshPath, List<FileListEntry> srcEntries, DragDropEffects effect)
+                string dstRelativePath, string srcRefreshPath, FileListEntry[] srcEntries, DragDropEffects effect)
         {
             string srcTopPath1 = IsSrcFolder1Enabled ? txtSrcFolder1.Text : string.Empty;
             string srcTopPath2 = IsSrcFolder2Enabled ? txtSrcFolder2.Text : string.Empty;
@@ -3945,18 +3914,18 @@ namespace FolderCategorizer.Presentation.View
         }
 
         private FileSystemOperationResult DragDropCommon_DraggedFileListEntries(
-                string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2, List<FileListEntry> srcEntries,
+                string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2, FileListEntry[] srcEntries,
                 string dstRefreshPath, string srcRefreshPath, DragDropEffects effect)
         {
             switch (DragDropCommon_SwitchEffect(effect))
             {
                 case DragDropEffects.Copy:
                     return DoFileSystemOperation(new FileSystemCopyOperationRequest(
-                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, dstRefreshPath, srcRefreshPath));
+                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
 
                 case DragDropEffects.Move:
                     return DoFileSystemOperation(new FileSystemMoveOperationRequest(
-                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, dstRefreshPath, srcRefreshPath));
+                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
 
                 default:
                     return new FileSystemOperationResult(null).Abort();
@@ -4250,7 +4219,7 @@ namespace FolderCategorizer.Presentation.View
                 return;
             }
 
-            List<FileListEntry> entries = CreateSelectedSrcEntries();
+            List<FileListEntry> entries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (entries.Count == 0)
             {
@@ -4345,7 +4314,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void btnCreateNewFolderAndMove_Click(object sender, EventArgs e)
         {
-            List<FileListEntry> srcEntries = CreateSelectedSrcEntries();
+            List<FileListEntry> srcEntries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (srcEntries.Count == 0)
             {
@@ -4471,7 +4440,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            List<FileListEntry> entries = CreateSelectedSrcEntries();
+            List<FileListEntry> entries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (entries.Count == 0)
             {
@@ -4559,7 +4528,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void OverwriteCreationTimeToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            List<FileListEntry> entries = CreateSelectedSrcEntries();
+            List<FileListEntry> entries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (entries.Count == 0)
             {
@@ -4575,7 +4544,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void OverwriteLastWriteTimeToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            List<FileListEntry> entries = CreateSelectedSrcEntries();
+            List<FileListEntry> entries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (entries.Count == 0)
             {
@@ -4591,7 +4560,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void ExchangeCreationAndLastWriteTimeToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            List<FileListEntry> entries = CreateSelectedSrcEntries();
+            List<FileListEntry> entries = FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems);
 
             if (entries.Count == 0)
             {
@@ -4609,7 +4578,7 @@ namespace FolderCategorizer.Presentation.View
         {
             List<FileListEntry> entries = new List<FileListEntry>();
 
-            entries.AddRange(CreateSelectedSrcEntries().Where((x) => x.Type == FileListEntry.EntryType.FOLDER));
+            entries.AddRange(FileListEntry.ToListFromTagsOf(lvFileList.SelectedItems).Where((x) => x.Type == FileListEntry.EntryType.FOLDER));
 
             if (entries.Count == 0)
             {
@@ -4736,7 +4705,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_ItemDrag(object sender, ItemDragEventArgs e)
         {
-            Logger.Info("lvFileList_ItemDrag");
+            //Logger.Info("lvFileList_ItemDrag");
 
             if (e.Button == MouseButtons.Left)
             {
@@ -4744,6 +4713,7 @@ namespace FolderCategorizer.Presentation.View
 
                 DataObjectEx data = new DataObjectEx();
                 data.SetData(DataFormats.Serializable, true, DraggedFileListEntries);
+
                 DragDropEffects res = ShellUtils.DragSource.DoDragDrop(
                         data, lvFileList, DragDropEffects.Copy | DragDropEffects.Move, PointToClient(MousePosition));
 
@@ -4753,45 +4723,47 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragEnter(object sender, DragEventArgs e)
         {
-            Logger.Info("lvFileList_DragEnter");
+            //Logger.Info("lvFileList_DragEnter");
 
-            e.Effect = DragDropEffects.None;
+            bool isDataSerializable = e.Data.GetDataPresent(DataFormats.Serializable);
 
-            DragDropEffects effect = DragOverFileList_DraggedFileListEntries_SwitchEffect(e.KeyState, e.AllowedEffect,
-                    DragDropFileList_GetItemAt(lvFileList, new Point(e.X, e.Y)) != null);
+            DragDropEffects effect = isDataSerializable ? DragOverFileList_DraggedFileListEntries_PreSwitchEffect(e) : DragDropEffects.None;
 
             dropHelperFileListView.DragEnter(lvFileList.PointToClient(new Point(e.X, e.Y)), effect, e.Data);
 
-            if (e.Data.GetDataPresent(DataFormats.Serializable))
+            if (isDataSerializable)
             {
                 e.Effect = DragEnterFileList_DraggedFileListEntries(
                         (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable),
                         e.KeyState, e.AllowedEffect, lvFileList, new Point(e.X, e.Y));
-           }
+            }
+
+            e.Effect = effect;
         }
 
         private void lvFileList_DragOver(object sender, DragEventArgs e)
         {
-            Logger.Info("lvFileList_DragOver");
+            //Logger.Info("lvFileList_DragOver");
 
-            e.Effect = DragDropEffects.None;
+            bool isDataSerializable = e.Data.GetDataPresent(DataFormats.Serializable);
 
-            DragDropEffects effect = DragOverFileList_DraggedFileListEntries_SwitchEffect(e.KeyState, e.AllowedEffect,
-                    DragDropFileList_GetItemAt(lvFileList, new Point(e.X, e.Y)) != null);
+            DragDropEffects effect = isDataSerializable ? DragOverFileList_DraggedFileListEntries_PreSwitchEffect(e) : DragDropEffects.None;
 
             dropHelperFileListView.DragOver(lvFileList.PointToClient(new Point(e.X, e.Y)), effect);
 
-            if (e.Data.GetDataPresent(DataFormats.Serializable))
+            if (isDataSerializable)
             {
-                e.Effect = DragOverFileList_DraggedFileListEntries(
+                effect = DragOverFileList_DraggedFileListEntries(
                         (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable, true),
                         e.KeyState, e.AllowedEffect, lvFileList, new Point(e.X, e.Y));
             }
+
+            e.Effect = effect;
         }
 
         private void lvFileList_DragLeave(object sender, EventArgs e)
         {
-            Logger.Info("lvFileList_DragLeave");
+            //Logger.Info("lvFileList_DragLeave");
 
             dropHelperFileListView.DragLeave();
 
@@ -4800,7 +4772,7 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragDrop(object sender, DragEventArgs e)
         {
-            Logger.Info("lvFileList_DragDrop");
+            //Logger.Info("lvFileList_DragDrop");
 
             dropHelperFileListView.Drop(PointToClient(MousePosition), e.Effect, e.Data);