get rid of showing query in current window

4 files changed, 2 insertions, 88 deletions

diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ConnectionManagerCommands.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ConnectionManagerCommands.cs
index 12b2abd6fe..75d9be8e4d 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ConnectionManagerCommands.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ConnectionManagerCommands.cs
@@ -70,22 +70,16 @@ namespace MonoDevelop.Database.ConnectionManager
 		DropUser,
 		DropTrigger,
 		
-		ShowTableDefinitionInCurrentWindow,
 		ShowTableDefinitionInNewWindow,
 		ShowTableDefinitionInClipboard,
-		QuerySelectInCurrentWindow,
 		QuerySelectInNewWindow,
 		QuerySelectInClipboard,
-		QueryInsertInCurrentWindow,
 		QueryInsertInNewWindow,
 		QueryInsertInClipboard,
 		QueryUpdateInNewWindow,
-		QueryUpdateInCurrentWindow,
 		QueryUpdateInClipboard,
 		QueryDeleteInNewWindow,
-		QueryDeleteInCurrentWindow,
 		QueryDeleteInClipboard,
-		TableDefinitionInCurrentWindow,
 		TableDefinitionInNewWindow,
 		TableDefinitionInClipboard,
 		ExecProcedure
@@ -112,4 +106,4 @@ namespace MonoDevelop.Database.ConnectionManager
 			factory.GuiProvider.ShowCreateDatabaseDialog (factory);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ToolbarCommands.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ToolbarCommands.cs
index 4c32fbcfca..d584d78c14 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ToolbarCommands.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/Commands/ToolbarCommands.cs
@@ -32,4 +32,4 @@ namespace MonoDevelop.Database.ConnectionManager
 		ToggleSystemObjects
 		//TODO: add default handler
 	}
-}
\ No newline at end of file
+}
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
index 45c80c2def..66776c3fce 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
@@ -281,10 +281,6 @@
 			icon = "gtk-remove"/>
 
 		<!-- Query Table Commands-->
-		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.ShowTableDefinitionInCurrentWindow"
-			_label = "Show Table Definition in _Current Window"
-			icon = "gtk-edit" />
-			
 		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.ShowTableDefinitionInNewWindow"
 			_label = "Show Table Definition in _New Window"
 			icon = "gtk-edit"/>
@@ -293,10 +289,6 @@
 			_label = "Show Table Definition in _Clipboard"
 			icon = "gtk-edit"/>
 
-		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QuerySelectInCurrentWindow"
-			_label = "SELECT Query in _Current Window"
-			icon = "md-db-execute" />
-			
 		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QuerySelectInNewWindow"
 			_label = "SELECT Query in _New Window"
 			icon = "md-db-execute"/>
@@ -305,10 +297,6 @@
 			_label = "SELECT Query in _Clipboard"
 			icon = "md-db-execute"/>
 		
-		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryInsertInCurrentWindow"
-			_label = "INSERT INTO in _Current Window"
-			icon = "md-db-execute" />
-			
 		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryInsertInNewWindow"
 			_label = "INSERT INTO in _New Window"
 			icon = "md-db-execute"/>
@@ -317,10 +305,6 @@
 			_label = "INSERT INTO in _Clipboard"
 			icon = "md-db-execute"/>
 
-		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryUpdateInCurrentWindow"
-			_label = "UPDATE in _Current Window"
-			icon = "md-db-execute" />
-			
 		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryUpdateInNewWindow"
 			_label = "UPDATE in _New Window"
 			icon = "md-db-execute"/>
@@ -329,10 +313,6 @@
 			_label = "UPDATE in _Clipboard"
 			icon = "md-db-execute"/>
 												
-		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryDeleteInCurrentWindow"
-			_label = "DELETE in _Current Window"
-			icon = "md-db-execute" />
-			
 		<Command id = "MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryDeleteInNewWindow"
 			_label = "DELETE in _New Window"
 			icon = "md-db-execute"/>
