* BooBinding/BooBinding.booproj:

* BooBinding/BooBinding.addin.xml:
* LuaBinding/LuaBinding.addin.xml:
* BooBinding/Gui/ShellTextView.boo:
* BooBinding/BooShell/BooShell.boo:
* BooBinding/Gui/BooShellModel.boo:
* MonoDevelop.MeeGo/MeeGoUtility.cs:
* JavaBinding/JavaBinding.addin.xml:
* BooBinding/BooLanguageBinding.boo:
* BooBinding/BooShellPadContent.boo:
* GeckoWebBrowser/GeckoWebBrowser.cs:
* JavaBinding/JavaLanguageBinding.cs:
* WebKitWebBrowser/WebKitWebBrowser.cs:
* GeckoWebBrowser/gtk-gui/generated.cs:
* JavaBinding/Gui/GlobalOptionsPanel.cs:
* PythonBinding/PythonLanguageBinding.cs:
* MonoDevelop.MeeGo/MeeGoDevicePicker.cs:
* GeckoWebBrowser/GeckoWebBrowser.csproj:
* PythonBinding/PythonCompilerManager.cs:
* NemerleBinding/NemerleBinding.addin.xml:
* PythonBinding/PythonExecutionManager.cs:
* GeckoWebBrowser/GeckoWebBrowserLoader.cs:
* BooBinding/Properties/ShellProperties.boo:
* WebKitWebBrowser/WebKitWebBrowserLoader.cs:
* BooBinding/Properties/BooShellProperties.boo:
* BooBinding/Project/BooCompilerParameters.boo:
* MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml:
* BooBinding/Gui/OptionPanels/GeneralShellPanel.boo:
* JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs:
* MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj:
* BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo:
* BooBinding/Gui/OptionPanels/GeneralBooShellPanel.boo:
* GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml:
* GtkSourceViewEditor/MonoDevelop.SourceEditor/Services.cs:
* GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml:
* WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml:
* GtkSourceViewEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs:
* GtkSourceViewEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs:
* GtkSourceViewEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs:
* MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/Gui/ResultsReporter.cs:
* MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/Commands/AnalyzeHandler.cs:
* GtkSourceViewEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs:
* MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.csproj:
* VersionControl.Subversion.Win32/VersionControl.Subversion.Win32/SvnSharpClient.cs:
* VersionControl.Subversion.Win32/VersionControl.Subversion.Win32/Manifest.addin.xml:
* MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/Mono.Debugging.Server.Mdb.csproj:
* MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml:
* MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Mono.Debugging.Backend.Mdb.csproj:
* VersionControl.Subversion.Win32/VersionControl.Subversion.Win32/Properties/AssemblyInfo.cs:
* MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Mono.Debugging.Backend.Mdb.AspNet.csproj:
  Merged MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
  and MD.Components into MD.Ide.

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

15 files changed, 27 insertions, 72 deletions

diff --git a/extras/BooBinding/BooBinding.addin.xml b/extras/BooBinding/BooBinding.addin.xml
index ae48a9bcce..8ed7b9998c 100644
--- a/extras/BooBinding/BooBinding.addin.xml
+++ b/extras/BooBinding/BooBinding.addin.xml
@@ -17,9 +17,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"/>
     <Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" />
   </Dependencies>
diff --git a/extras/BooBinding/BooBinding.booproj b/extras/BooBinding/BooBinding.booproj
index abf8961a8e..b707d5ef52 100644
--- a/extras/BooBinding/BooBinding.booproj
+++ b/extras/BooBinding/BooBinding.booproj
@@ -42,30 +42,14 @@
     <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="MonoDevelop.Components, Version=1.9.2.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <Package>monodevelop</Package>
-    </Reference>
     <Reference Include="MonoDevelop.Core, Version=1.9.2.0, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
       <Package>monodevelop</Package>
     </Reference>
-    <Reference Include="MonoDevelop.Core.Gui, Version=1.9.2.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <Package>monodevelop</Package>
-    </Reference>
     <Reference Include="MonoDevelop.Ide, Version=1.9.2.0, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
       <Package>monodevelop</Package>
     </Reference>
-    <Reference Include="MonoDevelop.Projects, Version=1.9.2.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <Package>monodevelop</Package>
-    </Reference>
-    <Reference Include="MonoDevelop.Projects.Gui, Version=1.9.2.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <Package>monodevelop</Package>
-    </Reference>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
diff --git a/extras/BooBinding/BooLanguageBinding.boo b/extras/BooBinding/BooLanguageBinding.boo
index 47b091014d..d72ff0bfde 100644
--- a/extras/BooBinding/BooLanguageBinding.boo
+++ b/extras/BooBinding/BooLanguageBinding.boo
@@ -22,18 +22,14 @@ namespace BooBinding
 import System
 import System.IO
 import System.Diagnostics
-import System.Reflection
-import System.Resources
 import System.Xml
 import System.CodeDom
 import System.CodeDom.Compiler;
 import Boo.Lang.CodeDom;
 
 import MonoDevelop.Projects
-import MonoDevelop.Projects.Dom
 import MonoDevelop.Projects.Dom.Parser
 import MonoDevelop.Projects.CodeGeneration
-import MonoDevelop.Core.Gui
 import MonoDevelop.Core
 
 public class BooLanguageBinding(IDotNetLanguageBinding):
diff --git a/extras/BooBinding/BooShell/BooShell.boo b/extras/BooBinding/BooShell/BooShell.boo
index b344105372..cc25dddbc2 100644
--- a/extras/BooBinding/BooShell/BooShell.boo
+++ b/extras/BooBinding/BooShell/BooShell.boo
@@ -21,16 +21,12 @@ namespace BooBinding.BooShell
 
 import System
 import System.Collections
-import System.IO
 import System.Threading
 import System.Text.RegularExpressions
 import Boo.Lang.Interpreter
-import Boo.Lang.Compiler
 
 import Gtk
-import GLib
 
-import MonoDevelop.Core
 import MonoDevelop.Core.Execution;
 
 class BooShell (RemoteProcessObject):
diff --git a/extras/BooBinding/BooShell/ChangeLog b/extras/BooBinding/BooShell/ChangeLog
index 62857f5a1a..644877c28c 100644
--- a/extras/BooBinding/BooShell/ChangeLog
+++ b/extras/BooBinding/BooShell/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* BooShell.boo: Merged MD.Projects into MD.Core, and
+	  MD.Projects.Gui, MD.Core.Gui and MD.Components into MD.Ide.
+
 2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* BooShell.booproj: Update.
diff --git a/extras/BooBinding/BooShellPadContent.boo b/extras/BooBinding/BooShellPadContent.boo
index bbfdeea09c..562f41affc 100644
--- a/extras/BooBinding/BooShellPadContent.boo
+++ b/extras/BooBinding/BooShellPadContent.boo
@@ -23,7 +23,6 @@ namespace BooBinding.Pads
 import System
 
 import MonoDevelop.Core
-import MonoDevelop.Core.Gui
 import MonoDevelop.Ide.Gui
 import BooBinding.Gui
 
diff --git a/extras/BooBinding/ChangeLog b/extras/BooBinding/ChangeLog
index bed89d9c41..e2105da4f7 100644
--- a/extras/BooBinding/ChangeLog
+++ b/extras/BooBinding/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* BooBinding.booproj:
+	* BooBinding.addin.xml:
+	* Gui/BooShellModel.boo:
+	* Gui/ShellTextView.boo:
+	* BooShellPadContent.boo:
+	* BooLanguageBinding.boo:
+	* Properties/ShellProperties.boo:
+	* Properties/BooShellProperties.boo:
+	* Project/BooCompilerParameters.boo:
+	* Gui/OptionPanels/GeneralShellPanel.boo:
+	* Gui/OptionPanels/GeneralBooShellPanel.boo:
+	* Gui/OptionPanels/CodeCompilationPanel.boo: 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>
 
 	* BooBinding.sln: The invariant policy can't be used anymore
diff --git a/extras/BooBinding/Gui/BooShellModel.boo b/extras/BooBinding/Gui/BooShellModel.boo
index 2e8d4b54ab..56ccbd5778 100644
--- a/extras/BooBinding/Gui/BooShellModel.boo
+++ b/extras/BooBinding/Gui/BooShellModel.boo
@@ -20,19 +20,13 @@
 namespace BooBinding.Gui
 
 import System
-import System.Diagnostics
 import System.Collections
 import System.IO
 import System.Threading
-import System.Runtime.Remoting
-import System.Runtime.Remoting.Channels
 
 import BooBinding.Properties
 import BooBinding.BooShell
 
-import MonoDevelop.Core
-import MonoDevelop.Core.Execution
-
 class BooShellModel(IShellModel):
 	private _props = BooShellProperties()
 
diff --git a/extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo b/extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo
index b13a0362b9..f83e83a34b 100644
--- a/extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo
+++ b/extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo
@@ -25,8 +25,7 @@ import System
 import Gtk
 
 import MonoDevelop.Projects
-import MonoDevelop.Projects.Gui.Dialogs
-import MonoDevelop.Components
+import MonoDevelop.Ide.Gui.Dialogs
 import MonoDevelop.Core
 
 public class CodeGenerationPanel(MultiConfigItemOptionsPanel):
diff --git a/extras/BooBinding/Gui/OptionPanels/GeneralBooShellPanel.boo b/extras/BooBinding/Gui/OptionPanels/GeneralBooShellPanel.boo
index d529a8e9d7..df1417bece 100644
--- a/extras/BooBinding/Gui/OptionPanels/GeneralBooShellPanel.boo
+++ b/extras/BooBinding/Gui/OptionPanels/GeneralBooShellPanel.boo
@@ -20,15 +20,6 @@
 namespace BooBinding.Gui.OptionPanels
 
 import System
