Author: mkrueger
Date: 2007-08-31 10:04:20 -0400 (Fri, 31 Aug 2007)
New Revision: 85110
Modified:
trunk/monodevelop/Extras/VBNetBinding/ChangeLog
trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
trunk/monodevelop/Extras/VBNetBinding/Parser/Resolver.cs
trunk/monodevelop/Extras/VBNetBinding/VBAmbience.cs
trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
Log:
* Gui/CodeGenerationPanel.cs, Parser/Resolver.cs, VBAmbience.cs,
VBBindingCompilerServices.cs: Changes due to new property
infrastructure.
Modified: trunk/monodevelop/Extras/VBNetBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2007-08-31 14:03:48 UTC
(rev 85109)
+++ trunk/monodevelop/Extras/VBNetBinding/ChangeLog 2007-08-31 14:04:20 UTC
(rev 85110)
@@ -1,3 +1,9 @@
+2007-08-31 Mike Krüger <[EMAIL PROTECTED]>
+
+ * Gui/CodeGenerationPanel.cs, Parser/Resolver.cs, VBAmbience.cs,
+ VBBindingCompilerServices.cs: Changes due to new property
+ infrastructure.
+
2007-08-23 Mike Krüger <[EMAIL PROTECTED]>
* Parser/Parser.cs, Parser/VBNetVisitor.cs, Parser/Resolver.cs,
Modified: trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
2007-08-31 14:03:48 UTC (rev 85109)
+++ trunk/monodevelop/Extras/VBNetBinding/Gui/CodeGenerationPanel.cs
2007-08-31 14:04:20 UTC (rev 85110)
@@ -12,7 +12,7 @@
using MonoDevelop.Projects;
using MonoDevelop.Core.Gui.Dialogs;
using MonoDevelop.Core;
-using MonoDevelop.Core.Properties;
+using MonoDevelop.Core;
using Mono.Addins;
using MonoDevelop.Components;
@@ -54,7 +54,7 @@
void SetValues(object sender, EventArgs e)
{
- this.compilerParameters =
(VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ this.compilerParameters =
(VBCompilerParameters)((Properties)CustomizationObject).Get("Config");
ControlDictionary["symbolsTextBox"].Text =
compilerParameters.DefineSymbols;
ControlDictionary["mainClassTextBox"].Text =
compilerParameters.MainClass;
@@ -71,8 +71,8 @@
((CheckBox)ControlDictionary["optionStrictCheckBox"]).Checked =
compilerParameters.OptionStrict;
}
- static PropertyService propertyService =
(PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- public CodeGenerationPanel() :
base(propertyService.DataDirectory +
@"\resources\panels\ProjectOptions\VBNetCodeGenerationPanel.xfrm")
+ static PropertyService PropertyService =
(PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ public CodeGenerationPanel() :
base(PropertyService.DataDirectory +
@"\resources\panels\ProjectOptions\VBNetCodeGenerationPanel.xfrm")
{
CustomizationObjectChanged += new
EventHandler(SetValues);
@@ -124,19 +124,19 @@
DotNetProjectConfiguration configuration;
VBCompilerParameters compilerParameters = null;
- //static PropertyService propertyService =
(PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ //static PropertyService PropertyService =
(PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- public CodeGenerationPanelWidget(IProperties
CustomizationObject) : base ("VB.glade", "CodeGenerationPanel")
+ public CodeGenerationPanelWidget(Properties
CustomizationObject) : base ("VB.glade", "CodeGenerationPanel")
{
- configuration =
(DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
+ configuration =
((Properties)CustomizationObject).Get<DotNetProjectConfiguration> ("Config");
compilerParameters = (VBCompilerParameters)
configuration.CompilationParameters;
SetValues();
//CustomizationObjectChanged += new
EventHandler(SetValues);
}
public void SetValues(){
- //this.compilerParameters =
(VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ //this.compilerParameters =
(VBCompilerParameters)((Properties)CustomizationObject).Get("Config");
// FIXME: Enable when mbas has this feature
generateXmlOutputCheckButton.Sensitive = false;
@@ -194,7 +194,7 @@
public override void LoadPanelContents()
{
- Add (widget = new CodeGenerationPanelWidget
((IProperties) CustomizationObject));
+ Add (widget = new CodeGenerationPanelWidget
((Properties) CustomizationObject));
}
public override bool StorePanelContents()
Modified: trunk/monodevelop/Extras/VBNetBinding/Parser/Resolver.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/Parser/Resolver.cs 2007-08-31
14:03:48 UTC (rev 85109)
+++ trunk/monodevelop/Extras/VBNetBinding/Parser/Resolver.cs 2007-08-31
14:04:20 UTC (rev 85110)
@@ -640,7 +640,7 @@
bool InStatic()
{
- IProperty property = GetProperty();
+ IProperty property = Get();
if (property != null) {
return property.IsStatic;
}
@@ -932,7 +932,7 @@
return null;
}
- IProperty GetProperty()
+ IProperty Get()
{
foreach (IProperty property in callingClass.Properties)
{
if (property.BodyRegion != null &&
property.BodyRegion.IsInside(caretLine, caretColumn)) {
@@ -954,7 +954,7 @@
IReturnType SearchProperty()
{
- IProperty property = GetProperty();
+ IProperty property = Get();
if (property == null) {
return null;
}
Modified: trunk/monodevelop/Extras/VBNetBinding/VBAmbience.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/VBAmbience.cs 2007-08-31 14:03:48 UTC
(rev 85109)
+++ trunk/monodevelop/Extras/VBNetBinding/VBAmbience.cs 2007-08-31 14:04:20 UTC
(rev 85110)
@@ -10,8 +10,8 @@
using System.Text;
using MonoDevelop.Projects.Parser;
-using MonoDevelop.Core.Properties;
using MonoDevelop.Core;
+using MonoDevelop.Core;
using MonoDevelop.Projects.Ambience;
namespace MonoDevelop.Core
Modified: trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2007-08-31 14:03:48 UTC (rev 85109)
+++ trunk/monodevelop/Extras/VBNetBinding/VBBindingCompilerServices.cs
2007-08-31 14:04:20 UTC (rev 85110)
@@ -30,8 +30,6 @@
static Regex regexError = new Regex
(@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
RegexOptions.Compiled | RegexOptions.ExplicitCapture);
- PropertyService propertyService =
(PropertyService)ServiceManager.GetService(typeof(PropertyService));
-
public bool CanCompile(string fileName)
{
return Path.GetExtension(fileName) == ".vb";
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
