* Makefile.am:

* MonoDevelop.Ide.csproj:
* MonoDevelop.Ide/Services.cs:
* MonoDevelop.Ide.Extensions/MimeTypeNode.cs:
* MonoDevelop.Ide.Extensions/StockIconCodon.cs:
* MonoDevelop.Ide.Extensions/OptionsPanelNode.cs:
* MonoDevelop.Components.Extensions/MimeTypeNode.cs:
* MonoDevelop.Ide.Extensions/OptionsDialogSection.cs:
* MonoDevelop.Components.Extensions/StockIconCodon.cs:
* MonoDevelop.Components.Extensions/OptionsPanelNode.cs:
* MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs:
* MonoDevelop.Components.Extensions/OptionsDialogSection.cs:
* MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs:
* MonoDevelop.Components.Extensions/MimeTypeOptionsPanelNode.cs: Moved
  to correct directory. Fixed namespace for MimeTypeOptionsPanelNode.

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

10 files changed, 30 insertions, 13 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index c9b40ba6b7..15d7ead4cd 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,5 +1,24 @@
 2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
 
+	* Makefile.am:
+	* MonoDevelop.Ide.csproj:
+	* MonoDevelop.Ide/Services.cs:
+	* MonoDevelop.Ide.Extensions/MimeTypeNode.cs:
+	* MonoDevelop.Ide.Extensions/StockIconCodon.cs:
+	* MonoDevelop.Ide.Extensions/OptionsPanelNode.cs:
+	* MonoDevelop.Components.Extensions/MimeTypeNode.cs:
+	* MonoDevelop.Ide.Extensions/OptionsDialogSection.cs:
+	* MonoDevelop.Components.Extensions/StockIconCodon.cs:
+	* MonoDevelop.Components.Extensions/OptionsPanelNode.cs:
+	* MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs:
+	* MonoDevelop.Components.Extensions/OptionsDialogSection.cs:
+	* MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs:
+	* MonoDevelop.Components.Extensions/MimeTypeOptionsPanelNode.cs:
+	  Moved to correct directory. Fixed namespace for
+	  MimeTypeOptionsPanelNode.
+
+2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
+
 	Merged MD.Projects into MD.Core, and MD.Projects.Gui,
 	MD.Core.Gui and MD.Components into MD.Ide.
 
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am
index 43e15fe4fa..a3d4028306 100644
--- a/main/src/core/MonoDevelop.Ide/Makefile.am
+++ b/main/src/core/MonoDevelop.Ide/Makefile.am
@@ -194,12 +194,7 @@ FILES =  \
 	MonoDevelop.Components.DockToolbars/IDockBar.cs \
 	MonoDevelop.Components.DockToolbars/PlaceholderWindow.cs \
 	MonoDevelop.Components.Extensions/ISelectFileDialog.cs \
-	MonoDevelop.Components.Extensions/MimeTypeNode.cs \
-	MonoDevelop.Components.Extensions/MimeTypeOptionsPanelNode.cs \
-	MonoDevelop.Components.Extensions/OptionsDialogSection.cs \
-	MonoDevelop.Components.Extensions/OptionsPanelNode.cs \
 	MonoDevelop.Components.Extensions/PlatformDialog.cs \
-	MonoDevelop.Components.Extensions/StockIconCodon.cs \
 	MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs \
 	MonoDevelop.Components.PropertyGrid.Editors/CharPropertyEditor.cs \
 	MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs \
@@ -351,6 +346,11 @@ FILES =  \
 	MonoDevelop.Ide.Extensions/CustomToolExtensionNode.cs \
 	MonoDevelop.Ide.Extensions/IAddFileDialogHandler.cs \
 	MonoDevelop.Ide.Extensions/IOpenFileDialogHandler.cs \
+	MonoDevelop.Ide.Extensions/MimeTypeNode.cs \
+	MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs \
+	MonoDevelop.Ide.Extensions/OptionsDialogSection.cs \
+	MonoDevelop.Ide.Extensions/OptionsPanelNode.cs \
+	MonoDevelop.Ide.Extensions/StockIconCodon.cs \
 	MonoDevelop.Ide.Extensions/TextEditorExtensionNode.cs \
 	MonoDevelop.Ide.ExternalTools/ExternalTool.cs \
 	MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs \
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/MimeTypeNode.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/MimeTypeNode.cs
index 0bb81a42f0..0bb81a42f0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/MimeTypeNode.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/MimeTypeNode.cs
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/MimeTypeOptionsPanelNode.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs
index 25669768dc..8bc5c74e63 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/MimeTypeOptionsPanelNode.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs
@@ -27,7 +27,7 @@
 using System;
 using Mono.Addins;
 
-namespace MonoDevelop.Projects.Gui.Extensions
+namespace MonoDevelop.Ide.Extensions
 {
 	public class MimeTypeOptionsPanelNode: TypeExtensionNode
 	{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/OptionsDialogSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/OptionsDialogSection.cs
index c1637c862b..c1637c862b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/OptionsDialogSection.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/OptionsDialogSection.cs
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/OptionsPanelNode.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/OptionsPanelNode.cs
index 2d8dc1e493..2d8dc1e493 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/OptionsPanelNode.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/OptionsPanelNode.cs
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/StockIconCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/StockIconCodon.cs
index 5b07d1747e..5b07d1747e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/StockIconCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/StockIconCodon.cs
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
index efa9e7f29b..9cde9c4aea 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs
@@ -32,7 +32,6 @@ using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Extensions;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Gui.Extensions;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Components;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index adf7ebb6b6..8ae2f84b0f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -1256,10 +1256,6 @@
     <Compile Include="MonoDevelop.Ide.Gui\SyncContext.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\SyncContextAttribute.cs" />
     <Compile Include="MonoDevelop.Ide.Gui\SyncObject.cs" />
-    <Compile Include="MonoDevelop.Components.Extensions\MimeTypeNode.cs" />
-    <Compile Include="MonoDevelop.Components.Extensions\OptionsDialogSection.cs" />
-    <Compile Include="MonoDevelop.Components.Extensions\OptionsPanelNode.cs" />
-    <Compile Include="MonoDevelop.Components.Extensions\StockIconCodon.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Components\ProjectFileEntry.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\ItemOptionsDialog.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\ItemOptionsPanel.cs" />
@@ -1325,7 +1321,6 @@
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\RuntimeOptionsPanel.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\SolutionItemConfigurationsPanel.cs" />
     <Compile Include="MonoDevelop.Ide.Projects.OptionPanels\StartupOptionsPanel.cs" />
-    <Compile Include="MonoDevelop.Components.Extensions\MimeTypeOptionsPanelNode.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Ide.Projects.CombineEntryFeatureSelector.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.cs" />
@@ -1350,6 +1345,11 @@
     <Compile Include="MonoDevelop.Ide\ExitEventHandler.cs" />
     <Compile Include="MonoDevelop.Ide\AddEntryEventHandler.cs" />
     <Compile Include="MonoDevelop.Ide\IdeStartup.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\MimeTypeNode.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\MimeTypeOptionsPanelNode.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\OptionsDialogSection.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\OptionsPanelNode.cs" />
+    <Compile Include="MonoDevelop.Ide.Extensions\StockIconCodon.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ChangeLog" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
index a95ecc1a39..267b0eb72a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
@@ -32,7 +32,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Tasks;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Gui;
 using MonoDevelop.Core.Instrumentation;
 
 namespace MonoDevelop.Ide