-import Gtk
-import Pango
-
-import MonoDevelop.Projects
-import MonoDevelop.Core.Gui.Dialogs
-import MonoDevelop.Components
-import MonoDevelop.Core
-import MonoDevelop.Core.Properties
-
 import BooBinding.Properties
 
 public class GeneralBooShellPanel(GeneralShellPanel):
diff --git a/extras/BooBinding/Gui/OptionPanels/GeneralShellPanel.boo b/extras/BooBinding/Gui/OptionPanels/GeneralShellPanel.boo
index c80b8ba3e6..b96a59d1c5 100644
--- a/extras/BooBinding/Gui/OptionPanels/GeneralShellPanel.boo
+++ b/extras/BooBinding/Gui/OptionPanels/GeneralShellPanel.boo
@@ -21,17 +21,12 @@ namespace BooBinding.Gui.OptionPanels
 
 import System
 import Gtk
-import Pango
 
-import MonoDevelop.Projects
-import MonoDevelop.Core.Gui.Dialogs
-import MonoDevelop.Components
 import MonoDevelop.Core
-import MonoDevelop.Core.Properties
 
 import BooBinding.Properties
 
-public class GeneralShellPanel(OptionsPanel):
+public class GeneralShellPanel(MonoDevelop.Ide.Gui.Dialogs.OptionsPanel):
 	private generalOptionsLabel = Gtk.Label ()
 	private autoIndentCheckButton = Gtk.CheckButton ()
 	private resetClearsScrollbackCheckButton = Gtk.CheckButton ()
diff --git a/extras/BooBinding/Gui/ShellTextView.boo b/extras/BooBinding/Gui/ShellTextView.boo
index 9ac36d00b0..bc6d3234af 100644
--- a/extras/BooBinding/Gui/ShellTextView.boo
+++ b/extras/BooBinding/Gui/ShellTextView.boo
@@ -22,21 +22,17 @@ namespace BooBinding.Gui
 import System
 import System.Collections
 import System.IO
-import System.Runtime.InteropServices
 
 import Gtk
 import Gdk
-import GLib
-import Pango
 import GtkSourceView
 
 import MonoDevelop.Components
-import MonoDevelop.Projects.Gui.Completion
+import MonoDevelop.Ide.CodeCompletion
 import MonoDevelop.Core
 import MonoDevelop.Projects
-import MonoDevelop.Ide.Gui
+import MonoDevelop.Ide
 import MonoDevelop.Projects.Dom.Parser
-import MonoDevelop.Projects.Dom.Output
 
 /*
  * TODO
@@ -187,7 +183,7 @@ class ShellTextView (SourceView, ICompletionWidget):
 	#region Overrides of the standard methods for event handling
 	override def OnPopulatePopup (menu as Gtk.Menu):
 		_copyScriptInput = ImageMenuItem (GettextCatalog.GetString ("Copy Script"))
-		_copyScriptInput.Activated += { Gtk.Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", true)).SetText(_scriptLines) }
+		_copyScriptInput.Activated += { Gtk.Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", true)).Text = _scriptLines }
 		_copyScriptInput.Image = Gtk.Image (Stock.Copy, Gtk.IconSize.Menu)
 		
 		_saveScriptToFile = ImageMenuItem (GettextCatalog.GetString ("Save Script As ..."))
diff --git a/extras/BooBinding/Project/BooCompilerParameters.boo b/extras/BooBinding/Project/BooCompilerParameters.boo
index 9d49834dba..e369151832 100644
--- a/extras/BooBinding/Project/BooCompilerParameters.boo
+++ b/extras/BooBinding/Project/BooCompilerParameters.boo
@@ -20,8 +20,6 @@
 namespace BooBinding
 
 import System
-import System.Xml
-import System.Diagnostics
 
 import MonoDevelop.Projects
 import MonoDevelop.Core.Serialization
diff --git a/extras/BooBinding/Properties/BooShellProperties.boo b/extras/BooBinding/Properties/BooShellProperties.boo
index 3a5ca2f979..625cc42633 100644
--- a/extras/BooBinding/Properties/BooShellProperties.boo
+++ b/extras/BooBinding/Properties/BooShellProperties.boo
@@ -4,13 +4,6 @@ namespace BooBinding.Properties
 
 import System
 
-import Gtk
-import Gdk
-
-import MonoDevelop.Components
-import MonoDevelop.Core.Properties
-import MonoDevelop.Core
-
 class BooShellProperties (ShellProperties):
 	override PropertyName as string:
 		get:
diff --git a/extras/BooBinding/Properties/ShellProperties.boo b/extras/BooBinding/Properties/ShellProperties.boo
index 6e09033aa2..b6a432ae55 100644
--- a/extras/BooBinding/Properties/ShellProperties.boo
+++ b/extras/BooBinding/Properties/ShellProperties.boo
@@ -3,12 +3,7 @@
 namespace BooBinding.Properties
 
 import System
-
-import Gtk
-import Gdk
 import Pango
-
-import MonoDevelop.Components
 import MonoDevelop.Core
 
 class ShellProperties: