Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@novell.com>2011-06-18 13:14:07 +0400
committerMike Krüger <mkrueger@novell.com>2011-06-18 13:14:07 +0400
commit849b8902d02844df030ba376af9cee6e741e53af (patch)
tree1be869c1626591b12fff2cb5b7c31d3d39a98eac /main/src/addins/MonoDevelop.Moonlight
parent63b0e87ea18f73ad16caa83bf4107038c4264535 (diff)
Updated NRefactory. Some members got renamed.
Diffstat (limited to 'main/src/addins/MonoDevelop.Moonlight')
-rw-r--r--main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs2
-rw-r--r--main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightEditorExtension.cs8
-rw-r--r--main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightParser.cs4
3 files changed, 7 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs
index dacfb1b492..9f866a585e 100644
--- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs
@@ -95,7 +95,7 @@ namespace MonoDevelop.Moonlight.Gui
classesFilled = true;
try {
var dom = TypeSystemService.GetContext (project);
- IType appType = dom.GetClass ("System.Windows", "Application", 0, StringComparer.Ordinal);
+ IType appType = dom.GetTypeDefinition ("System.Windows", "Application", 0, StringComparer.Ordinal);
if (appType == null)
return;
foreach (IType type in appType.GetAllBaseTypes (dom))
diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightEditorExtension.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightEditorExtension.cs
index c5a24b54b5..fde598b19a 100644
--- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightEditorExtension.cs
@@ -59,10 +59,10 @@ namespace MonoDevelop.Moonlight
if (database == null)
yield break;
- var swd = database.GetClass ("System.Windows", "DependencyObject", 0, StringComparer.Ordinal);
+ var swd = database.GetTypeDefinition ("System.Windows", "DependencyObject", 0, StringComparer.Ordinal);
//return classes if they derive from system.web.ui.control
- foreach (IType cls in database.GetClasses (namespac, StringComparer.Ordinal)) {
+ foreach (IType cls in database.GetTypes (namespac, StringComparer.Ordinal)) {
if (cls != null && !cls.GetDefinition ().IsAbstract && cls.GetDefinition ().IsPublic && cls.IsBaseType (database, swd))
yield return cls;
}
@@ -121,7 +121,7 @@ namespace MonoDevelop.Moonlight
if (database == null)
return;
foreach (string namespc in namespaces) {
- IType controlType = database.GetClass (namespc, attributedOb.Name.Name, 0, StringComparer.Ordinal);
+ IType controlType = database.GetTypeDefinition (namespc, attributedOb.Name.Name, 0, StringComparer.Ordinal);
if (controlType != null) {
action (controlType, database);
break;
@@ -139,7 +139,7 @@ namespace MonoDevelop.Moonlight
if (database == null)
return;
- IType type = database.GetClass ("System.Windows", "DependencyObject", 0, StringComparer.Ordinal);
+ IType type = database.GetTypeDefinition ("System.Windows", "DependencyObject", 0, StringComparer.Ordinal);
if (type == null)
return;
diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightParser.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightParser.cs
index 998d5f81c1..85f3d005d4 100644
--- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightParser.cs
+++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightParser.cs
@@ -64,13 +64,13 @@ namespace MonoDevelop.Moonlight
static void GenerateCU (XmlParsedDocument doc)
{
if (doc.XDocument == null || doc.XDocument.RootElement == null) {
- doc.Add (new Error (ErrorType.Error, 1, 1, "No root node found."));
+ doc.Add (new Error (ErrorType.Error, "No root node found.", 1, 1));
return;
}
XAttribute rootClass = doc.XDocument.RootElement.Attributes [new XName ("x", "Class")];
if (rootClass == null) {
- doc.Add (new Error (ErrorType.Error, 1, 1, "Root node does not contain an x:Class attribute."));
+ doc.Add (new Error (ErrorType.Error, "Root node does not contain an x:Class attribute.", 1, 1));
return;
}