Author: lluis
Date: 2006-12-17 12:42:07 -0500 (Sun, 17 Dec 2006)
New Revision: 69621
Modified:
trunk/monodevelop/Extras/VBNetBinding/ChangeLog
trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
trunk/monodevelop/Extras/VBNetBinding/Gui/VBCompilerPanel.cs
trunk/monodevelop/Extras/VBNetBinding/Gui/VBDocConfigurationPanel.cs
trunk/monodevelop/Extras/VBNetBinding/ProjectNodeBuilder.cs
trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
Log:
* Gui/VBCompilerPanel.cs, ProjectNodeBuilder.cs,
VBBindingCompilerServices.cs: Track changes in the FileService
class.
* Gui/VBDocConfigurationPanel.cs: Use the FileService for deleting
files.
* Gui/CodeGenerationPanel.cs: Removed unused var.
Modified: trunk/monodevelop/Extras/VBNetBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2006-12-17 17:41:37 UTC
(rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2006-12-17 17:42:07 UTC
(rev 69621)
@@ -1,3 +1,12 @@
+2006-12-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Gui/VBCompilerPanel.cs, ProjectNodeBuilder.cs,
+ VBBindingCompilerServices.cs: Track changes in the FileService
+ class.
+ * Gui/VBDocConfigurationPanel.cs: Use the FileService for deleting
+ files.
+ * Gui/CodeGenerationPanel.cs: Removed unused var.
+
2006-12-15 Ankit Jain <[EMAIL PROTECTED]>
* VBBindingCompilerServices.cs (Compile): Filename arg to resgen should
Modified: trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
2006-12-17 17:41:37 UTC (rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
2006-12-17 17:42:07 UTC (rev 69621)
@@ -28,7 +28,6 @@
/*
ResourceService resourceService =
(ResourceService)ServiceManager.GetService(typeof(IResourceService));
- static FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
public override bool ReceiveDialogMessage(DialogMessage message)
{
@@ -36,9 +35,7 @@
if (compilerParameters == null) {
return true;
}
- FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-
compilerParameters.DefineSymbols =
ControlDictionary["symbolsTextBox"].Text;
compilerParameters.MainClass =
ControlDictionary["mainClassTextBox"].Text;
compilerParameters.Imports =
ControlDictionary["importsTextBox"].Text;
Modified: trunk/monodevelop/Extras/VBNetBinding/Gui/VBCompilerPanel.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/Gui/VBCompilerPanel.cs
2006-12-17 17:41:37 UTC (rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/Gui/VBCompilerPanel.cs
2006-12-17 17:42:07 UTC (rev 69621)
@@ -31,9 +31,8 @@
DotNetProjectConfiguration cfg =
(DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
config = (VBCompilerParameters)
cfg.CompilationParameters;
- FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
((ComboBox)ControlDictionary["compilerVersionComboBox"]).Items.Add("Standard");
- foreach (string runtime in
fileUtilityService.GetAvaiableRuntimeVersions()) {
+ foreach (string runtime in
Runtime.FileService.GetAvaiableRuntimeVersions()) {
((ComboBox)ControlDictionary["compilerVersionComboBox"]).Items.Add(runtime);
}
Modified: trunk/monodevelop/Extras/VBNetBinding/Gui/VBDocConfigurationPanel.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/Gui/VBDocConfigurationPanel.cs
2006-12-17 17:41:37 UTC (rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/Gui/VBDocConfigurationPanel.cs
2006-12-17 17:42:07 UTC (rev 69621)
@@ -21,7 +21,6 @@
VBCompilerParameters compilerParameters = null;
VBProject project = null;
ResourceService resourceService =
(ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- static FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
static PropertyService propertyService =
(PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
///<summary>
Modified: trunk/monodevelop/Extras/VBNetBinding/ProjectNodeBuilder.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/ProjectNodeBuilder.cs 2006-12-17
17:41:37 UTC (rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/ProjectNodeBuilder.cs 2006-12-17
17:42:07 UTC (rev 69621)
@@ -26,7 +26,6 @@
{
public class VBNodeBuilder : IProjectNodeBuilder
{
- FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
IconService iconService =
(IconService)ServiceManager.GetService(typeof(IconService));
public bool CanBuildProjectTree(Project project)
@@ -44,7 +43,7 @@
// create 'empty' directories
for (int i = 0; i < project.ProjectFiles.Count; ++i) {
if (project.ProjectFiles[i].Subtype ==
Subtype.Directory) {
- string directoryName =
fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory,
project.ProjectFiles[i].Name);
+ string directoryName =
Runtime.FileService.AbsoluteToRelativePath(project.BaseDirectory,
project.ProjectFiles[i].Name);
// if directoryname starts with ./ oder
.\
if (directoryName.StartsWith(".")) {
@@ -69,7 +68,7 @@
if (project.ProjectFiles[i].Subtype !=
Subtype.Directory) {
ProjectFile fileInformation =
project.ProjectFiles[i];
- string relativeFile =
fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory,
fileInformation.Name);
+ string relativeFile =
Runtime.FileService.AbsoluteToRelativePath(project.BaseDirectory,
fileInformation.Name);
string fileName =
Path.GetFileName(fileInformation.Name);
@@ -118,7 +117,7 @@
if (node == null) {
if (create) {
- DirectoryNode newFolderNode =
new
DirectoryNode(fileUtilityService.GetDirectoryNameWithSeparator(ConstructFolderName(curpathnode))
+ path);
+ DirectoryNode newFolderNode =
new
DirectoryNode(Runtime.FileService.GetDirectoryNameWithSeparator(ConstructFolderName(curpathnode))
+ path);
curpathnode.Nodes.Add(newFolderNode);
curpathnode = newFolderNode;
continue;
Modified: trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2006-12-17 17:41:37 UTC (rev 69620)
+++ trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2006-12-17 17:42:07 UTC (rev 69621)
@@ -27,12 +27,9 @@
/// </summary>
public class VBBindingCompilerServices
{
-
static Regex regexError = new Regex
(@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-
- FileUtilityService fileUtilityService =
(FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
PropertyService propertyService =
(PropertyService)ServiceManager.GetService(typeof(PropertyService));
public bool CanCompile(string fileName)
@@ -203,9 +200,9 @@
ICompilerResult result = ParseOutput(tf, output);
ParseOutput(tf,error);
- File.Delete(responseFileName);
- File.Delete(output);
- File.Delete(error);
+ Runtime.FileService.DeleteFile (responseFileName);
+ Runtime.FileService.DeleteFile (output);
+ Runtime.FileService.DeleteFile (error);
if (configuration.CompileTarget !=
CompileTarget.Library) {
WriteManifestFile(exe);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches