Author: lluis
Date: 2005-11-17 05:57:18 -0500 (Thu, 17 Nov 2005)
New Revision: 53164
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/FileUtilityService.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
Log:
2005-11-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core/PropertyService.cs:
* MonoDevelop.Core/FileUtilityService.cs: Removed unused code.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-11-17
10:55:56 UTC (rev 53163)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-11-17
10:57:18 UTC (rev 53164)
@@ -1,3 +1,8 @@
+2005-11-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core/PropertyService.cs:
+ * MonoDevelop.Core/FileUtilityService.cs: Removed unused code.
+
2005-11-16 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core.AddIns.Setup/SetupTool.cs: Unified install and
rinstall
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/FileUtilityService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/FileUtilityService.cs
2005-11-17 10:55:56 UTC (rev 53163)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/FileUtilityService.cs
2005-11-17 10:57:18 UTC (rev 53164)
@@ -200,213 +200,5 @@
}
return directoryName + Path.DirectorySeparatorChar;
}
-
- // Observe SAVE functions
- public FileOperationResult ObservedSave(FileOperationDelegate
saveFile, string fileName, string message, FileErrorPolicy policy)
- {
- Debug.Assert(IsValidFileName(fileName));
-#if false
- try {
- saveFile();
- return FileOperationResult.OK;
- } catch (Exception e) {
- switch (policy) {
- case FileErrorPolicy.Inform:
- using (SaveErrorInformDialog
informDialog = new SaveErrorInformDialog(fileName, message, "Error while
saving", e)) {
-
informDialog.ShowDialog();
- }
- break;
- case FileErrorPolicy.ProvideAlternative:
- using (SaveErrorChooseDialog
chooseDialog = new SaveErrorChooseDialog(fileName, message, "Error while
saving", e, false)) {
- switch
(chooseDialog.ShowDialog()) {
- case
DialogResult.OK: // choose location (never happens here)
- break;
- case
DialogResult.Retry:
- return
ObservedSave(saveFile, fileName, message, policy);
- case
DialogResult.Ignore:
- return
FileOperationResult.Failed;
- }
- }
- break;
- }
- }
-#else
- try {
- saveFile();
- return FileOperationResult.OK;
- } catch (Exception e) {
- Console.WriteLine("Error while saving : " +
e.ToString());
- }
-
-#endif
- return FileOperationResult.Failed;
- }
-
- public FileOperationResult ObservedSave(FileOperationDelegate
saveFile, string fileName, FileErrorPolicy policy)
- {
- return ObservedSave(saveFile,
- fileName,
- GettextCatalog.GetString ("Unable
to save file."),
- policy);
- }
-
- public FileOperationResult ObservedSave(FileOperationDelegate
saveFile, string fileName)
- {
- return ObservedSave(saveFile, fileName,
FileErrorPolicy.Inform);
- }
-
- public FileOperationResult
ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName, string
message, FileErrorPolicy policy)
- {
- Debug.Assert(IsValidFileName(fileName));
-#if false
- try {
- fileName = System.IO.Path.GetFullPath
(fileName);
- saveFileAs(fileName);
- return FileOperationResult.OK;
- } catch (Exception e) {
- switch (policy) {
- case FileErrorPolicy.Inform:
- using (SaveErrorInformDialog
informDialog = new SaveErrorInformDialog(fileName, message, "Error while
saving", e)) {
-
informDialog.ShowDialog();
- }
- break;
- case FileErrorPolicy.ProvideAlternative:
- restartlabel:
- using
(SaveErrorChooseDialog chooseDialog = new SaveErrorChooseDialog(fileName,
message, "Error while saving", e, true)) {
- switch
(chooseDialog.ShowDialog()) {
- case
DialogResult.OK:
-
using (SaveFileDialog fdiag = new SaveFileDialog()) {
-
fdiag.OverwritePrompt = true;
-
fdiag.AddExtension = true;
-
fdiag.CheckFileExists = false;
-
fdiag.CheckPathExists = true;
-
fdiag.Title = "Choose alternate file name";
-
fdiag.FileName = fileName;
-
if (fdiag.ShowDialog() == DialogResult.OK) {
-
return ObservedSave(saveFileAs, fdiag.FileName, message,
policy);
-
} else {
-
goto restartlabel;
-
}
-
}
-
case DialogResult.Retry:
-
return ObservedSave(saveFileAs, fileName, message, policy);
- case
DialogResult.Ignore:
-
return FileOperationResult.Failed;
- }
- }
- break;
- }
- }
-#else
- try {
- saveFileAs(fileName);
- return FileOperationResult.OK;
- } catch (Exception e) {
- Console.WriteLine("Error while saving as : " +
e.ToString());
- }
-#endif
- return FileOperationResult.Failed;
- }
-
- public FileOperationResult
ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName,
FileErrorPolicy policy)
- {
- return ObservedSave(saveFileAs,
- fileName,
- GettextCatalog.GetString ("Unable
to save file."),
- policy);
- }
-
- public FileOperationResult
ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName)
- {
- return ObservedSave(saveFileAs, fileName,
FileErrorPolicy.Inform);
- }
-
- // Observe LOAD functions
- public FileOperationResult ObservedLoad(FileOperationDelegate
saveFile, string fileName, string message, FileErrorPolicy policy)
- {
- Debug.Assert(IsValidFileName(fileName));
-#if false
- try {
- saveFile();
- return FileOperationResult.OK;
- } catch (Exception e) {
- switch (policy) {
- case FileErrorPolicy.Inform:
- using (SaveErrorInformDialog
informDialog = new SaveErrorInformDialog(fileName, message, "Error while
loading", e)) {
-
informDialog.ShowDialog();
- }
- break;
- case FileErrorPolicy.ProvideAlternative:
- using (SaveErrorChooseDialog
chooseDialog = new SaveErrorChooseDialog(fileName, message, "Error while
loading", e, false)) {
- switch
(chooseDialog.ShowDialog()) {
- case
DialogResult.OK: // choose location (never happens here)
- break;
- case
DialogResult.Retry:
- return
ObservedLoad(saveFile, fileName, message, policy);
- case
DialogResult.Ignore:
- return
FileOperationResult.Failed;
- }
- }
- break;
- }
- }
-#else
- try {
- saveFile();
- return FileOperationResult.OK;
- } catch (Exception e) {
- Console.WriteLine("Error while loading " +
e.ToString());
- }
-#endif
- return FileOperationResult.Failed;
- }
-
- public FileOperationResult ObservedLoad(FileOperationDelegate
saveFile, string fileName, FileErrorPolicy policy)
- {
- return ObservedLoad(saveFile,
- fileName,
- GettextCatalog.GetString ("Unable
to load file."),
- policy);
- }
-
- public FileOperationResult ObservedLoad(FileOperationDelegate
saveFile, string fileName)
- {
- return ObservedSave(saveFile, fileName,
FileErrorPolicy.Inform);
- }
-
- class LoadWrapper
- {
- NamedFileOperationDelegate saveFileAs;
- string fileName;
-
- public LoadWrapper(NamedFileOperationDelegate
saveFileAs, string fileName)
- {
- this.saveFileAs = saveFileAs;
- this.fileName = fileName;
- }
-
- public void Invoke()
- {
- saveFileAs(fileName);
- }
- }
-
- public FileOperationResult
ObservedLoad(NamedFileOperationDelegate saveFileAs, string fileName, string
message, FileErrorPolicy policy)
- {
- return ObservedLoad(new FileOperationDelegate(new
LoadWrapper(saveFileAs, fileName).Invoke), fileName, message, policy);
- }
-
- public FileOperationResult
ObservedLoad(NamedFileOperationDelegate saveFileAs, string fileName,
FileErrorPolicy policy)
- {
- return ObservedLoad(saveFileAs,
- fileName,
- GettextCatalog.GetString ("Unable
to load file."),
- policy);
- }
-
- public FileOperationResult
ObservedLoad(NamedFileOperationDelegate saveFileAs, string fileName)
- {
- return ObservedLoad(saveFileAs, fileName,
FileErrorPolicy.Inform);
- }
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
2005-11-17 10:55:56 UTC (rev 53163)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/PropertyService.cs
2005-11-17 10:57:18 UTC (rev 53164)
@@ -81,9 +81,7 @@
doc.LoadXml("<?xml version=\"1.0\"?>\n<" +
propertyXmlRootNodeName + " fileversion = \"" + propertyFileVersion + "\" />");
doc.DocumentElement.AppendChild(ToXmlElement(doc));
-
- FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
- fileUtilityService.ObservedSave(new
NamedFileOperationDelegate(doc.Save), fileName,
FileErrorPolicy.ProvideAlternative);
+ doc.Save (fileName);
}
bool LoadPropertiesFromStream(string filename)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
