diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-06-30 09:29:46 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-06-30 09:29:46 +0400 |
| commit | b2b2aa807b2f81a2ed03daad3ac3e3a4323c2a1b (patch) | |
| tree | 629d2efed9db1312ebc07382eb86d7f050fc3088 /main/src/addins/MonoDevelop.Refactoring | |
| parent | fb698dce56a826719ebb61090201b2314c3c230c (diff) | |
| parent | 0f098c1660a63bde65945d43008245e317ea0ec5 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.cs
main/src/addins/CSharpBinding/CSharpBinding.addin.xml
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DomTypeProxy.cs
main/src/core/MonoDevelop.Ide/Makefile.am
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/src/addins/MonoDevelop.Refactoring')
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml | 4 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml index 92ceb355be..62c5176ebf 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml @@ -34,11 +34,11 @@ <ExtensionPoint path = "/MonoDevelop/Refactoring/ASTProvider" name = "ASTProviders"> <ExtensionNode name="Class"/> </ExtensionPoint> - + <!-- <ExtensionPoint path = "/MonoDevelop/Refactoring/ContextActions" name = "ContextAction"> <ExtensionNode name="Action" type ="MonoDevelop.ContextAction.ContextActionAddinNode"/> </ExtensionPoint> - + --> <ExtensionPoint path = "/MonoDevelop/Refactoring/Inspectors" name = "Inspector"> <ExtensionNode name="Inspector" type ="MonoDevelop.Inspection.InspectorAddinNode"/> </ExtensionPoint> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs index 778f8a2920..b020b6d79e 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs @@ -76,17 +76,17 @@ namespace MonoDevelop.Refactoring } }); - AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/ContextActions", delegate(object sender, ExtensionNodeEventArgs args) { - switch (args.Change) { - case ExtensionChange.Add: - contextActions.Add ((ContextActionAddinNode)args.ExtensionNode); - break; - case ExtensionChange.Remove: - contextActions.Remove ((ContextActionAddinNode)args.ExtensionNode); - break; - } - }); - +// AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/ContextActions", delegate(object sender, ExtensionNodeEventArgs args) { +// switch (args.Change) { +// case ExtensionChange.Add: +// contextActions.Add ((ContextActionAddinNode)args.ExtensionNode); +// break; +// case ExtensionChange.Remove: +// contextActions.Remove ((ContextActionAddinNode)args.ExtensionNode); +// break; +// } +// }); +// AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/Inspectors", delegate(object sender, ExtensionNodeEventArgs args) { switch (args.Change) { case ExtensionChange.Add: |