@@ -397,32 +377,27 @@
 		<SeparatorItem id = "SelectSeparator" />
 		<ItemSet id = "MonoDevelop.Database.ConnectionManager.QueryTable" _label = "Query Table">
 			<ItemSet id="MonoDevelop.Database.ConnectionManager.QueryTableSelect" _label = "_SELECT">
-				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QuerySelectInCurrentWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QuerySelectInNewWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QuerySelectInClipboard" />
 			</ItemSet>
 			
 			<ItemSet id="MonoDevelop.Database.ConnectionManager.QueryTableSelect" _label = "_INSERT">
-				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryInsertInCurrentWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryInsertInNewWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryInsertInClipboard" />
 			</ItemSet>
 			
 			<ItemSet id="MonoDevelop.Database.ConnectionManager.QueryTableSelect" _label = "_UPDATE">
-				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryUpdateInCurrentWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryUpdateInNewWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryUpdateInClipboard" />
 			</ItemSet>
 
 			<ItemSet id="MonoDevelop.Database.ConnectionManager.QueryTableSelect" _label = "_DELETE">
-				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryDeleteInCurrentWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryDeleteInNewWindow" />
 				<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.QueryDeleteInClipboard" />
 			</ItemSet>
 						
 		</ItemSet>
 		<ItemSet id = "MonoDevelop.Database.ConnectionManager.ShowTableDefinition" _label = "Show Table Definition">
-			<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.ShowTableDefinitionInCurrentWindow" /> 
 			<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.ShowTableDefinitionInNewWindow" /> 
 			<CommandItem id="MonoDevelop.Database.ConnectionManager.ConnectionManagerCommands.ShowTableDefinitionInClipboard" /> 
 		</ItemSet>		
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TableNodeBuilder.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TableNodeBuilder.cs
index 9e21805d42..1e1115c4f4 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TableNodeBuilder.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/NodeBuilders/TableNodeBuilder.cs
@@ -338,17 +338,6 @@ namespace MonoDevelop.Database.ConnectionManager
 			info.Enabled = node.ConnectionContext.SchemaProvider.IsSchemaActionSupported (SQL.SchemaType.Table, SchemaActions.Alter);
 		}
 		
-		[CommandHandler (ConnectionManagerCommands.QuerySelectInCurrentWindow)]
-		protected void OnSelectQueryOnCurrentWindow ()
-		{
-			TableNode node = CurrentNode.DataItem as TableNode;
-			IEditSchemaProvider schemaProvider = (IEditSchemaProvider)node.ConnectionContext.SchemaProvider;
-			if (IdeApp.Workbench.ActiveDocument.IsFile && !IdeApp.Workbench.ActiveDocument.IsViewOnly)
-				IdeApp.Workbench.ActiveDocument.Editor.InsertAtCaret (schemaProvider.GetSelectQuery (node.Table));
-			else
-				MessageService.ShowError (AddinCatalog.GetString ("Cannot insert text into the current window."));
-		}
-		
 		[CommandHandler (ConnectionManagerCommands.QuerySelectInNewWindow)]
 		protected void OnSelectQueryOnNewWindow ()
 		{
@@ -369,17 +358,6 @@ namespace MonoDevelop.Database.ConnectionManager
 			clp.Text = schemaProvider.GetSelectQuery (node.Table);
 			MessageService.ShowMessage (AddinCatalog.GetString ("SELECT statement has been copied to Clipboard."));
 		}		
-
-		[CommandHandler (ConnectionManagerCommands.QueryUpdateInCurrentWindow)]
-		protected void OnUpdateQueryOnCurrentWindow ()
-		{
-			TableNode node = CurrentNode.DataItem as TableNode;
-			IEditSchemaProvider schemaProvider = (IEditSchemaProvider)node.ConnectionContext.SchemaProvider;
-			if (IdeApp.Workbench.ActiveDocument.IsFile && !IdeApp.Workbench.ActiveDocument.IsViewOnly)
-				IdeApp.Workbench.ActiveDocument.Editor.InsertAtCaret (schemaProvider.GetUpdateQuery (node.Table));
-			else
-				MessageService.ShowError (AddinCatalog.GetString ("Cannot insert text into the current window."));
-		}
 		
 		[CommandHandler (ConnectionManagerCommands.QueryUpdateInNewWindow)]
 		protected void OnUpdateQueryOnNewWindow ()
