コミット: 36e2968fc2cda0134f8cb58b8cbdbacbeda4a31d - FolderCategorizer (git)

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

コミットメタ情報

• リビジョン: 36e2968fc2cda0134f8cb58b8cbdbacbeda4a31d (tree)
• 日時: 2018-12-26 22:24:02
• 作者: yoshy <yoshy@user...>
• コミッター: yoshy

ログメッセージ

リファクタ - 不要ソース削除、折り返し調整等

変更サマリ

• modified: FolderCategorizer/Presentation/View/MainForm.cs

差分

--- a/FolderCategorizer/Presentation/View/MainForm.cs
+++ b/FolderCategorizer/Presentation/View/MainForm.cs
@@ -66,6 +66,8 @@ namespace FolderCategorizer.Presentation.View
 
         private DPIHelper dpiHelper;
 
+        private ShellUtils.DropTarget dropHelper;
+
         #endregion
 
         #region UI Enabler Properties
@@ -95,8 +97,6 @@ namespace FolderCategorizer.Presentation.View
 
             public string[] SrcFolderPaths { get; set; } = null;
 
-            //public ImageList DraggedImageList { get; set; } = null;
-
             public DraggedFileListEntriesHolder()
             {
                 DroppedEntries = new FileListEntry[0];
@@ -105,25 +105,29 @@ namespace FolderCategorizer.Presentation.View
                 SrcFolderPaths = new string[0];
             }
 
-            public DraggedFileListEntriesHolder(FileListEntry[] selectedListEntries, TreeNodeStatus[] selectedNodeStatuses, string[] prohibitedFolders, string srcRefreshPath)
+            public DraggedFileListEntriesHolder(
+                    FileListEntry[] selectedListEntries, TreeNodeStatus[] selectedNodeStatuses,
+                    string[] srcFolderPaths, string srcRefreshPath)
             {
                 SelectedListEntries = selectedListEntries;
                 SelectedNodeStatuses = selectedNodeStatuses;
-                SrcFolderPaths = prohibitedFolders;
+                SrcFolderPaths = srcFolderPaths;
                 SrcRefreshPath = srcRefreshPath;
 
                 DroppedEntries = SelectedListEntries;
             }
 
-            public DraggedFileListEntriesHolder(FileListEntry[] selectedItems, TreeNodeStatus[] selectedNodes, TreeNode draggedNode)
+            public DraggedFileListEntriesHolder(
+                    FileListEntry[] selectedListEntries, TreeNodeStatus[] selectedNodeStatuses, TreeNode draggedNode)
             {
-                SelectedListEntries = selectedItems;
-                SelectedNodeStatuses = selectedNodes;
+                SelectedListEntries = selectedListEntries;
+                SelectedNodeStatuses = selectedNodeStatuses;
 
                 SrcRefreshPath = Path.GetDirectoryName(TreeNodeStatus.FromTagOf(draggedNode).RelativePath);
 
                 FileListEntry droppedEntry = new FileListEntry(
-                        draggedNode.Name, Path.GetDirectoryName(TreeNodeStatus.FromTagOf(draggedNode).RelativePath), FileListEntry.EntryType.FOLDER);
+                        draggedNode.Name, Path.GetDirectoryName(
+                                TreeNodeStatus.FromTagOf(draggedNode).RelativePath), FileListEntry.EntryType.FOLDER);
 
                 DroppedEntries = new FileListEntry[] { droppedEntry };
                 SrcFolderPaths = new string[] { droppedEntry.RelativePath };
@@ -132,8 +136,6 @@ namespace FolderCategorizer.Presentation.View
 
         private DraggedFileListEntriesHolder DraggedFileListEntries { get; set; } = null;
 
-        private ShellUtils.DropTarget dropHelper = null;
-
         #endregion
 
         #region Tree Node Status Structures
@@ -170,7 +172,8 @@ namespace FolderCategorizer.Presentation.View
             {
                 Node = node;
                 FullPath = fullPath;
-                Level = Enum.IsDefined(typeof(RecursiveSearchLevel), level) ? (RecursiveSearchLevel)level : RecursiveSearchLevel.INVALID;
+                Level = Enum.IsDefined(typeof(RecursiveSearchLevel), level)
+                        ? (RecursiveSearchLevel)level : RecursiveSearchLevel.INVALID;
             }
 
             public void CreateRelativePath(TreeNode parent, TreeNode current)
@@ -360,7 +363,11 @@ namespace FolderCategorizer.Presentation.View
 
             public static ListViewItem CreateListViewItem(DirectoryInfo di)
             {
-                string[] texts = new string[] { di.Name, FormatFileListDateTime(di.CreationTime), FormatFileListDateTime(di.LastWriteTime), LABEL_NA, LABEL_NA };
+                string[] texts = new string[]
+                {
+                    di.Name, FormatFileListDateTime(di.CreationTime), FormatFileListDateTime(di.LastWriteTime),
+                    LABEL_NA, LABEL_NA
+                };
 
                 ListViewItem item = new ListViewItem(texts, (int)IconNo.FOLDER)
                 {
@@ -464,10 +471,10 @@ namespace FolderCategorizer.Presentation.View
             public static bool TryParseFolderCreateionDateTime(out DateTime dateTime, string str)
             {
                 return DateTime.TryParseExact(
-                    str, FOLDER_CREATION_DATETIME_FORMAT,
-                    System.Globalization.DateTimeFormatInfo.InvariantInfo,
-                    System.Globalization.DateTimeStyles.NoCurrentDateDefault,
-                    out dateTime);
+                        str, FOLDER_CREATION_DATETIME_FORMAT,
+                        DateTimeFormatInfo.InvariantInfo,
+                        DateTimeStyles.NoCurrentDateDefault,
+                        out dateTime);
             }
 
             public string GetTypeName()
@@ -480,20 +487,6 @@ namespace FolderCategorizer.Presentation.View
                 return Path.GetFileName(RelativePath);
             }
 
-            public EntryType Type { get; set; }
-
-            public ListViewItem Item { get; set; }
-
-            public string RelativePath { get; set; }
-
-            public string Extension { get; set; }
-
-            public long Length { get; set; }
-
-            public DateTime CreationTime { get; set; }
-
-            public DateTime LastWriteTime { get; set; }
-
             public bool IsFolder()
             {
                 return Type == EntryType.FOLDER;
@@ -508,6 +501,20 @@ namespace FolderCategorizer.Presentation.View
             {
                 return Type == EntryType.UPWARDS;
             }
+
+            public EntryType Type { get; set; }
+
+            public ListViewItem Item { get; set; }
+
+            public string RelativePath { get; set; }
+
+            public string Extension { get; set; }
+
+            public long Length { get; set; }
+
+            public DateTime CreationTime { get; set; }
+
+            public DateTime LastWriteTime { get; set; }
         }
 
         private class FileListEntrySorter : IComparer
