* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs:

* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
* core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs:
  Use IsValidFilePath instead of IsValidFileName when checking a path.

svn path=/trunk/monodevelop/; revision=122328

11 files changed, 26 insertions, 12 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 9907b2185c..cfa5bc279e 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-02  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MonoDevelop.Ide.Gui/Document.cs:
+	* MonoDevelop.Ide.Gui/Workbench.cs:
+	* MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
+	* MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs:
+	* MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs:
+	* MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:
+	* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
+	* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs: Use
+	IsValidFilePath instead of IsValidFileName when checking a path.
+
 2008-12-30  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: Fix overzealous suppression
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
index 43b2d52ae6..ce6dd6f047 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
@@ -333,12 +333,12 @@ namespace MonoDevelop.Ide.ExternalTools
 				do {
 					// loop through items in the tree
 					ExternalTool tool = toolListBox.Model.GetValue (current, 1) as ExternalTool;
-					if (!FileService.IsValidFileName (tool.Command)) {
+					if (!FileService.IsValidPath (tool.Command)) {
 						MessageService.ShowError (String.Format(GettextCatalog.GetString ("The command of tool \"{0}\" is invalid."), tool.MenuCommand));
 						return false;
 					}
 					
-					if ((tool.InitialDirectory != "") && !FileService.IsValidFileName (tool.InitialDirectory)) {
+					if ((tool.InitialDirectory != "") && !FileService.IsValidPath (tool.InitialDirectory)) {
 						MessageService.ShowError (String.Format(GettextCatalog.GetString ("The working directory of tool \"{0}\" is invalid.") ,tool.MenuCommand));
 						return false;
 					}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
index 8bc7c26b90..72b8c2d6f6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
@@ -382,8 +382,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
 			if(solution.Equals("")) solution = name; //This was empty when adding after first combine
 			
 			if (
-				!FileService.IsValidFileName (solution) || 
-			    	!FileService.IsValidFileName(name) ||
+				!FileService.IsValidPath (solution) || 
+			    !FileService.IsValidFileName(name) ||
 				!FileService.IsValidPath(location))
 			{
 				MessageService.ShowError (GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
index e4cba490b2..93381a82b9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
@@ -334,7 +334,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 					return false;
 				}
 
-				if (!FileService.IsValidFileName(directoryName)) {
+				if (!FileService.IsValidPath(directoryName)) {
 					MessageService.ShowError (GettextCatalog.GetString ("Invalid directory name: {0}", directoryName));
 					return false;
 				}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
index 1de461a528..f5bcdc7266 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
@@ -95,7 +95,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			// check for correct settings
 			string projectPath = folderEntry.Path;
 			if (projectPath.Length > 0) {
-				if (!FileService.IsValidFileName(projectPath)) {
+				if (!FileService.IsValidPath(projectPath)) {
 					MessageService.ShowError ("Invalid project path specified");
 					return false;
 				}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
index 9b4a9ee8b7..b72270df39 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
@@ -146,7 +146,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			
 			if (oldPath != newPath) {
 				try {
-					if (FileService.IsValidFileName (newPath)) {
+					if (FileService.IsValidPath (newPath)) {
 						FileService.RenameFile (oldPath, newName);
 						IdeApp.Workspace.Save();
 					}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
index 5d6a466d24..bf2a9ad870 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFolderNodeBuilder.cs
@@ -157,7 +157,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			if (oldFoldername != newFoldername) {
 				try {
 					
-					if (FileService.IsValidFileName (newFoldername)) {
+					if (FileService.IsValidPath (newFoldername)) {
 						FileService.RenameDirectory (oldFoldername, newName);
 						if (folder.Project != null)
 							IdeApp.ProjectOperations.Save (folder.Project);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
index 8924839943..c6240c719b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
@@ -106,7 +106,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			string newname = Path.Combine (Path.GetDirectoryName (oldname), newName);
 			if (oldname != newname) {
 				try {
-					if (FileService.IsValidFileName (newname)) {
+					if (FileService.IsValidPath (newname)) {
 						FileService.RenameFile (oldname, newName);
 					}
 				} catch (System.IO.IOException) {   // assume duplicate file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index d89246be11..bab259f702 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -411,7 +411,7 @@ namespace MonoDevelop.Ide.Gui
 				string fileName = content.ContentName.Substring(3).Replace('/', '.').Replace('\\', '.').Replace(System.IO.Path.DirectorySeparatorChar, '.');
 				string fullFileName = directory + System.IO.Path.DirectorySeparatorChar + fileName;
 				// check the file name length because it could be more than the maximum length of a file name
-				if (FileService.IsValidFileName(fullFileName) && File.Exists(fullFileName)) {
+				if (FileService.IsValidPath(fullFileName) && File.Exists(fullFileName)) {
 					return Properties.Load (fullFileName);
 				}
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
index c8ae93a36a..611070ab9f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
@@ -255,7 +255,7 @@ namespace MonoDevelop.Ide.Gui
 				}
 			}
 		
-			if (!FileService.IsValidFileName (filename)) {
+			if (!FileService.IsValidPath (filename)) {
 				MessageService.ShowMessage (GettextCatalog.GetString ("File name {0} is invalid", filename));
 				return;
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
index c5db09978e..6aae9315e6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
@@ -630,7 +630,7 @@ namespace MonoDevelop.Ide.Gui
 				if (!fileName.StartsWith ("http://"))
 					fileName = System.IO.Path.GetFullPath (fileName);
 				
-				//Debug.Assert(FileService.IsValidFileName(fileName));
+				//Debug.Assert(FileService.IsValidPath(fileName));
 				if (FileService.IsDirectory (fileName)) {
 					monitor.ReportError (GettextCatalog.GetString ("{0} is a directory", fileName), null);
 					return;