Renamed FileUtility.IsEqualFile to FileUtility.IsEqualFileName (this was a successful test of 'rename').

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@151 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Commands/ClassMemberMenuBuilder.cs

@@ -172,7 +172,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 			foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
 				if (content is ITextEditorControlProvider &&
 				    content.FileName != null &&
-				    FileUtility.IsEqualFile(content.FileName, fileName))
+				    FileUtility.IsEqualFileName(content.FileName, fileName))
 				{
 					return new ProvidedDocumentInformation(((ITextEditorControlProvider)content).TextEditorControl.Document, fileName, 0);
 				}

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs

@@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		public static void CopyDirectory(string directoryName, DirectoryNode node)
 		{
 			string copiedFileName = Path.Combine(node.Directory, Path.GetFileName(directoryName));
-			if (!FileUtility.IsEqualFile(directoryName, copiedFileName)) {
+			if (!FileUtility.IsEqualFileName(directoryName, copiedFileName)) {
 				FileUtility.DeepCopy(directoryName, copiedFileName, true);
 				DirectoryNode newNode = new DirectoryNode(copiedFileName);
 				newNode.AddTo(node);
@@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 				foreach (TreeNode childNode in node.Nodes) {
 					if (childNode is DirectoryNode) {
 						DirectoryNode directoryNode = (DirectoryNode)childNode;
-						if (FileUtility.IsEqualFile(directoryNode.Directory, copiedFileName)) {
+						if (FileUtility.IsEqualFileName(directoryNode.Directory, copiedFileName)) {
 							IncludeFileInProject.IncludeDirectoryNode(directoryNode, true);
 						}
 					}
@@ -62,7 +62,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		public static void CopyFile(string fileName, DirectoryNode node, bool includeInProject)
 		{
 			string copiedFileName = Path.Combine(node.Directory, Path.GetFileName(fileName));
-			if (!FileUtility.IsEqualFile(fileName, copiedFileName)) {
+			if (!FileUtility.IsEqualFileName(fileName, copiedFileName)) {
 				File.Copy(fileName, copiedFileName, true);
 				FileNode newNode = new FileNode(copiedFileName);
 				newNode.AddTo(node);
@@ -73,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 				foreach (TreeNode childNode in node.Nodes) {
 					if (childNode is FileNode) {
 						FileNode fileNode = (FileNode)childNode;
-						if (FileUtility.IsEqualFile(fileNode.FileName, copiedFileName)) {
+						if (FileUtility.IsEqualFileName(fileNode.FileName, copiedFileName)) {
 							IncludeFileInProject.IncludeFileNode(fileNode);
 						}
 					}

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs

@@ -243,7 +243,7 @@ namespace ICSharpCode.SharpDevelop.Project
 						bool isBelow = FileUtility.IsBaseDirectory(dirNode.Directory, cur.Value.FileName);
 						if (isBelow) {
 							// check if there is a 'folder' item.
-							if (FileUtility.IsEqualFile(dirNode.RelativePath, cur.Value.Include)) {
+							if (FileUtility.IsEqualFileName(dirNode.RelativePath, cur.Value.Include)) {
 								dirNode.ProjectItem = cur.Value;
 								if (cur.Value.ItemType == ItemType.WebReferences) {
 									dirNode.SpecialFolder = SpecialFolder.WebReferenceFolder;
@@ -261,7 +261,7 @@ namespace ICSharpCode.SharpDevelop.Project
 						}
 					} else if (node is FileNode) {
 						FileNode fileNode = (FileNode)node;
-						if (cur.Value is FileProjectItem && FileUtility.IsEqualFile(fileNode.FileName, cur.Value.FileName)) {
+						if (cur.Value is FileProjectItem && FileUtility.IsEqualFileName(fileNode.FileName, cur.Value.FileName)) {
 							FileProjectItem fileProjectItem = cur.Value as FileProjectItem;
 							if (fileProjectItem != null && fileProjectItem.DependentUpon != null && fileProjectItem.DependentUpon.Length > 0) {
 								dependendFileDictionary[fileNode] = fileProjectItem.DependentUpon;
@@ -403,14 +403,14 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 				if (dataObject.GetDataPresent(typeof(FileNode))) {
 					FileOperationClipboardObject clipboardObject = (FileOperationClipboardObject)dataObject.GetData(typeof(FileNode).ToString());
-					return !FileUtility.IsEqualFile(Directory, clipboardObject.FileName) && !FileUtility.IsEqualFile(Directory, Path.GetDirectoryName(clipboardObject.FileName)) && File.Exists(clipboardObject.FileName);
+					return !FileUtility.IsEqualFileName(Directory, clipboardObject.FileName) && !FileUtility.IsEqualFileName(Directory, Path.GetDirectoryName(clipboardObject.FileName)) && File.Exists(clipboardObject.FileName);
 				}
 				if (dataObject.GetDataPresent(typeof(DirectoryNode))) {
 					FileOperationClipboardObject clipboardObject = (FileOperationClipboardObject)dataObject.GetData(typeof(DirectoryNode).ToString());
 					if (FileUtility.IsBaseDirectory(clipboardObject.FileName, Directory)) {
 						return false;
 					}
-					return !FileUtility.IsEqualFile(Directory, clipboardObject.FileName) && !FileUtility.IsEqualFile(Directory, Path.GetDirectoryName(clipboardObject.FileName)) && System.IO.Directory.Exists(clipboardObject.FileName);
+					return !FileUtility.IsEqualFileName(Directory, clipboardObject.FileName) && !FileUtility.IsEqualFileName(Directory, Path.GetDirectoryName(clipboardObject.FileName)) && System.IO.Directory.Exists(clipboardObject.FileName);
 				}
 				return false;
 			}
@@ -489,7 +489,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			if (dataObject.GetDataPresent(typeof(FileNode))) {
 				FileNode fileNode = (FileNode)dataObject.GetData(typeof(FileNode));
 				
-				if (!FileUtility.IsEqualFile(Directory, fileNode.FileName) && !FileUtility.IsEqualFile(Directory, Path.GetDirectoryName(fileNode.FileName))) {
+				if (!FileUtility.IsEqualFileName(Directory, fileNode.FileName) && !FileUtility.IsEqualFileName(Directory, Path.GetDirectoryName(fileNode.FileName))) {
 					if (Project != fileNode.Project) {
 						return DragDropEffects.Copy;
 					}
@@ -502,7 +502,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				if (FileUtility.IsBaseDirectory(directoryNode.Directory, Directory)) {
 					return DragDropEffects.None;
 				}
-				if (!FileUtility.IsEqualFile(Directory, directoryNode.Directory) && !FileUtility.IsEqualFile(Directory, Path.GetDirectoryName(directoryNode.Directory))) {
+				if (!FileUtility.IsEqualFileName(Directory, directoryNode.Directory) && !FileUtility.IsEqualFileName(Directory, Path.GetDirectoryName(directoryNode.Directory))) {
 					if (Project != directoryNode.Project) {
 						return DragDropEffects.Copy;
 					}

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public override object Visit(SolutionItemNode solutionItemNode, object data)
 		{
-			if (FileUtility.IsEqualFile(oldName, solutionItemNode.FileName)) {
+			if (FileUtility.IsEqualFileName(oldName, solutionItemNode.FileName)) {
 				solutionItemNode.Text = Path.GetFileName(newName);
 			}
 			solutionItemNode.AcceptChildren(this, data);
@@ -47,7 +47,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public override object Visit(FileNode fileNode, object data)
 		{
-			if (FileUtility.IsEqualFile(oldName, fileNode.FileName)) {
+			if (FileUtility.IsEqualFileName(oldName, fileNode.FileName)) {
 				fileNode.FileName = FileUtility.RenameBaseDirectory(fileNode.FileName, oldName, newName);
 			}
 			fileNode.AcceptChildren(this, data);

src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs

@@ -346,7 +346,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			} else {
 				foreach (IViewContent content in ViewContentCollection) {
 					if (content.FileName != null &&
-					    FileUtility.IsEqualFile(content.FileName, e.SourceFile)) {
+					    FileUtility.IsEqualFileName(content.FileName, e.SourceFile)) {
 						content.FileName  = e.TargetFile;
 						content.TitleName = Path.GetFileName(e.TargetFile);
 						return;

src/Main/Base/Project/Src/Project/AbstractProject.cs

@@ -310,7 +310,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			for (int i = 0; i < items.Count; ++i) {
 				FileProjectItem fileItem = items[i] as FileProjectItem;
 				if (fileItem != null) {
-					if (FileUtility.IsEqualFile(fileItem.FileName, fileName)) {
+					if (FileUtility.IsEqualFileName(fileItem.FileName, fileName)) {
 						return true;
 					}
 				}

src/Main/Base/Project/Src/Services/File/FileService.cs

@@ -117,7 +117,7 @@ namespace ICSharpCode.Core
 				// WINDOWS DEPENDENCY : ToUpper()
 				if (content.FileName != null) {
 					try {
-						if (fileName.StartsWith("http://") ? content.FileName == fileName : FileUtility.IsEqualFile(content.FileName, fileName)) {
+						if (fileName.StartsWith("http://") ? content.FileName == fileName : FileUtility.IsEqualFileName(content.FileName, fileName)) {
 							content.WorkbenchWindow.SelectWindow();
 							return;
 						}
@@ -274,7 +274,7 @@ namespace ICSharpCode.Core
 					IViewContent viewContent = subViewContent as IViewContent;
 					if (viewContent != null && viewContent.FileName != null) {
 						try {
-							if (FileUtility.IsEqualFile(viewContent.FileName, fileName)) {
+							if (FileUtility.IsEqualFileName(viewContent.FileName, fileName)) {
 								if (viewContent is IPositionable) {
 									window.SwitchView(i);
 									((IPositionable)viewContent).JumpTo(Math.Max(0, line), Math.Max(0, column));

src/Main/Base/Project/Src/Services/Tasks/TaskService.cs

@@ -106,7 +106,7 @@ namespace ICSharpCode.Core
 		{
 			for (int i = 0; i < tasks.Count; ++i) {
 				Task curTask = tasks[i];
-				if (FileUtility.IsEqualFile(curTask.FileName, e.FileName)) {
+				if (FileUtility.IsEqualFileName(curTask.FileName, e.FileName)) {
 					Remove(curTask);
 					--i;
 				}
@@ -117,7 +117,7 @@ namespace ICSharpCode.Core
 		{
 			for (int i = 0; i < tasks.Count; ++i) {
 				Task curTask = tasks[i];
-				if (FileUtility.IsEqualFile(curTask.FileName, e.SourceFile)) {
+				if (FileUtility.IsEqualFileName(curTask.FileName, e.SourceFile)) {
 					Remove(curTask);
 					curTask.FileName = Path.GetFullPath(e.TargetFile);
 					Add(curTask);
@@ -174,7 +174,7 @@ namespace ICSharpCode.Core
 			List<Task> oldTasks = new List<Task>();
 			
 			foreach (Task task in CommentTasks) {
-				if (FileUtility.IsEqualFile(task.FileName, fileName)) {
+				if (FileUtility.IsEqualFileName(task.FileName, fileName)) {
 					oldTasks.Add(task);
 				}
 			}

src/Main/Base/Project/Src/TextEditor/Bookmarks/BookmarkManager.cs

@@ -24,7 +24,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			
 			foreach (SDBookmark mark in bookmarks) {
 				if (mark.FileName == null) continue;
-				if (FileUtility.IsEqualFile(mark.FileName, fileName)) {
+				if (FileUtility.IsEqualFileName(mark.FileName, fileName)) {
 					marks.Add(mark);
 				}
 			}

src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/DocumentIterator/DirectoryDocumentIterator.cs

@@ -60,7 +60,7 @@ namespace SearchAndReplace
 				string fileName = files[curIndex].ToString();
 				foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
 					if (content.FileName != null &&
-					    FileUtility.IsEqualFile(content.FileName, fileName)) {
+					    FileUtility.IsEqualFileName(content.FileName, fileName)) {
 						document = ((ITextEditorControlProvider)content).TextEditorControl.Document;
 						return new ProvidedDocumentInformation(document,
 						                                       fileName,

src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

@@ -156,7 +156,7 @@ namespace ICSharpCode.Core
 			return Path.GetFullPath(Path.Combine(baseDirectoryPath, relPath));
 		}
 		
-		public static bool IsEqualFile(string fileName1, string fileName2)
+		public static bool IsEqualFileName(string fileName1, string fileName2)
 		{
 			// Optimized for performance:
 			//return Path.GetFullPath(fileName1.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).ToLower() == Path.GetFullPath(fileName2.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)).ToLower();

src/Main/Core/Test/AddInTreeTests/ExtPathTests.cs

@@ -63,11 +63,11 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
 		[Test]
 		public void TestIsEqualFile()
 		{
-			Assert.IsTrue(FileUtility.IsEqualFile(@"C:\.\Hello World.Exe", @"C:\HELLO WOrld.exe"));
-			Assert.IsTrue(FileUtility.IsEqualFile(@"C:\bla\..\a\my.file.is.this", @"C:\gg\..\.\.\.\.\a\..\a\MY.FILE.IS.THIS"));
+			Assert.IsTrue(FileUtility.IsEqualFileName(@"C:\.\Hello World.Exe", @"C:\HELLO WOrld.exe"));
+			Assert.IsTrue(FileUtility.IsEqualFileName(@"C:\bla\..\a\my.file.is.this", @"C:\gg\..\.\.\.\.\a\..\a\MY.FILE.IS.THIS"));
 			
-			Assert.IsFalse(FileUtility.IsEqualFile(@"C:\.\Hello World.Exe", @"C:\HELLO_WOrld.exe"));
-			Assert.IsFalse(FileUtility.IsEqualFile(@"C:\a\my.file.is.this", @"C:\gg\..\.\.\.\.\a\..\b\MY.FILE.IS.THIS"));
+			Assert.IsFalse(FileUtility.IsEqualFileName(@"C:\.\Hello World.Exe", @"C:\HELLO_WOrld.exe"));
+			Assert.IsFalse(FileUtility.IsEqualFileName(@"C:\a\my.file.is.this", @"C:\gg\..\.\.\.\.\a\..\b\MY.FILE.IS.THIS"));
 			
 		}