@@ -640,13 +647,15 @@ namespace FolderCategorizer.Presentation.View
                     new Component[]
                     {
                         txtDebug, txtSrcFolder1, txtSrcFolder2,
-                        cbNewFolderDate, cbNewFolderClass, cbNewFolderName, cbNewFolderCreationAt, cbNewFolderLastWriteAt,
+                        cbNewFolderDate, cbNewFolderClass, cbNewFolderName,
+                        cbNewFolderCreationAt, cbNewFolderLastWriteAt,
                         tvSrcFolder1, tvSrcFolder2, lvFileList,
                         statusStrip1,
                         contextMenuStrip1,
                     }, new Control[] {
                         tvSrcFolder1, tvSrcFolder2, lvFileList
-                    }, hiresImageList, normalImageList
+                    },
+                    hiresImageList, normalImageList
             );
 
             dropHelper = new ShellUtils.DropTarget(lvFileList.Handle);
@@ -666,12 +675,14 @@ namespace FolderCategorizer.Presentation.View
 
         #region Dialog Functions
 
-        private static DialogResult ShowOperationSkipSelector(string msg, string label, string path, FileSystemOperationUIInfo uiInfo)
+        private static DialogResult ShowOperationSkipSelector(
+                string msg, string label, string path, FileSystemOperationUIInfo uiInfo)
         {
             return ShowOperationSkipSelector(msg, label, uiInfo.TargetType, path, uiInfo);
         }
 
-        private static DialogResult ShowOperationSkipSelector(string msg, string label, string typeName, string path, FileSystemOperationUIInfo uiInfo)
+        private static DialogResult ShowOperationSkipSelector(
+                string msg, string label, string typeName, string path, FileSystemOperationUIInfo uiInfo)
         {
             return ShowYesNoCancelDlg(
                     $"{msg + NEW_LINE}以下の{label}の{typeName}の{uiInfo.Operation}をスキップしますか？{DOUBLE_NEW_LINE}"
@@ -870,17 +881,20 @@ namespace FolderCategorizer.Presentation.View
 
             if (targetPathsForMsg1.Count > 0)
             {
-                joinedMsg1 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}対象1】{NEW_LINE}" + string.Join(NEW_LINE, targetPathsForMsg1);
+                joinedMsg1 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}対象1】{NEW_LINE}" +
+                        string.Join(NEW_LINE, targetPathsForMsg1);
             }
 
             string joinedMsg2 = string.Empty;
 
             if (targetPathsForMsg2.Count > 0)
             {
-                joinedMsg2 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}対象2】{NEW_LINE}" + string.Join(NEW_LINE, targetPathsForMsg2);
+                joinedMsg2 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}対象2】{NEW_LINE}" +
+                        string.Join(NEW_LINE, targetPathsForMsg2);
             }
 
-            string msg = $"以下の{uiInfo.TargetType}を{uiInfo.Operation}してもよろしいですか？{joinedMsg1}{joinedMsg2}";
+            string msg = $"以下の{uiInfo.TargetType}を{uiInfo.Operation}してもよろしいですか？" +
+                    $"{joinedMsg1}{joinedMsg2}";
 
             return ShowYesNoDlg(msg, uiInfo);
         }
@@ -895,7 +909,8 @@ namespace FolderCategorizer.Presentation.View
             {
                 srcPathsForMsg1.Add("↓");
                 srcPathsForMsg1.Add($"【{uiInfo.Operation}先1】{dstPath1}");
-                srcPathsJoinedMsg1 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}元1】{NEW_LINE}" + string.Join(NEW_LINE, srcPathsForMsg1);
+                srcPathsJoinedMsg1 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}元1】{NEW_LINE}" +
+                        string.Join(NEW_LINE, srcPathsForMsg1);
             }
 
             string srcPathsJoinedMsg2 = string.Empty;
@@ -904,10 +919,12 @@ namespace FolderCategorizer.Presentation.View
             {
                 srcPathsForMsg2.Add("↓");
                 srcPathsForMsg2.Add($"【{uiInfo.Operation}先2】{dstPath2}");
-                srcPathsJoinedMsg2 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}元2】{NEW_LINE}" + string.Join(NEW_LINE, srcPathsForMsg2);
+                srcPathsJoinedMsg2 = DOUBLE_NEW_LINE + $"【{uiInfo.Operation}元2】{NEW_LINE}" +
+                        string.Join(NEW_LINE, srcPathsForMsg2);
             }
 
-            string msg = $"以下の{uiInfo.TargetType}を{uiInfo.Operation}してもよろしいですか？{srcPathsJoinedMsg1}{srcPathsJoinedMsg2}";
+            string msg = $"以下の{uiInfo.TargetType}を{uiInfo.Operation}してもよろしいですか？" +
+                    $"{srcPathsJoinedMsg1}{srcPathsJoinedMsg2}";
 
             return ShowYesNoDlg(msg, uiInfo);
         }
@@ -1160,7 +1177,9 @@ namespace FolderCategorizer.Presentation.View
 
         private static IconNo SelectFolderIconNo(DirectoryInfo dir)
         {
-            return PathHelper.IsDrive(dir) ? IconNo.DRIVE : (PathHelper.IsReparsePoint(dir) ? IconNo.REPARSE_POINT : IconNo.FOLDER);
+            return PathHelper.IsDrive(dir)
+                    ? IconNo.DRIVE
+                    : (PathHelper.IsReparsePoint(dir) ? IconNo.REPARSE_POINT : IconNo.FOLDER);
         }
 
         private void ForceRefreshTreeViewNode(TreeNode node)
@@ -1247,7 +1266,9 @@ namespace FolderCategorizer.Presentation.View
 
                 if (childStatus.Level != TreeNodeStatus.RecursiveSearchLevel.ALL_CHILDREN_ADDED)
                 {
-                    TreeNode refreshedChild = AddFolderRecursive(new DirectoryInfo(childStatus.FullPath), RECURSIVE_SEARCH_LIMIT - 1);
+                    TreeNode refreshedChild = AddFolderRecursive(
+                            new DirectoryInfo(childStatus.FullPath), RECURSIVE_SEARCH_LIMIT - 1);
+
                     node.Nodes.Insert(i + 1, refreshedChild);
                     node.Nodes.RemoveAt(i);
                 }
