Remove unused XML-Parser.

Fixed exception when the opening refactoring menu on parameters.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4211 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/XmlEditor/Project/Src/Parser.cs

@@ -1,67 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Project;
-
-namespace ICSharpCode.XmlEditor
-{
-	/// <summary>
-	/// Parser that does nothing except return empty compilation unit
-	/// classes so the XmlFoldingStrategy is executed.
-	/// </summary>
-	public class Parser : IParser
-	{
-		public Parser()
-		{
-		}
-		
-		#region IParser interface
-		public string[] LexerTags {
-			get {
-				return null;
-			}
-			set {
-			}
-		}
-		
-		public LanguageProperties Language {
-			get {
-				return null;
-			}
-		}
-		
-		public IExpressionFinder CreateExpressionFinder(string fileName)
-		{
-			return null;
-		}
-		
-		public IResolver CreateResolver()
-		{
-			return null;
-		}
-		
-		public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent)
-		{
-			DefaultCompilationUnit compilationUnit = new DefaultCompilationUnit(projectContent);
-			compilationUnit.FileName = fileName;
-			return compilationUnit;
-		}
-		
-		public bool CanParse(IProject project)
-		{
-			return false;
-		}
-		
-		public bool CanParse(string fileName)
-		{
-			return XmlDisplayBinding.IsFileNameHandled(fileName);
-		}
-		#endregion
-	}
-}

src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@@ -34,13 +34,6 @@
 		                class            = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
 	</Path>
 	
-	<!-- Xml parser used to initiate the folding update -->
-	<Path name = "/Workspace/Parser">
-		<Parser id = "XmlFoldingParser"
-		        supportedextensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
-		        class = "ICSharpCode.XmlEditor.Parser"/>
-	</Path>
-	
 	<!-- Extra project browser icons -->
 	<Path name = "/Workspace/Icons">
 		<Icon id         = "ExtraXmlFileIcon"

src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj

@@ -94,7 +94,6 @@
     <Compile Include="Src\InsertTextNodeBeforeCommand.cs" />
     <Compile Include="Src\IXmlTreeView.cs" />
     <Compile Include="Src\OpenStylesheetCommand.cs" />
-    <Compile Include="Src\Parser.cs" />
     <Compile Include="Src\QualifiedName.cs" />
     <Compile Include="Src\QualifiedNameCollection.cs" />
     <Compile Include="Src\RemoveAttributeCommand.cs" />

src/AddIns/Misc/SharpRefactoring/SharpRefactoring.csproj

@@ -96,6 +96,11 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
       <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
       <Name>ICSharpCode.Core.WinForms</Name>

src/AddIns/Misc/SharpRefactoring/Src/ParameterCheckRefactoringMenuBuilder.cs

@@ -5,16 +5,17 @@
 //     <version>$Revision$</version>
 // </file>
 
-using ICSharpCode.SharpDevelop.Editor;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Windows.Forms;
+
 using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
 using ICSharpCode.Core.WinForms;
-using ICSharpCode.NRefactory;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Dom.Refactoring;
+using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Refactoring;
 
 namespace SharpRefactoring
@@ -23,8 +24,13 @@ namespace SharpRefactoring
 	/// Provides "Add check for null" and "Add range check" commands in
 	/// context menu of parameter declarations.
 	/// </summary>
-	public class ParameterCheckRefactoringMenuBuilder : ISubmenuBuilder
+	public class ParameterCheckRefactoringMenuBuilder : ISubmenuBuilder, IMenuItemBuilder
 	{
+		public ICollection BuildItems(Codon codon, object owner)
+		{
+			return BuildSubmenu(codon, owner).TranslateToWpf();
+		}
+		
 		public ToolStripItem[] BuildSubmenu(Codon codon, object owner)
 		{
 			List<ToolStripItem> resultItems = new List<ToolStripItem>();
@@ -66,11 +72,13 @@ namespace SharpRefactoring
 				return;
 			textArea.Select(methodStart, 0);
 			using (textArea.Document.OpenUndoGroup()) {
+				int startLine = textArea.Caret.Line;
 				foreach (string newCodeLine in newCode.Split('\n')) {
-					// TODO: AVALONEDIT
-//					new Return().Execute(textArea);
-//					textArea.InsertString(newCodeLine);
+					textArea.Document.Insert(textArea.Caret.Offset,
+					                         DocumentUtilitites.GetLineTerminator(textArea.Document, textArea.Caret.Line) + newCodeLine);
 				}
+				int endLine = textArea.Caret.Line;
+				textArea.FormattingStrategy.IndentLines(textArea, startLine, endLine);
 			}
 		}
 		

src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs

@@ -192,7 +192,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 				string newNamespace = c.Namespace;
 				MenuItem subItem = new MenuItem();
 				subItem.Header = "using " + newNamespace;
-				subItem.Icon = ClassBrowserIconService.Namespace.Bitmap;
+				subItem.Icon = ClassBrowserIconService.Namespace.CreateImage();
 				item.Items.Add(subItem);
 				subItem.Click += delegate {
 					NamespaceRefactoringService.AddUsingDeclaration(callingClass.CompilationUnit, textArea.Document, newNamespace, true);
@@ -282,7 +282,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			if (cu != null && cu.FileName != null && !region.IsEmpty) {
 				MenuItem gotoDefinitionItem = new MenuItem();
 				gotoDefinitionItem.Header = MenuService.ConvertLabel(StringParser.Parse("${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"));
-				gotoDefinitionItem.Icon = ClassBrowserIconService.GotoArrow.CreatePixelSnappedImage();
+				gotoDefinitionItem.Icon = ClassBrowserIconService.GotoArrow.CreateImage();
 				gotoDefinitionItem.InputGestureText = new KeyGesture(Key.Enter, ModifierKeys.Control).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 				gotoDefinitionItem.Click += delegate {
 					FileService.JumpToFilePosition(cu.FileName, region.BeginLine, region.BeginColumn);

src/Main/Base/Project/Src/Util/ExtensionMethods.cs

@@ -310,7 +310,7 @@ namespace ICSharpCode.SharpDevelop
 			var r = new System.Windows.Controls.MenuItem();
 			r.Header = MenuService.ConvertLabel(item.Text);
 			if (item.ImageIndex >= 0)
-				r.Icon = ClassBrowserIconService.GetImageByIndex(item.ImageIndex).CreatePixelSnappedImage();
+				r.Icon = ClassBrowserIconService.GetImageByIndex(item.ImageIndex).CreateImage();
 			r.Click += delegate { item.PerformClick(); };
 			return r;
 		}