[RootWorkspace] Some generic file cleanup that optimizes:

Make some functions static, add Ordinal comparison argument.

1 files changed, 18 insertions, 14 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
index 9fa9776074..22ae3d38d5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
@@ -300,7 +300,7 @@ namespace MonoDevelop.Ide
 			IdeApp.ProjectOperations.Clean (this);
 		}
 
-		public IAsyncOperation Execute ()
+		public static IAsyncOperation Execute ()
 		{
 			if (IdeApp.ProjectOperations.CurrentSelectedSolution != null)
 				return IdeApp.ProjectOperations.Execute (IdeApp.ProjectOperations.CurrentSelectedSolution);
@@ -310,7 +310,7 @@ namespace MonoDevelop.Ide
 			}
 		}
 
-		public bool CanExecute ()
+		public static bool CanExecute ()
 		{
 			if (IdeApp.ProjectOperations.CurrentSelectedSolution != null)
 				return IdeApp.ProjectOperations.CanExecute (IdeApp.ProjectOperations.CurrentSelectedSolution);
@@ -521,7 +521,7 @@ namespace MonoDevelop.Ide
 					return MonoDevelop.Core.ProgressMonitoring.NullAsyncOperation.Failure;
 			}
 
-			if (filename.StartsWith ("file://"))
+			if (filename.StartsWith ("file://", StringComparison.Ordinal))
 				filename = new Uri(filename).LocalPath;
 
 			var monitor = IdeApp.Workbench.ProgressMonitors.GetProjectLoadProgressMonitor (true);
@@ -645,7 +645,7 @@ namespace MonoDevelop.Ide
 			}
 		}
 		
-		void SearchNewFiles (Project project)
+		static void SearchNewFiles (Project project)
 		{
 			var newFiles = new List<string> ();
 			string[] collection = Directory.GetFiles (project.BaseDirectory, "*", SearchOption.AllDirectories);
@@ -700,12 +700,12 @@ namespace MonoDevelop.Ide
 			});
 		}
 		
-		bool IgnoreFileInSearch (string sfile)
+		static bool IgnoreFileInSearch (string sfile)
 		{
 			string extension = Path.GetExtension (sfile).ToUpper();
 			string file = Path.GetFileName (sfile);
 			
-			if (file.StartsWith (".") || file.EndsWith ("~"))
+			if (file.StartsWith (".", StringComparison.Ordinal) || file.EndsWith ("~", StringComparison.Ordinal))
 				return true;
 			
 			string[] ignoredExtensions = new string [] {
@@ -716,17 +716,21 @@ namespace MonoDevelop.Ide
 				return true;
 			
 			string directory = Path.GetDirectoryName (sfile);
-			if (directory.IndexOf (".svn") != -1 || directory.IndexOf (".git") != -1 || directory.IndexOf ("CVS") != -1)
+			if (directory.IndexOf (".svn", StringComparison.Ordinal) != -1 ||
+				directory.IndexOf (".git", StringComparison.Ordinal) != -1 ||
+				directory.IndexOf ("CVS", StringComparison.Ordinal) != -1)
 				return true;
 			
-			if (directory.IndexOf (Path.DirectorySeparatorChar + "bin" + Path.DirectorySeparatorChar) != -1
-				|| directory.IndexOf (Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar) != -1)
+			if (directory.IndexOf (Path.DirectorySeparatorChar + "bin" + Path.DirectorySeparatorChar, StringComparison.Ordinal) != -1 ||
+				directory.IndexOf (Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar, StringComparison.Ordinal) != -1)
 				return true;
 			
-			if (file.EndsWith ("make.sh") || file.StartsWith ("Makefile") || directory.EndsWith ("ProjectDocumentation"))
+			if (file.EndsWith ("make.sh", StringComparison.Ordinal) ||
+				file.StartsWith ("Makefile", StringComparison.Ordinal) ||
+				directory.EndsWith ("ProjectDocumentation", StringComparison.Ordinal))
 				return true;
 			
-			return false;			
+			return false;
 		}
 		
 		void RestoreWorkspacePreferences (WorkspaceItem item)
@@ -825,14 +829,14 @@ namespace MonoDevelop.Ide
 			item.SaveUserProperties ();
 		}
 		
-		public FileStatusTracker GetFileStatusTracker ()
+		public static FileStatusTracker GetFileStatusTracker ()
 		{
 			FileStatusTracker fs = new FileStatusTracker ();
 			fs.AddFiles (GetKnownFiles ());
 			return fs;
 		}
 		
-		IEnumerable<FilePath> GetKnownFiles ()
+		static IEnumerable<FilePath> GetKnownFiles ()
 		{
 			foreach (WorkspaceItem item in IdeApp.Workspace.Items) {
 				foreach (FilePath file in item.GetItemFiles (true))
@@ -1038,7 +1042,7 @@ namespace MonoDevelop.Ide
 			return true;
 		}
 		
-		internal List<Document> GetOpenDocuments (Project project, bool modifiedOnly)
+		internal static List<Document> GetOpenDocuments (Project project, bool modifiedOnly)
 		{
 			List<Document> docs = new List<Document> ();
 			foreach (Document doc in IdeApp.Workbench.Documents) {