@@ -1549,11 +1570,13 @@ namespace FolderCategorizer.Presentation.View
         {
             CreateCategorizeNameParts(
                     out SortedSet<string> newFolderNameDateSet, out SortedSet<string> newFolderNameClassSet,
-                    out SortedSet<string> newFolderNameBodySet, out SortedSet<string> newFolderFileDateTimeAttrSet, entries);
+                    out SortedSet<string> newFolderNameBodySet, out SortedSet<string> newFolderFileDateTimeAttrSet,
+                    entries);
 
 
             ShrinkCategorizeTimeParts(
-                    out List<string> newFolderNameDates, out List<string> newFolderCreationDateTimes, out List<string> newFolderLastWriteDateTimes,
+                    out List<string> newFolderNameDates, out List<string> newFolderCreationDateTimes,
+                    out List<string> newFolderLastWriteDateTimes,
                     newFolderNameDateSet, newFolderFileDateTimeAttrSet);
 
             CreateFileCategorizeNameComboBoxes(
@@ -1563,7 +1586,8 @@ namespace FolderCategorizer.Presentation.View
 
         private static void CreateCategorizeNameParts(
                 out SortedSet<string> newFolderNameDateSet, out SortedSet<string> newFolderNameClassSet,
-                out SortedSet<string> newFolderNameBodySet, out SortedSet<string> newFolderFileDateTimeAttrSet, List<FileListEntry> entries)
+                out SortedSet<string> newFolderNameBodySet, out SortedSet<string> newFolderFileDateTimeAttrSet,
+                List<FileListEntry> entries)
         {
             newFolderNameDateSet = new SortedSet<string>();
             newFolderNameClassSet = new SortedSet<string>();
@@ -1590,8 +1614,10 @@ namespace FolderCategorizer.Presentation.View
 
                             newFolderNameBodySet.Add(Path.GetFileNameWithoutExtension(entry.Item.Name));
 
-                            newFolderFileDateTimeAttrSet.Add(FileListEntry.FormatFolderCreationDateTime(entry.CreationTime));
-                            newFolderFileDateTimeAttrSet.Add(FileListEntry.FormatFolderCreationDateTime(entry.LastWriteTime));
+                            newFolderFileDateTimeAttrSet.Add(
+                                    FileListEntry.FormatFolderCreationDateTime(entry.CreationTime));
+                            newFolderFileDateTimeAttrSet.Add(
+                                    FileListEntry.FormatFolderCreationDateTime(entry.LastWriteTime));
                         }
                         break;
 
@@ -1603,29 +1629,34 @@ namespace FolderCategorizer.Presentation.View
 
         private static void ShrinkCategorizeTimeParts(
                 out List<string> newFolderNameDates, out List<string> newFolderCreationDateTimes,
-                out List<string> newFolderLastWriteDateTimes, SortedSet<string> newFolderNameDateSet, SortedSet<string> newFolderFileDateTimeAttrSet)
+                out List<string> newFolderLastWriteDateTimes,
+                SortedSet<string> newFolderNameDateSet, SortedSet<string> newFolderFileDateTimeAttrSet)
         {
             newFolderNameDates = new List<string>(newFolderNameDateSet);
             if (newFolderNameDates.Count > NEW_FOLDER_DATE_LIST_MAX * 2)
             {
-                newFolderNameDates.RemoveRange(NEW_FOLDER_DATE_LIST_MAX, newFolderNameDates.Count - NEW_FOLDER_DATE_LIST_MAX * 2);
+                newFolderNameDates = newFolderNameDates.Take(NEW_FOLDER_DATE_LIST_MAX).Concat(
+                        newFolderNameDates.Skip(
+                                newFolderNameDates.Count - NEW_FOLDER_DATE_LIST_MAX).Take(NEW_FOLDER_DATE_LIST_MAX)
+                ).ToList();
             }
 
             newFolderCreationDateTimes = new List<string>(newFolderFileDateTimeAttrSet);
             if (newFolderCreationDateTimes.Count > NEW_FOLDER_DATE_LIST_MAX)
             {
-                newFolderCreationDateTimes.RemoveRange(NEW_FOLDER_DATE_LIST_MAX, newFolderCreationDateTimes.Count - NEW_FOLDER_DATE_LIST_MAX);
+                newFolderCreationDateTimes = newFolderCreationDateTimes.Take(NEW_FOLDER_DATE_LIST_MAX).ToList();
             }
 
             newFolderLastWriteDateTimes = new List<string>(newFolderFileDateTimeAttrSet.Reverse());
             if (newFolderLastWriteDateTimes.Count > NEW_FOLDER_DATE_LIST_MAX)
             {
-                newFolderLastWriteDateTimes.RemoveRange(NEW_FOLDER_DATE_LIST_MAX, newFolderLastWriteDateTimes.Count - NEW_FOLDER_DATE_LIST_MAX);
+                newFolderLastWriteDateTimes = newFolderLastWriteDateTimes.Take(NEW_FOLDER_DATE_LIST_MAX).ToList();
             }
         }
 
         private void CreateFileCategorizeNameComboBoxes(
-                List<string> newFolderNameDates, SortedSet<string> newFolderNameClassSet, SortedSet<string> newFolderNameBodySet,
+                List<string> newFolderNameDates, SortedSet<string> newFolderNameClassSet,
+                SortedSet<string> newFolderNameBodySet,
                 List<string> newFolderCreationDateTimes, List<string> newFolderLastWriteDateTimes)
         {
             cbNewFolderDate.Text = string.Empty;
@@ -1763,7 +1794,8 @@ namespace FolderCategorizer.Presentation.View
 
                 string targetType =
                         (isFolder && isFile)
-                                ? $"{FileListEntry.ToTypeName(FileListEntry.EntryType.FOLDER)}／{FileListEntry.ToTypeName(FileListEntry.EntryType.FOLDER)}"
+                                ? $"{FileListEntry.ToTypeName(FileListEntry.EntryType.FOLDER)}／" +
+                                        $"{FileListEntry.ToTypeName(FileListEntry.EntryType.FOLDER)}"
                                 : (isFolder || isFile)
                                         ? entries[0].GetTypeName()
                                         : "無効なエントリ";
@@ -1808,7 +1840,8 @@ namespace FolderCategorizer.Presentation.View
 
             public FileSystemOperationResult AbortByTargetEmpty()
             {
-                return Abort($"{Request.UIInfo.Operation}可能な{Request.UIInfo.TargetType}がないため、処理を中止します");
+                return Abort($"{Request.UIInfo.Operation}可能な" +
+                        $"{Request.UIInfo.TargetType}がないため、処理を中止します");
             }
 
             public FileSystemOperationResult AbortWithSomeErrors()
@@ -1845,7 +1878,8 @@ namespace FolderCategorizer.Presentation.View
             public List<string> TargetPathsForMsg1 { get; private set; } = new List<string>();
             public List<string> TargetPathsForMsg2 { get; private set; } = new List<string>();
 
-            public FileSystemCreateNewTargetListOperationResult(AbstractFileSystemOperationRequest request) : base(request)
+            public FileSystemCreateNewTargetListOperationResult(
+                    AbstractFileSystemOperationRequest request) : base(request)
             {
             }
         }
@@ -1883,12 +1917,14 @@ namespace FolderCategorizer.Presentation.View
                 return new FileSystemOperationUIInfo(entries, operation);
             }
 
-            protected static FileSystemOperationUIInfo NewUIInfo(FileListEntry entry, string subTypeName, string operation)
+            protected static FileSystemOperationUIInfo NewUIInfo(
+                    FileListEntry entry, string subTypeName, string operation)
             {
                 return new FileSystemOperationUIInfo(entry, subTypeName, operation);
             }
 
-            protected static FileSystemOperationUIInfo NewUIInfo(List<FileListEntry> entries, string subTypeName, string operation)
+            protected static FileSystemOperationUIInfo NewUIInfo(
+                    List<FileListEntry> entries, string subTypeName, string operation)
             {
                 return new FileSystemOperationUIInfo(entries, subTypeName, operation);
             }
