[Monodevelop-patches-list] r1686 - in trunk/MonoDevelop: . src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs src/Main/Base/Commands/ProjectBrowserCommands src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions src/Main/Base/Gui/Workbench/Layouts

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Wed Jun 2 13:58:34 EDT 2004


Author: jzwart
Date: 2004-06-02 13:58:34 -0400 (Wed, 02 Jun 2004)
New Revision: 1686

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
   trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
   trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SplashScreen.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
Log:
2004-06-02  Jeroen Zwartepoorte  <jeroen at xs4all.nl>

	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/
	ExportProjectToHtmlDialog.cs:
	* src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs:
	* src/Main/Base/Commands/ProjectBrowserCommands/
	ResourceFolderNodeCommands.cs: 
	* src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs:
	* src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs:
	* src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs:
	* src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
	* src/Main/Base/Gui/Dialogs/SplashScreen.cs:
	* src/Main/Base/Gui/Dialogs/NewProjectDialog.cs:
	* src/Main/Base/Gui/Dialogs/WordCountDialog.cs:
	* src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/
	DeployFileOptions.cs:
	
	s/File/System.IO.File/ to make MD compile with the jeroen-gtk-2-4
	branch of gtk-sharp (in GTK+-2.4, there's a Gtk.File class now).



Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/ChangeLog	2004-06-02 17:58:34 UTC (rev 1686)
@@ -1,3 +1,23 @@
+2004-06-02  Jeroen Zwartepoorte  <jeroen at xs4all.nl>
+
+	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/
+	ExportProjectToHtmlDialog.cs:
+	* src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs:
+	* src/Main/Base/Commands/ProjectBrowserCommands/
+	ResourceFolderNodeCommands.cs: 
+	* src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs:
+	* src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs:
+	* src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs:
+	* src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+	* src/Main/Base/Gui/Dialogs/SplashScreen.cs:
+	* src/Main/Base/Gui/Dialogs/NewProjectDialog.cs:
+	* src/Main/Base/Gui/Dialogs/WordCountDialog.cs:
+	* src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/
+	DeployFileOptions.cs:
+	
+	s/File/System.IO.File/ to make MD compile with the jeroen-gtk-2-4
+	branch of gtk-sharp (in GTK+-2.4, there's a Gtk.File class now).
+
 2004-06-01  Todd Berman  <tberman at sevenl.net>
 
 	* monodevelop.in: patch from cmeadors to fix weird startup issue.

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -155,11 +155,11 @@
 			
 			//IDocument document = new DocumentFactory ().CreateDocument ();
 			//document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategyForFile (fileName);
-			StreamReader stream = File.OpenText (fileName);
+			StreamReader stream = System.IO.File.OpenText (fileName);
 			//document.TextContent = stream.ReadToEnd ();
 			stream.Close ();
 			
-			curFileStream = File.CreateText (System.IO.Path.Combine (targetPath, targetFile));
+			curFileStream = System.IO.File.CreateText (System.IO.Path.Combine (targetPath, targetFile));
 			curFileStream.Write ("<html>\r\n");
 			curFileStream.Write ("<head>\r\n");
 			curFileStream.Write ("<link rel=\"stylesheet\" type=\"text/css\" href=\"sdcss.css\">\r\n");
@@ -264,7 +264,7 @@
 		
 		void WriteIndexTable (string fileName, string name, ArrayList nameList, Hashtable table)
 		{
-			curIndexStreamStack.Push (File.CreateText(fileName));
+			curIndexStreamStack.Push (System.IO.File.CreateText(fileName));
 			StreamWriter curIndexStream = (StreamWriter) curIndexStreamStack.Peek();
 			
 			curIndexStream.Write ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\r\n");
@@ -310,7 +310,7 @@
 				} else if (entry.Value is ProjectFile) {
 					ProjectFile fInfo = (ProjectFile) entry.Value;
 					DateTime time = Directory.GetLastAccessTime (fInfo.Name);
-					FileStream reader = File.OpenRead (fInfo.Name);
+					FileStream reader = System.IO.File.OpenRead (fInfo.Name);
 					long size = reader.Length;
 					reader.Close ();
 					
@@ -383,7 +383,7 @@
 		void CreateCSS (string targetPath)
 		{
 			//lock (this) {
-				StreamWriter sw = File.CreateText (System.IO.Path.Combine (targetPath, "sdcss.css"));
+				StreamWriter sw = System.IO.File.CreateText (System.IO.Path.Combine (targetPath, "sdcss.css"));
 				sw.Write ("div.code\r\n");
 				sw.Write ("{\r\n");
 				sw.Write ("	background-color: rgb(255,255,255);\r\n");

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -193,7 +193,7 @@
 		
 		public void LoadFile (string file, string mime)
 		{
-			StreamReader sr = File.OpenText (file);
+			StreamReader sr = System.IO.File.OpenText (file);
 			LoadText (sr.ReadToEnd (), mime);		
 			sr.Close ();
 			Modified = false;
@@ -202,7 +202,7 @@
 		public void LoadFile (string file)
 		{
 			using (NoUndo n = new NoUndo (this)) {
-				StreamReader sr = File.OpenText (file);
+				StreamReader sr = System.IO.File.OpenText (file);
 				Text = sr.ReadToEnd ();
 				sr.Close ();
 			}

Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -122,7 +122,7 @@
 					
 				// if it is already in the project, or it does exists we try to get a name that is
 				// untitledName + Numer + extension
-				while (node.Project.IsFileInProject(fileName) || File.Exists(fileName)) {
+				while (node.Project.IsFileInProject(fileName) || System.IO.File.Exists(fileName)) {
 					fileName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName + count.ToString() + extension;
 					++count;
 				}

Modified: trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -55,7 +55,7 @@
 						return;
 				
 					foreach (string file in files) {
-						if (! File.Exists (file)) {
+						if (!System.IO.File.Exists (file)) {
 							IMessageService messageService = (IMessageService) ServiceManager.Services.GetService (typeof (IMessageService));
 							messageService.ShowError (String.Format (GettextCatalog.GetString ("Resource file '{0}' does not exist"), file));
 							goto show_dialog;

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -66,7 +66,7 @@
 			Stream s = null;
 
 			try {
-				s = File.OpenRead(compressedFile);
+				s = System.IO.File.OpenRead(compressedFile);
 				
 				ProgressHolder ph = new ProgressHolder();
 				ph.currentProgress = maxAmount / 2;
@@ -76,7 +76,7 @@
 				ph.s = s;
 				Decompressor archive = Decompressor.Load(SourceUri.ToString());
 				archive.Extract(new ReportingStream(s, new ReadNotification(updateProgress), ph), completionDir);
-				File.Delete(compressedFile);
+				System.IO.File.Delete(compressedFile);
 			} catch (Exception e) {
 				throw new Exception("Could not extract archive " + compressedFile + " of type " + Decompressor.GetTypeFromString(SourceUri.ToString()), e);
 			} finally {

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -25,7 +25,7 @@
 				throw new PathNotCodeCompletionDatabaseException(Path + " is not a valid file name\n");
 			if (!Directory.Exists(Path))
 				throw new PathNotCodeCompletionDatabaseException("Directory " + Path + " does not exist");
-			if (!File.Exists(fileUtilityService.GetDirectoryNameWithSeparator(Path) + "CodeCompletionProxyDataV02.bin"))
+			if (!System.IO.File.Exists(fileUtilityService.GetDirectoryNameWithSeparator(Path) + "CodeCompletionProxyDataV02.bin"))
 				throw new PathNotCodeCompletionDatabaseException(Path + " does not contain valid code completion data");
 
 			PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -172,7 +172,7 @@
 		{
 			project.ProjectFiles.Add (new ProjectFile(filename));
 			
-			StreamWriter sr = File.CreateText (filename);
+			StreamWriter sr = System.IO.File.CreateText (filename);
 			sr.Write(stringParserService.Parse(content, new string[,] { {"PROJECT", txt_name.Text}, {"FILE", System.IO.Path.GetFileName(filename)}}));
 			sr.Close();
 			

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -163,7 +163,7 @@
 					}
 				}
 				
-				if (!File.Exists(deployScriptEntry.Text)) {
+				if (!System.IO.File.Exists(deployScriptEntry.Text)) {
 					MessageDialog dialog = new MessageDialog ((Window) WorkbenchSingleton.Workbench, 
 							DialogFlags.DestroyWithParent,
 							MessageType.Error, 

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SplashScreen.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SplashScreen.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SplashScreen.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -60,7 +60,7 @@
 					a = System.IO.Path.Combine (Environment.GetEnvironmentVariable ("HOME"), a.Substring (1));
 				}
 				
-				if (File.Exists (a))
+				if (System.IO.File.Exists (a))
 				{
 					requestedFileList.Add (a);
 					return;

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -70,7 +70,7 @@
 			long numWords = 0;
 			long numChars = 0;
 			
-			if (!File.Exists(filename)) return null;
+			if (!System.IO.File.Exists(filename)) return null;
 			
 			FileStream istream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
 			StreamReader sr = new StreamReader(istream);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	2004-06-02 15:44:19 UTC (rev 1685)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	2004-06-02 17:58:34 UTC (rev 1686)
@@ -314,7 +314,7 @@
 				
 			//Console.WriteLine(" Default Layout created.");
 			dockLayout = new DockLayout (dock);
-			if (File.Exists (configFile)) {
+			if (System.IO.File.Exists (configFile)) {
 				dockLayout.LoadFromFile (configFile);
 			} else {
 				dockLayout.LoadFromFile ("../data/options/DefaultEditingLayout.xml");




More information about the Monodevelop-patches-list mailing list