@@ -402,17 +380,6 @@ namespace MonoDevelop.Database.ConnectionManager
 			MessageService.ShowMessage (AddinCatalog.GetString ("UPDATE Statement has been copied to Clipboard."));
 		}		
 		
-		[CommandHandler (ConnectionManagerCommands.QueryInsertInCurrentWindow)]
-		protected void OnInsertQueryOnCurrentWindow ()
-		{
-			TableNode node = CurrentNode.DataItem as TableNode;
-			IEditSchemaProvider schemaProvider = (IEditSchemaProvider)node.ConnectionContext.SchemaProvider;
-			if (IdeApp.Workbench.ActiveDocument.IsFile && !IdeApp.Workbench.ActiveDocument.IsViewOnly)
-				IdeApp.Workbench.ActiveDocument.Editor.InsertAtCaret (schemaProvider.GetInsertQuery (node.Table));
-			else
-				MessageService.ShowError (AddinCatalog.GetString ("Cannot insert text into the current window."));
-		}
-		
 		[CommandHandler (ConnectionManagerCommands.QueryInsertInNewWindow)]
 		protected void OnInsertQueryOnNewWindow ()
 		{
@@ -434,17 +401,6 @@ namespace MonoDevelop.Database.ConnectionManager
 			MessageService.ShowMessage (AddinCatalog.GetString ("INSERT INTO Statement has been copied to Clipboard."));
 		}		
 		
-		[CommandHandler (ConnectionManagerCommands.QueryDeleteInCurrentWindow)]
-		protected void OnDeleteQueryOnCurrentWindow ()
-		{
-			TableNode node = CurrentNode.DataItem as TableNode;
-			IEditSchemaProvider schemaProvider = (IEditSchemaProvider)node.ConnectionContext.SchemaProvider;
-			if (IdeApp.Workbench.ActiveDocument.IsFile && !IdeApp.Workbench.ActiveDocument.IsViewOnly)
-				IdeApp.Workbench.ActiveDocument.Editor.InsertAtCaret (schemaProvider.GetDeleteQuery (node.Table));
-			else
-				MessageService.ShowError (AddinCatalog.GetString ("Cannot insert text into the current window."));
-		}
-		
 		[CommandHandler (ConnectionManagerCommands.QueryDeleteInNewWindow)]
 		protected void OnDeleteQueryOnNewWindow ()
 		{
@@ -466,17 +422,6 @@ namespace MonoDevelop.Database.ConnectionManager
 			MessageService.ShowMessage (AddinCatalog.GetString ("DELETE Statement has been copied to Clipboard."));
 		}		
 		
-		[CommandHandler (ConnectionManagerCommands.ShowTableDefinitionInCurrentWindow)]
-		protected void OnShowDefinitionOnCurrentWindow ()
-		{
-			TableNode node = CurrentNode.DataItem as TableNode;
-			IEditSchemaProvider schemaProvider = (IEditSchemaProvider)node.ConnectionContext.SchemaProvider;
-			if (IdeApp.Workbench.ActiveDocument.IsFile && !IdeApp.Workbench.ActiveDocument.IsViewOnly)
-				IdeApp.Workbench.ActiveDocument.Editor.InsertAtCaret (schemaProvider.GetTableCreateStatement (node.Table));
-			else
-				MessageService.ShowError (AddinCatalog.GetString ("Cannot insert text into the current window."));
-		}
-		
 		[CommandHandler (ConnectionManagerCommands.ShowTableDefinitionInNewWindow)]
 		protected void OnShowDefinitionOnNewWindow ()
 		{