@@ -1903,7 +1939,8 @@ namespace FolderCategorizer.Presentation.View
             public string RefreshPath { get; private set; }
 
             public AbstractFileSystemTargetOperationRequest(
-                    MainForm form, FileSystemOperationUIInfo uiInfo, string targetTopPath1, string targetTopPath2, string refreshPath)
+                    MainForm form, FileSystemOperationUIInfo uiInfo,
+                    string targetTopPath1, string targetTopPath2, string refreshPath)
                             : base(form, uiInfo)
             {
                 TargetTopPath1 = targetTopPath1;
@@ -1965,7 +2002,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public abstract class AbstractFileSystemSingleTargetOperationRequest : AbstractFileSystemTargetOperationRequest
+        public abstract class AbstractFileSystemSingleTargetOperationRequest
+                : AbstractFileSystemTargetOperationRequest
         {
             public FileListEntry TargetEntry { get; private set; }
 
@@ -1978,7 +2016,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public abstract class AbstractFileSystemMultiTargetOperationRequest : AbstractFileSystemTargetOperationRequest
+        public abstract class AbstractFileSystemMultiTargetOperationRequest
+                : AbstractFileSystemTargetOperationRequest
         {
             public List<FileListEntry> TargetEntries { get; private set; }
 
@@ -1991,15 +2030,17 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public abstract class AbstractFileSystemMultiSrcDstOperationRequest : AbstractFileSystemSrcDstOperationRequest
+        public abstract class AbstractFileSystemMultiSrcDstOperationRequest
+                : AbstractFileSystemSrcDstOperationRequest
         {
             public List<FileListEntry> SrcEntries { get; private set; }
 
             public AbstractFileSystemMultiSrcDstOperationRequest(
                     MainForm form, FileSystemOperationUIInfo uiInfo,
-                    string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2, List<FileListEntry> srcEntries,
-                    string dstRefreshPath, string srcRefreshPath)
-                            : base(form, uiInfo, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, dstRefreshPath, srcRefreshPath)
+                    string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2,
+                    List<FileListEntry> srcEntries, string dstRefreshPath, string srcRefreshPath)
+                            : base(form, uiInfo, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                                    dstRefreshPath, srcRefreshPath)
             {
                 SrcEntries = srcEntries;
             }
@@ -2010,8 +2051,10 @@ namespace FolderCategorizer.Presentation.View
             private const string OPERATION = "削除";
 
             public FileSystemDeleteOperationRequest(
-                    MainForm form, string targetTopPath1, string targetTopPath2, List<FileListEntry> targetEntries, string refreshPath)
-                            : base(form, NewUIInfo(targetEntries, OPERATION), targetTopPath1, targetTopPath2, targetEntries, refreshPath)
+                    MainForm form, string targetTopPath1, string targetTopPath2,
+                        List<FileListEntry> targetEntries, string refreshPath)
+                            : base(form, NewUIInfo(targetEntries, OPERATION),
+                                    targetTopPath1, targetTopPath2, targetEntries, refreshPath)
             {
                 Execute = () => DeleteSelectedFiles(this);
             }
@@ -2025,8 +2068,10 @@ namespace FolderCategorizer.Presentation.View
             public string NewName { get; private set; }
 
             public FileSystemRenameOperationRequest(
-                    MainForm form, string targetTopPath1, string targetTopPath2, FileListEntry targetEntry, string newName, string refreshPath)
-                            : base(form, NewUIInfo(targetEntry, TARGET_SUB_TYPE, OPERATION),  targetTopPath1, targetTopPath2, targetEntry, refreshPath)
+                    MainForm form, string targetTopPath1, string targetTopPath2,
+                    FileListEntry targetEntry, string newName, string refreshPath)
+                            : base(form, NewUIInfo(targetEntry, TARGET_SUB_TYPE, OPERATION), 
+                                    targetTopPath1, targetTopPath2, targetEntry, refreshPath)
             {
                 NewName = newName;
 
@@ -2034,7 +2079,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public abstract class AbstractFileSystemOverwriteTimeOperationRequest : AbstractFileSystemMultiTargetOperationRequest
+        public abstract class AbstractFileSystemOverwriteTimeOperationRequest
+                : AbstractFileSystemMultiTargetOperationRequest
         {
             protected const string OPERATION = "削除";
 
@@ -2050,7 +2096,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public class FileSystemOverwriteCreationTimeOperationRequest : AbstractFileSystemOverwriteTimeOperationRequest
+        public class FileSystemOverwriteCreationTimeOperationRequest
+                : AbstractFileSystemOverwriteTimeOperationRequest
         {
             private const string SUB_TYPE_NAME = "作成日時";
 
@@ -2058,13 +2105,15 @@ namespace FolderCategorizer.Presentation.View
                     MainForm form,
                     string targetTopPath1, string targetTopPath2, List<FileListEntry> targetEntries,
                     string refreshPath)
-                            : base(form, NewUIInfo(targetEntries, SUB_TYPE_NAME, OPERATION), targetTopPath1, targetTopPath2, targetEntries,
+                            : base(form, NewUIInfo(targetEntries, SUB_TYPE_NAME, OPERATION),
+                                    targetTopPath1, targetTopPath2, targetEntries,
                                     FileSystemOperationType.OVERWRITE_CREATION_TIME, refreshPath)
             {
             }
         }
 
-        public class FileSystemOverwriteLastWriteTimeOperationRequest : AbstractFileSystemOverwriteTimeOperationRequest
+        public class FileSystemOverwriteLastWriteTimeOperationRequest
+                : AbstractFileSystemOverwriteTimeOperationRequest
         {
             private const string SUB_TYPE_NAME = "更新日時";
 
@@ -2072,13 +2121,15 @@ namespace FolderCategorizer.Presentation.View
                     MainForm form,
                     string targetTopPath1, string targetTopPath2, List<FileListEntry> targetEntries,
                     string refreshPath)
-                            : base(form, NewUIInfo(targetEntries, SUB_TYPE_NAME, OPERATION), targetTopPath1, targetTopPath2, targetEntries,
+                            : base(form, NewUIInfo(targetEntries, SUB_TYPE_NAME, OPERATION),
+                                    targetTopPath1, targetTopPath2, targetEntries,
                                     FileSystemOperationType.OVERWRITE_LAST_WRITE_TIME, refreshPath)
             {
             }
         }
 
-        public class FileSystemExchangeCreationAndLastWriteTimeOperationRequest : AbstractFileSystemMultiTargetOperationRequest
+        public class FileSystemExchangeCreationAndLastWriteTimeOperationRequest
+                : AbstractFileSystemMultiTargetOperationRequest
         {
             private const string SUB_TYPE_NAME = "作成／更新日時";
             private const string OPERATION = "交換";
@@ -2120,8 +2171,10 @@ namespace FolderCategorizer.Presentation.View
             public FileListEntry NewFolderEntry { get; private set; }
 
             public FileSystemCreateNewFolderOperationRequest(
-                    MainForm form, string targetTopPath1, string targetTopPath2, FileListEntry newFolderEntry, string refreshPath)
-                            : base(form, NewUIInfo(newFolderEntry, OPERATION), targetTopPath1, targetTopPath2, newFolderEntry, refreshPath)
+                    MainForm form,
+                    string targetTopPath1, string targetTopPath2, FileListEntry newFolderEntry, string refreshPath)
+                            : base(form, NewUIInfo(newFolderEntry, OPERATION), targetTopPath1, targetTopPath2,
+                                    newFolderEntry, refreshPath)
             {
                 NewFolderEntry = newFolderEntry;
 
@@ -2134,7 +2187,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        public abstract class AbstractFileSystemMoveOrCopyOperationRequest : AbstractFileSystemMultiSrcDstOperationRequest
+        public abstract class AbstractFileSystemMoveOrCopyOperationRequest
+                : AbstractFileSystemMultiSrcDstOperationRequest
         {
             public FileListEntry NewFolderEntry { get; set; }
 
@@ -2162,7 +2216,8 @@ namespace FolderCategorizer.Presentation.View
                     MainForm form,
                     string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2,
                     List<FileListEntry> srcEntries, string dstRefreshPath, string srcRefreshPath)
-                            : this(form, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, null, dstRefreshPath, srcRefreshPath)
+                            : this(form, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                                    srcEntries, null, dstRefreshPath, srcRefreshPath)
             {
             }
 
@@ -2172,7 +2227,8 @@ namespace FolderCategorizer.Presentation.View
                     List<FileListEntry> srcEntries, FileListEntry newFolderEntry,
                     string dstRefreshPath, string srcRefreshPath)
                             : base(form, NewUIInfo(srcEntries, OPERATION),
-                                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, newFolderEntry, FileSystemOperationType.MOVE,
+                                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                                    srcEntries, newFolderEntry, FileSystemOperationType.MOVE,
                                     dstRefreshPath, srcRefreshPath)
             {
             }
@@ -2186,7 +2242,8 @@ namespace FolderCategorizer.Presentation.View
                     MainForm form,
                     string dstFullPath1, string dstFullPath2, string srcTopPath1, string srcTopPath2,
                     List<FileListEntry> srcEntries, string dstRefreshPath, string srcRefreshPath)
-                            : this(form, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, null,  dstRefreshPath, srcRefreshPath)
+                            : this(form, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                                    srcEntries, null,  dstRefreshPath, srcRefreshPath)
             {
             }
 
@@ -2196,7 +2253,8 @@ namespace FolderCategorizer.Presentation.View
                     List<FileListEntry> srcEntries, FileListEntry newFolderEntry,
                     string dstRefreshPath, string srcRefreshPath)
                             : base(form, NewUIInfo(srcEntries, OPERATION),
-                                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, newFolderEntry, FileSystemOperationType.COPY,
+                                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                                    srcEntries, newFolderEntry, FileSystemOperationType.COPY,
                                     dstRefreshPath, srcRefreshPath)
             {
             }
@@ -2260,7 +2318,8 @@ namespace FolderCategorizer.Presentation.View
                 return req.Result.AbortByTargetEmpty();
             }
 
