* AspNetEdit.addin.xml:

* AspNetEdit.Editor/EditorHost.cs:
* AspNetEdit.Integration/GeckoWebBrowser.cs:
* AspNetEdit.Integration/MonoDevelopProxy.cs:
* AspNetEdit.Integration/AspNetEditViewContent.cs: Merged MD.Projects
  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
  into MD.Ide.

svn path=/trunk/monodevelop/; revision=153755

6 files changed, 19 insertions, 11 deletions

diff --git a/extras/AspNetEdit/AspNetEdit.Editor/EditorHost.cs b/extras/AspNetEdit/AspNetEdit.Editor/EditorHost.cs
index cf11f82799..e2c08981c1 100644
--- a/extras/AspNetEdit/AspNetEdit.Editor/EditorHost.cs
+++ b/extras/AspNetEdit/AspNetEdit.Editor/EditorHost.cs
@@ -35,7 +35,8 @@ using System.ComponentModel.Design;
 using System.Drawing.Design;
 using System.ComponentModel.Design.Serialization;
 
-using MonoDevelop.Core.Gui;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui;
 using MonoDevelop.DesignerSupport.Toolbox;
 
 using AspNetEdit.Editor.ComponentModel;
diff --git a/extras/AspNetEdit/AspNetEdit.Integration/AspNetEditViewContent.cs b/extras/AspNetEdit/AspNetEdit.Integration/AspNetEditViewContent.cs
index 87bc71eb99..e59d3b86c7 100644
--- a/extras/AspNetEdit/AspNetEdit.Integration/AspNetEditViewContent.cs
+++ b/extras/AspNetEdit/AspNetEdit.Integration/AspNetEditViewContent.cs
@@ -39,7 +39,7 @@ using Mono.Addins;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
-using MonoDevelop.Core.Gui;
+using MonoDevelop.Ide;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.DesignerSupport.Toolbox;
 using MonoDevelop.DesignerSupport;
@@ -225,7 +225,7 @@ namespace AspNetEdit.Integration
 				try {
 					doc = editorProcess.Editor.GetDocument ();
 				} catch (Exception e) {
-					MonoDevelop.Core.Gui.MessageService.ShowException (e,
+					MonoDevelop.Ide.MessageService.ShowException (e,
 						AddinManager.CurrentLocalizer.GetString (
 					        "The document could not be retrieved from the designer"));
 				}
@@ -369,10 +369,10 @@ namespace AspNetEdit.Integration
 		
 		bool InstallExtension (string extensionStatus)
 		{
-			if (!MonoDevelop.Core.Gui.MessageService.Confirm (
+			if (!MessageService.Confirm (
 			    AddinManager.CurrentLocalizer.GetString ("Mozilla extension installation"),
 			    extensionStatus + "\n" + AddinManager.CurrentLocalizer.GetString ("Would you like to install it?"),
-			    new MonoDevelop.Core.Gui.AlertButton (AddinManager.CurrentLocalizer.GetString ("Install extension"))))
+			    new AlertButton (AddinManager.CurrentLocalizer.GetString ("Install extension"))))
 				return false;
 			
 			string sourcePath = Path.GetTempFileName ();
@@ -402,7 +402,7 @@ namespace AspNetEdit.Integration
 			} catch (Exception ex) {
 				LoggingService.LogError ("Error installing ASP.NET designer Mozilla extension.", ex);
 			}
-			MonoDevelop.Core.Gui.MessageService.ShowError (
+			MessageService.ShowError (
 			    AddinManager.CurrentLocalizer.GetString ("Could not execute command as root. \n"+
 			        "Please manually run the command \n{0}\nbefore continuing.", installCommand));
 			File.Delete (sourcePath);
diff --git a/extras/AspNetEdit/AspNetEdit.Integration/GeckoWebBrowser.cs b/extras/AspNetEdit/AspNetEdit.Integration/GeckoWebBrowser.cs
index 3e3c9c3051..f8eda8be6a 100644
--- a/extras/AspNetEdit/AspNetEdit.Integration/GeckoWebBrowser.cs
+++ b/extras/AspNetEdit/AspNetEdit.Integration/GeckoWebBrowser.cs
@@ -30,7 +30,7 @@ using System;
 using System.IO;
 using Gecko;
 
-using MonoDevelop.Core.Gui.WebBrowser;
+using MonoDevelop.Ide.WebBrowser;
 
 namespace AspNetEdit.Integration
 {
diff --git a/extras/AspNetEdit/AspNetEdit.Integration/MonoDevelopProxy.cs b/extras/AspNetEdit/AspNetEdit.Integration/MonoDevelopProxy.cs
index d39863234b..af8498607a 100644
--- a/extras/AspNetEdit/AspNetEdit.Integration/MonoDevelopProxy.cs
+++ b/extras/AspNetEdit/AspNetEdit.Integration/MonoDevelopProxy.cs
@@ -34,7 +34,7 @@ using System;
 using System.CodeDom;
 using System.Collections.Generic;
 
-using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Dom;
 using MonoDevelop.Projects.Dom.Parser;
diff --git a/extras/AspNetEdit/AspNetEdit.addin.xml b/extras/AspNetEdit/AspNetEdit.addin.xml
index 50f687a2fc..ce0b13e675 100644
--- a/extras/AspNetEdit/AspNetEdit.addin.xml
+++ b/extras/AspNetEdit/AspNetEdit.addin.xml
@@ -15,9 +15,6 @@
 
 	<Dependencies>
 		<Addin id="Core" version="2.2"/>
-		<Addin id="Core.Gui" version="2.2"/>
-		<Addin id="Projects" version="2.2"/>
-		<Addin id="Projects.Gui" version="2.2"/>
 		<Addin id="Ide" version="2.2"/>
 		<Addin id="Deployment" version="2.2" />
 		<Addin id="AspNet" version="2.2" />
diff --git a/extras/AspNetEdit/ChangeLog b/extras/AspNetEdit/ChangeLog
index 8e52cb6251..ef69295a34 100644
--- a/extras/AspNetEdit/ChangeLog
+++ b/extras/AspNetEdit/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* AspNetEdit.addin.xml:
+	* AspNetEdit.Editor/EditorHost.cs:
+	* AspNetEdit.Integration/GeckoWebBrowser.cs:
+	* AspNetEdit.Integration/MonoDevelopProxy.cs:
+	* AspNetEdit.Integration/AspNetEditViewContent.cs: Merged
+	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
+	  and MD.Components into MD.Ide.
+
 2010-03-01  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* AspNetEdit.sln: The invariant policy can't be used anymore