-            DialogResult res = ShowTargetFileOperationConfirmMsg(targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowTargetFileOperationConfirmMsg(
+                    targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2286,7 +2345,8 @@ namespace FolderCategorizer.Presentation.View
             return req.Result;
         }
 
-        private static FileSystemOperationResult MoveOrCopySelectedFiles(AbstractFileSystemMoveOrCopyOperationRequest req)
+        private static FileSystemOperationResult MoveOrCopySelectedFiles(
+                AbstractFileSystemMoveOrCopyOperationRequest req)
         {
             string dstPath1 = req.DstFullPath1;
             string dstPath2 = req.DstFullPath2;
@@ -2307,7 +2367,8 @@ namespace FolderCategorizer.Presentation.View
                 return req.Result.AbortByTargetEmpty();
             }
 
-            DialogResult res = ShowSrcDstFileOperationConfirmMsg(dstPath1, dstPath2, srcPathsForMsg1, srcPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowSrcDstFileOperationConfirmMsg(
+                    dstPath1, dstPath2, srcPathsForMsg1, srcPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2366,16 +2427,19 @@ namespace FolderCategorizer.Presentation.View
             return req.Result;
         }
 
-        private static FileSystemCreateNewTargetListOperationResult CreateNewFolder(FileSystemCreateNewFolderOperationRequest req)
+        private static FileSystemCreateNewTargetListOperationResult CreateNewFolder(
+                FileSystemCreateNewFolderOperationRequest req)
         {
-            FileSystemCreateNewTargetListOperationResult res = (FileSystemCreateNewTargetListOperationResult)req.Result;
+            FileSystemCreateNewTargetListOperationResult res =
+                    (FileSystemCreateNewTargetListOperationResult)req.Result;
 
             List<string> outTargetPaths1 = res.TargetPaths1;
             List<string> outTargetPaths2 = res.TargetPaths2;
             List<string> targetPathsForMsg1 = res.TargetPathsForMsg1;
             List<string> targetPathsForMsg2 = res.TargetPathsForMsg2;
 
-            if (!CreateNewTargetFileList(outTargetPaths1, outTargetPaths2, targetPathsForMsg1, targetPathsForMsg2, req))
+            if (!CreateNewTargetFileList(
+                    outTargetPaths1, outTargetPaths2, targetPathsForMsg1, targetPathsForMsg2, req))
             {
                 return (FileSystemCreateNewTargetListOperationResult)res.Abort();
             }
@@ -2385,7 +2449,8 @@ namespace FolderCategorizer.Presentation.View
                 return (FileSystemCreateNewTargetListOperationResult)res.AbortByTargetEmpty();
             }
 
-            DialogResult confirmRes = ShowTargetFileOperationConfirmMsg(targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
+            DialogResult confirmRes = ShowTargetFileOperationConfirmMsg(
+                    targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
 
             if (confirmRes == DialogResult.No)
             {
@@ -2418,7 +2483,8 @@ namespace FolderCategorizer.Presentation.View
             List<string> oldPathsForMsg1 = new List<string>();
             List<string> oldPathsForMsg2 = new List<string>();
 
-            switch (CreateExistsSingleTargetFileList(oldPaths1, oldPaths2, oldPathsForMsg1, oldPathsForMsg2, req))
+            switch (CreateExistsSingleTargetFileList(
+                    oldPaths1, oldPaths2, oldPathsForMsg1, oldPathsForMsg2, req))
             {
                 case CreateExistsSingleTargetResult.SUCCESS:
                 case CreateExistsSingleTargetResult.IGNORE_TARGET2_NOT_FOUND_ERROR:
@@ -2429,7 +2495,8 @@ namespace FolderCategorizer.Presentation.View
                     return req.Result.Abort();
             }
 
-            DialogResult res = ShowSrcDstFileOperationConfirmMsg(req.NewName, req.NewName, oldPathsForMsg1, oldPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowSrcDstFileOperationConfirmMsg(
+                    req.NewName, req.NewName, oldPathsForMsg1, oldPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2455,7 +2522,8 @@ namespace FolderCategorizer.Presentation.View
             return req.Result;
         }
 
-        private static FileSystemOperationResult OverwriteTimeSelectedFiles(AbstractFileSystemOverwriteTimeOperationRequest req)
+        private static FileSystemOperationResult OverwriteTimeSelectedFiles(
+                AbstractFileSystemOverwriteTimeOperationRequest req)
         {
             List<string> targetPaths = new List<string>();
             List<string> targetPathsForMsg1 = new List<string>();
@@ -2472,7 +2540,8 @@ namespace FolderCategorizer.Presentation.View
                 return req.Result.AbortByTargetEmpty();
             }
 
-            DialogResult res = ShowTargetFileOperationConfirmMsg(targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowTargetFileOperationConfirmMsg(
+                    targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2516,7 +2585,8 @@ namespace FolderCategorizer.Presentation.View
                 return req.Result.AbortByTargetEmpty();
             }
 
-            DialogResult res = ShowTargetFileOperationConfirmMsg(targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowTargetFileOperationConfirmMsg(
+                    targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2560,7 +2630,8 @@ namespace FolderCategorizer.Presentation.View
                 return req.Result.AbortByTargetEmpty();
             }
 
-            DialogResult res = ShowTargetFileOperationConfirmMsg(targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
+            DialogResult res = ShowTargetFileOperationConfirmMsg(
+                    targetPathsForMsg1, targetPathsForMsg2, req.UIInfo);
 
             if (res == DialogResult.No)
             {
@@ -2611,10 +2682,14 @@ namespace FolderCategorizer.Presentation.View
                     {
                         string pathForMsg = PathHelper.EllipsisCompactor(path, ELLIPSIS_COMPACTOR_MAX_PATH);
 
-                        string msg1 = $"以下のフォルダは中身が空ではありません。すべて削除してよろしいですか？{DOUBLE_NEW_LINE}【{pathForMsg}】";
-                        string msg2 = $"以下の空でないフォルダを本当に削除してよろしいですね？{DOUBLE_NEW_LINE}【{pathForMsg}】";
+                        string msg1 = "以下のフォルダは中身が空ではありません。" +
+                                $"すべて削除してよろしいですか？{DOUBLE_NEW_LINE}【{pathForMsg}】";
 
-                        if ((ShowYesNoDlg(msg1, uiInfo) == DialogResult.No) || (ShowYesNoDlg(msg2, uiInfo) == DialogResult.No))
+                        string msg2 = "以下の空でないフォルダを本当に削除してよろしいですね？" +
+                                $"{DOUBLE_NEW_LINE}【{pathForMsg}】";
+
+                        if ((ShowYesNoDlg(msg1, uiInfo) == DialogResult.No)
+                                || (ShowYesNoDlg(msg2, uiInfo) == DialogResult.No))
                         {
                             throw new IOException("ディレクトリが空ではありません。", ERROR_DIR_NOT_EMPTY);
                         }
@@ -2750,7 +2825,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        private static FileSystemRawOperationResults RenameFile(string newName, string oldPath, FileSystemOperationUIInfo uiInfo)
+        private static FileSystemRawOperationResults RenameFile(
+                string newName, string oldPath, FileSystemOperationUIInfo uiInfo)
         {
             Retry:
             try
@@ -2791,7 +2867,8 @@ namespace FolderCategorizer.Presentation.View
             return FileSystemRawOperationResults.SUCCESS;
         }
 
-        private static FileSystemRawOperationResults OverwriteTimeFile(string path, AbstractFileSystemOverwriteTimeOperationRequest req)
+        private static FileSystemRawOperationResults OverwriteTimeFile(
+                string path, AbstractFileSystemOverwriteTimeOperationRequest req)
         {
             Retry:
             try
@@ -3356,8 +3433,8 @@ namespace FolderCategorizer.Presentation.View
                     string pathForMsg = PathHelper.EllipsisCompactor(absPath2, ELLIPSIS_COMPACTOR_MAX_PATH);
 
                     string res = ShowYesAllAbortDlg(
-                            $"{LABEL_SRC_FOLDER2}に以下のファイルが存在しません。"
-                                    + $"{LABEL_SRC_FOLDER1}のみ処理を続行しますか？{DOUBLE_NEW_LINE + pathForMsg}", uiInfo);
+                            $"{LABEL_SRC_FOLDER2}に以下のファイルが存在しません。" + 
+                            $"{LABEL_SRC_FOLDER1}のみ処理を続行しますか？{DOUBLE_NEW_LINE + pathForMsg}", uiInfo);
 
                     switch (res)
                     {
@@ -3395,7 +3472,8 @@ namespace FolderCategorizer.Presentation.View
 
                         string dstTypeName = FileListEntry.ToTypeName(dstType);
 
-                        DialogResult res = ShowOperationSkipSelector(msg, LABEL_SRC_FOLDER2, dstTypeName, absPath2, uiInfo);
+                        DialogResult res = ShowOperationSkipSelector(
+                                msg, LABEL_SRC_FOLDER2, dstTypeName, absPath2, uiInfo);
 
                         switch (res)
                         {
@@ -3412,7 +3490,8 @@ namespace FolderCategorizer.Presentation.View
                     if (!skipTarget2)
                     {
                         outTargetPaths2.Add(absPath2);
-                        outTargetPathsForMsg2.Add(PathHelper.EllipsisCompactor(absPath2, ELLIPSIS_COMPACTOR_MAX_PATH));
+                        outTargetPathsForMsg2.Add(
+                                PathHelper.EllipsisCompactor(absPath2, ELLIPSIS_COMPACTOR_MAX_PATH));
                     }
                 }
             }
@@ -3424,7 +3503,8 @@ namespace FolderCategorizer.Presentation.View
         {
             string newFolderName = CreateNewCategorizeFolderName();
 
-            FileListEntry newFolderEntry = new FileListEntry(newFolderName, GetCurrentRelativePath(), FileListEntry.EntryType.FOLDER);
+            FileListEntry newFolderEntry = new FileListEntry(
+                    newFolderName, GetCurrentRelativePath(), FileListEntry.EntryType.FOLDER);
 
             if (!ParseFolderDateTime(out DateTime newFolderCreationTime, cbNewFolderCreationAt.Text, "フォルダ作成日時"))
             {
@@ -3496,7 +3576,8 @@ namespace FolderCategorizer.Presentation.View
             {
                 string absPath = PathHelper.CreateCanonicalPath(req.TargetTopPath1, req.TargetEntry.RelativePath);
 
-                if (!CreateNewTargetFileListSub(outTargetPaths1, outTargetPathsForMsg1, req.TargetEntry, absPath, req.UIInfo, LABEL_SRC_FOLDER1))
+                if (!CreateNewTargetFileListSub(
+                        outTargetPaths1, outTargetPathsForMsg1, req.TargetEntry, absPath, req.UIInfo, LABEL_SRC_FOLDER1))
                 {
                     return false;
                 }
@@ -3506,7 +3587,8 @@ namespace FolderCategorizer.Presentation.View
             {
                 string absPath = PathHelper.CreateCanonicalPath(req.TargetTopPath2, req.TargetEntry.RelativePath);
 
-                if (!CreateNewTargetFileListSub(outTargetPaths2, outTargetPathsForMsg2, req.TargetEntry, absPath, req.UIInfo, LABEL_SRC_FOLDER2))
+                if (!CreateNewTargetFileListSub(
+                        outTargetPaths2, outTargetPathsForMsg2, req.TargetEntry, absPath, req.UIInfo, LABEL_SRC_FOLDER2))
                 {
                     return false;
                 }
@@ -3596,7 +3678,8 @@ namespace FolderCategorizer.Presentation.View
 
         #region UI Folder Tree Drag and Drop Operations (DFLEH)
 
-        private void DoDragTreeView_TreeNode(ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2, TreeNode draggedItem)
+        private void DoDragTreeView_TreeNode(
+                ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2, TreeNode draggedItem)
         {
             FileListEntry[] entries = FileListEntry.ToArrayFromTagsOf(lvFileList.SelectedItems);
 
@@ -3605,12 +3688,14 @@ namespace FolderCategorizer.Presentation.View
             // ここで強制的にドラッグされたノードを選択状態にする
             SelectTreeViewNode(TreeNodeStatus.FromTagOf(draggedItem).RelativePath);
 
-            TreeNodeStatus[] statuses = TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
+            TreeNodeStatus[] statuses =
+                    TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
 
             DraggedFileListEntries = new DraggedFileListEntriesHolder(entries, statuses, draggedItem);
         }
 
-        private DragDropEffects DragEnterTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, TreeView tv, Point p)
+        private DragDropEffects DragEnterTreeView_DraggedFileListEntries(
+                DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, TreeView tv, Point p)
         {
             DragEnterTreeView_DraggedFileListEntries_EnterDragMode();
 
@@ -3624,13 +3709,15 @@ namespace FolderCategorizer.Presentation.View
             IsDraggingFileListEntries = true;
         }
 
-        private DragDropEffects DragOverTreeView_DraggedFileListEntries_SwitchEffect(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, TreeView tv, Point p)
+        private DragDropEffects DragOverTreeView_DraggedFileListEntries_SwitchEffect(
+                DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, TreeView tv, Point p)
         {
             return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
                     DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(tv, p, holder.SrcFolderPaths));
         }
 
-        private static bool DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(TreeView tv, Point p, string[] srcFolderPaths)
+        private static bool DragOverTreeView_DraggedFileListEntries_EmphasisDstItem(
+                TreeView tv, Point p, string[] srcFolderPaths)
         {
             TreeNode dstNode = DragDropTreeView_GetNodeAt(tv, p);
 
@@ -3661,7 +3748,8 @@ namespace FolderCategorizer.Presentation.View
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
         }
 
-        private void DragDropTreeView_DraggedFileListEntries(DraggedFileListEntriesHolder holder, TreeView tv, Point p, DragDropEffects effect)
+        private void DragDropTreeView_DraggedFileListEntries(
+                DraggedFileListEntriesHolder holder, TreeView tv, Point p, DragDropEffects effect)
         {
             DragLeaveCommon_DraggedFileListEntries_RestoreSelectedNodes(holder.SelectedNodeStatuses);
 
@@ -3678,7 +3766,8 @@ namespace FolderCategorizer.Presentation.View
 
             TreeNodeStatus dstStatus = TreeNodeStatus.FromTagOf(dstNode);
 
-            FileSystemOperationResult res = DragDropCommon_DraggedFileListEntries(dstStatus.RelativePath, holder.SrcRefreshPath, holder.DroppedEntries, effect);
+            FileSystemOperationResult res = DragDropCommon_DraggedFileListEntries(
+                    dstStatus.RelativePath, holder.SrcRefreshPath, holder.DroppedEntries, effect);
 
             // ツリー上での移動の場合、保存されているカレントはすでに削除済みであるため
             // 移動後のノードの親をカレントとする（ファイルリスト一覧で見えるように）
@@ -3699,17 +3788,24 @@ namespace FolderCategorizer.Presentation.View
 
         #region  UI File List Drag and Drop Operations (DFLEH)
 
-        private void DoDragDropFileList_DraggedFileListEntries_CreateEntries(ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2)
+        private void DoDragDropFileList_DraggedFileListEntries_CreateEntries(
+                ListView lv, TreeView tvSrcFolder1, TreeView tvSrcFolder2)
         {
-            FileListEntry[] selectedListEntries = FileListEntry.ToArrayFromTagsOf(lvFileList.SelectedItems);
-            string[] prohibitedFolders = selectedListEntries.Where(x => x.IsFolder()).Select(x => x.RelativePath).ToArray();
+            FileListEntry[] selectedListEntries =
+                    FileListEntry.ToArrayFromTagsOf(lvFileList.SelectedItems);
+
+            string[] prohibitedFolders =
+                    selectedListEntries.Where(x => x.IsFolder()).Select(x => x.RelativePath).ToArray();
 
-            TreeNodeStatus[] selectedNodeStatuses = TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
+            TreeNodeStatus[] selectedNodeStatuses =
+                    TreeNodeStatus.ToArrayFromTagsOf(tvSrcFolder1.SelectedNode, tvSrcFolder2.SelectedNode);
 
-            DraggedFileListEntries = new DraggedFileListEntriesHolder(selectedListEntries, selectedNodeStatuses, prohibitedFolders, GetCurrentRelativePath());
+            DraggedFileListEntries = new DraggedFileListEntriesHolder(
+                    selectedListEntries, selectedNodeStatuses, prohibitedFolders, GetCurrentRelativePath());
         }
 
-        private DragDropEffects DragEnterFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
+        private DragDropEffects DragEnterFileList_DraggedFileListEntries(
+                DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
         {
             DragEnterFileList_DraggedFileListEntries_EnterDragMode();
 
@@ -3727,13 +3823,15 @@ namespace FolderCategorizer.Presentation.View
             DisableFileCategorizeBox();
         }
 
-        private DragDropEffects DragOverFileList_DraggedFileListEntries_SwitchEffect(DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
+        private DragDropEffects DragOverFileList_DraggedFileListEntries_SwitchEffect(
+                DraggedFileListEntriesHolder holder, int keyState, DragDropEffects allowedEffect, ListView lv, Point p)
         {
             return DragOverCommon_DraggedFileListEntries_SwitchEffect(keyState, allowedEffect,
                     DragOverFileList_DraggedFileListEntries_EmphasisDstItem(lv, p, holder.SrcFolderPaths));
         }
 
-        private static bool DragOverFileList_DraggedFileListEntries_EmphasisDstItem(ListView lv, Point p, string[] srcFolderPaths)
+        private static bool DragOverFileList_DraggedFileListEntries_EmphasisDstItem(
+                ListView lv, Point p, string[] srcFolderPaths)
         {
             ListViewItem dstItem = DragDropFileList_GetItemAt(lv, p);
 
@@ -3781,7 +3879,8 @@ namespace FolderCategorizer.Presentation.View
             DragLeaveCommon_DraggedFileListEntries_LeaveDragMode();
         }
 
-        private void DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(IEnumerable<FileListEntry> droppedRawEntries)
+        private void DragLeaveFileList_DraggedFileListEntries_RestoreSelectedItems(
+                IEnumerable<FileListEntry> droppedRawEntries)
         {
             if (droppedRawEntries != null)
             {
@@ -3806,7 +3905,8 @@ namespace FolderCategorizer.Presentation.View
             }
         }
 
-        private void DragDropFileList_DraggedFileListEntries(DraggedFileListEntriesHolder holder, ListView lv, Point p, DragDropEffects effect)
+        private void DragDropFileList_DraggedFileListEntries(
+                DraggedFileListEntriesHolder holder, ListView lv, Point p, DragDropEffects effect)
         {
             FileListEntry[] srcEntries = holder.DroppedEntries;
 
@@ -3839,7 +3939,8 @@ namespace FolderCategorizer.Presentation.View
 
         #region UI Common Drag and Drop Operations (DFLEH)
 
-        private static DragDropEffects DragOverCommon_DraggedFileListEntries_SwitchEffect(int keyState, DragDropEffects allowedEffect, bool isValidDropTarget)
+        private static DragDropEffects DragOverCommon_DraggedFileListEntries_SwitchEffect(
+                int keyState, DragDropEffects allowedEffect, bool isValidDropTarget)
         {
             if (!isValidDropTarget)
             {
@@ -3905,7 +4006,8 @@ namespace FolderCategorizer.Presentation.View
             }
 
             return DragDropCommon_DraggedFileListEntries(
-                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries, dstRelativePath, srcRefreshPath, effect);
+                    dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                    srcEntries, dstRelativePath, srcRefreshPath, effect);
         }
 
         private FileSystemOperationResult DragDropCommon_DraggedFileListEntries(
@@ -3916,11 +4018,13 @@ namespace FolderCategorizer.Presentation.View
             {
                 case DragDropEffects.Copy:
                     return DoFileSystemOperation(new FileSystemCopyOperationRequest(
-                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
+                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                            srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
 
                 case DragDropEffects.Move:
                     return DoFileSystemOperation(new FileSystemMoveOperationRequest(
-                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2, srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
+                            this, dstFullPath1, dstFullPath2, srcTopPath1, srcTopPath2,
+                            srcEntries.ToList(), dstRefreshPath, srcRefreshPath));
 
                 default:
                     return new FileSystemOperationResult(null).Abort();
@@ -4631,28 +4735,12 @@ namespace FolderCategorizer.Presentation.View
 
         private void tvSrcFolder_DragEnter(DragEventArgs e, TreeView tvSrcFolder)
         {
-            //if (e.Data.GetDataPresent(DataFormats.FileDrop))
-            //{
-            //    e.Effect = DragDropEffects.All;
-            //}
-            //else if (e.Data.GetDataPresent(typeof(DraggedFileListEntriesHolder)))
-            //{
-            //    e.Effect = DragEnterTreeView_DraggedFileListEntries(
-            //            (DraggedFileListEntriesHolder)e.Data.GetData(typeof(DraggedFileListEntriesHolder)),
-            //        e.KeyState, e.AllowedEffect, tvSrcFolder, new Point(e.X, e.Y));
-            //}
-            //else
-            //{
-            //    e.Effect = DragDropEffects.None;
-            //}
-
             bool isDataFileDrop = e.Data.GetDataPresent(DataFormats.FileDrop);
             bool isDataSerializable = e.Data.GetDataPresent(DataFormats.Serializable);
 
             DragDropEffects effect = isDataFileDrop
                     ? DragDropEffects.All
                     : isDataSerializable
-                            //? DragOverTreeView_DraggedFileListEntries_PreSwitchEffect(e, tvSrcFolder)
                             ? DragEnterTreeView_DraggedFileListEntries(
                                     (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable),
                                     e.KeyState, e.AllowedEffect, tvSrcFolder, new Point(e.X, e.Y))
@@ -4660,13 +4748,6 @@ namespace FolderCategorizer.Presentation.View
 
             dropHelper.DragEnter(tvSrcFolder.PointToClient(new Point(e.X, e.Y)), effect, e.Data);
 
-            //if (isDataSerializable)
-            //{
-            //    e.Effect = DragEnterTreeView_DraggedFileListEntries(
-            //            (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable),
-            //            e.KeyState, e.AllowedEffect, tvSrcFolder, new Point(e.X, e.Y));
-            //}
-
             e.Effect = effect;
         }
 
@@ -4751,8 +4832,6 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_ItemDrag(object sender, ItemDragEventArgs e)
         {
-            //Logger.Info("lvFileList_ItemDrag");
-
             if (e.Button == MouseButtons.Left)
             {
                 DoDragDropFileList_DraggedFileListEntries_CreateEntries(lvFileList, tvSrcFolder1, tvSrcFolder2);
@@ -4767,12 +4846,9 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragEnter(object sender, DragEventArgs e)
         {
-            //Logger.Info("lvFileList_DragEnter");
-
             bool isDataSerializable = e.Data.GetDataPresent(DataFormats.Serializable);
 
             DragDropEffects effect = isDataSerializable
-                    //? DragOverFileList_DraggedFileListEntries_PreSwitchEffect(e, lvFileList)
                     ? DragEnterFileList_DraggedFileListEntries(
                             (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable),
                             e.KeyState, e.AllowedEffect, lvFileList, new Point(e.X, e.Y))
@@ -4785,12 +4861,9 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragOver(object sender, DragEventArgs e)
         {
-            //Logger.Info("lvFileList_DragOver");
-
             bool isDataSerializable = e.Data.GetDataPresent(DataFormats.Serializable);
 
             DragDropEffects effect = isDataSerializable
-                    //? DragOverFileList_DraggedFileListEntries_PreSwitchEffect(e, lvFileList)
                     ? DragOverFileList_DraggedFileListEntries_SwitchEffect(
                             (DraggedFileListEntriesHolder)e.Data.GetData(DataFormats.Serializable),
                             e.KeyState, e.AllowedEffect, lvFileList, new Point(e.X, e.Y))
@@ -4803,8 +4876,6 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragLeave(object sender, EventArgs e)
         {
-            //Logger.Info("lvFileList_DragLeave");
-
             dropHelper.DragLeave();
 
             DragLeaveFileList_DraggedFileListEntries(DraggedFileListEntries);
@@ -4812,8 +4883,6 @@ namespace FolderCategorizer.Presentation.View
 
         private void lvFileList_DragDrop(object sender, DragEventArgs e)
         {
-            //Logger.Info("lvFileList_DragDrop");
-
             dropHelper.Drop(PointToClient(MousePosition), e.Effect, e.Data);
 
             if (e.Data.GetDataPresent(DataFormats.Serializable))