diff --git a/src/sql/parts/connection/common/connection.contribution.ts b/src/sql/parts/connection/common/connection.contribution.ts index 429ec6f808..d427998bd4 100644 --- a/src/sql/parts/connection/common/connection.contribution.ts +++ b/src/sql/parts/connection/common/connection.contribution.ts @@ -12,7 +12,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { Registry } from 'vs/platform/registry/common/platform'; import { DashboardEditor } from 'sql/parts/dashboard/dashboardEditor'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; -import { AddServerGroupAction, AddServerAction } from 'sql/parts/registeredServer/viewlet/connectionTreeAction'; +import { AddServerGroupAction, AddServerAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { ClearRecentConnectionsAction } from 'sql/parts/connection/common/connectionActions'; import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService'; diff --git a/src/sql/parts/connection/common/connectionStatus.ts b/src/sql/parts/connection/common/connectionStatus.ts index f34a0e6309..7bc02977d5 100644 --- a/src/sql/parts/connection/common/connectionStatus.ts +++ b/src/sql/parts/connection/common/connectionStatus.ts @@ -10,7 +10,7 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; // Connection status bar showing the current global connection diff --git a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts index 3f01a8de49..c9f11e9d3c 100644 --- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts +++ b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts @@ -11,8 +11,8 @@ import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { Modal } from 'sql/base/browser/ui/modal/modal'; import { IConnectionManagementService, INewConnectionParams } from 'sql/parts/connection/common/connectionManagement'; import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; -import { TreeCreationUtils } from 'sql/parts/registeredServer/viewlet/treeCreationUtils'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; +import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/parts/connection/connectionDialog/recentConnectionTreeController'; diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts index 5668739f61..28b46c74ce 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts @@ -15,7 +15,7 @@ import { import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; import * as Constants from 'sql/parts/connection/common/constants'; -import { OEAction } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { OEAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { ObjectMetadata } from 'sqlops'; diff --git a/src/sql/parts/dashboard/widgets/insights/actions.ts b/src/sql/parts/dashboard/widgets/insights/actions.ts index 1a9ab2ba6c..70b1de7b8e 100644 --- a/src/sql/parts/dashboard/widgets/insights/actions.ts +++ b/src/sql/parts/dashboard/widgets/insights/actions.ts @@ -10,7 +10,7 @@ import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { RunQueryOnConnectionMode, IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { InsightActionContext } from 'sql/workbench/common/actions'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; export class RunInsightQueryAction extends Action { diff --git a/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts b/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts index 9f037b5b30..98c92ccc60 100644 --- a/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts +++ b/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts @@ -22,7 +22,7 @@ import { MssqlRestoreInfo } from 'sql/parts/disasterRecovery/restore/mssqlRestor import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo'; import * as Utils from 'sql/parts/connection/common/utils'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode'; diff --git a/src/sql/parts/jobManagement/views/jobHistoryTree.ts b/src/sql/parts/jobManagement/views/jobHistoryTree.ts index 80e44d55a3..78b8b88c01 100644 --- a/src/sql/parts/jobManagement/views/jobHistoryTree.ts +++ b/src/sql/parts/jobManagement/views/jobHistoryTree.ts @@ -24,7 +24,7 @@ import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; -import { OEAction } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { OEAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { Builder, $, withElementById } from 'vs/base/browser/builder'; import { AgentJobHistoryInfo } from 'sqlops'; import { Agent } from 'vs/base/node/request'; diff --git a/src/sql/parts/jobManagement/views/jobStepsViewTree.ts b/src/sql/parts/jobManagement/views/jobStepsViewTree.ts index 070f76d53f..71230ddac8 100644 --- a/src/sql/parts/jobManagement/views/jobStepsViewTree.ts +++ b/src/sql/parts/jobManagement/views/jobStepsViewTree.ts @@ -24,7 +24,7 @@ import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; -import { OEAction } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { OEAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { Builder, $, withElementById } from 'vs/base/browser/builder'; import { AgentJobHistoryInfo } from 'sqlops'; import { Agent } from 'vs/base/node/request'; diff --git a/src/sql/parts/registeredServer/common/nodeType.ts b/src/sql/parts/objectExplorer/common/nodeType.ts similarity index 100% rename from src/sql/parts/registeredServer/common/nodeType.ts rename to src/sql/parts/objectExplorer/common/nodeType.ts diff --git a/src/sql/parts/registeredServer/common/objectExplorerService.ts b/src/sql/parts/objectExplorer/common/objectExplorerService.ts similarity index 98% rename from src/sql/parts/registeredServer/common/objectExplorerService.ts rename to src/sql/parts/objectExplorer/common/objectExplorerService.ts index 5b4b30aa93..bc8c5fc721 100644 --- a/src/sql/parts/registeredServer/common/objectExplorerService.ts +++ b/src/sql/parts/objectExplorer/common/objectExplorerService.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/registeredServer/common/treeNode'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/objectExplorer/common/treeNode'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -18,7 +18,7 @@ import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { warn, error } from 'sql/base/common/log'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import * as vscode from 'vscode'; diff --git a/src/sql/parts/registeredServer/common/registeredServer.contribution.ts b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts similarity index 97% rename from src/sql/parts/registeredServer/common/registeredServer.contribution.ts rename to src/sql/parts/objectExplorer/common/registeredServer.contribution.ts index f81ad71430..1a51784695 100644 --- a/src/sql/parts/registeredServer/common/registeredServer.contribution.ts +++ b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts @@ -15,7 +15,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { VIEWLET_ID } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionViewlet } from 'sql/parts/registeredServer/viewlet/connectionViewlet'; +import { ConnectionViewlet } from 'sql/parts/objectExplorer/viewlet/connectionViewlet'; // Viewlet Action export class OpenConnectionsViewletAction extends ToggleViewletAction { diff --git a/src/sql/parts/registeredServer/common/treeNode.ts b/src/sql/parts/objectExplorer/common/treeNode.ts similarity index 98% rename from src/sql/parts/registeredServer/common/treeNode.ts rename to src/sql/parts/objectExplorer/common/treeNode.ts index 86f9711427..0d4c39d285 100644 --- a/src/sql/parts/registeredServer/common/treeNode.ts +++ b/src/sql/parts/objectExplorer/common/treeNode.ts @@ -6,7 +6,7 @@ 'use strict'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import * as sqlops from 'sqlops'; import * as UUID from 'vs/base/common/uuid'; diff --git a/src/sql/parts/registeredServer/serverGroupDialog/media/serverGroupDialog.css b/src/sql/parts/objectExplorer/serverGroupDialog/media/serverGroupDialog.css similarity index 100% rename from src/sql/parts/registeredServer/serverGroupDialog/media/serverGroupDialog.css rename to src/sql/parts/objectExplorer/serverGroupDialog/media/serverGroupDialog.css diff --git a/src/sql/parts/registeredServer/serverGroupDialog/serverGroup.contribution.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution.ts similarity index 100% rename from src/sql/parts/registeredServer/serverGroupDialog/serverGroup.contribution.ts rename to src/sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution.ts diff --git a/src/sql/parts/registeredServer/serverGroupDialog/serverGroupController.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts similarity index 95% rename from src/sql/parts/registeredServer/serverGroupDialog/serverGroupController.ts rename to src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts index 5967bc7cbc..eca5ea4ee7 100644 --- a/src/sql/parts/registeredServer/serverGroupDialog/serverGroupController.ts +++ b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts @@ -9,8 +9,8 @@ import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/parts/connection/common/connectionManagement'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { ServerGroupDialog } from 'sql/parts/registeredServer/serverGroupDialog/serverGroupDialog'; -import { ServerGroupViewModel } from 'sql/parts/registeredServer/serverGroupDialog/serverGroupViewModel'; +import { ServerGroupDialog } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog'; +import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; import { TPromise } from 'vs/base/common/winjs.base'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/parts/registeredServer/serverGroupDialog/serverGroupDialog.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts similarity index 99% rename from src/sql/parts/registeredServer/serverGroupDialog/serverGroupDialog.ts rename to src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts index 414766ff63..f6192dd85f 100644 --- a/src/sql/parts/registeredServer/serverGroupDialog/serverGroupDialog.ts +++ b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts @@ -22,7 +22,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/base/browser/ui/modal/modal'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { ServerGroupViewModel } from 'sql/parts/registeredServer/serverGroupDialog/serverGroupViewModel'; +import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/registeredServer/serverGroupDialog/serverGroupViewModel.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts similarity index 100% rename from src/sql/parts/registeredServer/serverGroupDialog/serverGroupViewModel.ts rename to src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts diff --git a/src/sql/parts/registeredServer/viewlet/connectionTreeAction.ts b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts similarity index 97% rename from src/sql/parts/registeredServer/viewlet/connectionTreeAction.ts rename to src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts index f2fd6e0313..6f43a865aa 100644 --- a/src/sql/parts/registeredServer/viewlet/connectionTreeAction.ts +++ b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts @@ -10,17 +10,17 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; -import { ConnectionViewlet } from 'sql/parts/registeredServer/viewlet/connectionViewlet'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ConnectionViewlet } from 'sql/parts/objectExplorer/viewlet/connectionViewlet'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import * as Constants from 'sql/parts/connection/common/constants'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext, ObjectExplorerActionUtilities } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext, ObjectExplorerActionUtilities } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; export class RefreshAction extends Action { diff --git a/src/sql/parts/registeredServer/viewlet/connectionViewlet.ts b/src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts similarity index 95% rename from src/sql/parts/registeredServer/viewlet/connectionViewlet.ts rename to src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts index 005cf1f60d..825e56dcb0 100644 --- a/src/sql/parts/registeredServer/viewlet/connectionViewlet.ts +++ b/src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts @@ -20,12 +20,12 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { isPromiseCanceledError } from 'vs/base/common/errors'; import Severity from 'vs/base/common/severity'; import { IConnectionsViewlet, IConnectionManagementService, VIEWLET_ID } from 'sql/parts/connection/common/connectionManagement'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ClearSearchAction, AddServerAction, AddServerGroupAction, ActiveConnectionsFilterAction } from 'sql/parts/registeredServer/viewlet/connectionTreeAction'; +import { ClearSearchAction, AddServerAction, AddServerGroupAction, ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { warn } from 'sql/base/common/log'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { INotificationService } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/parts/registeredServer/viewlet/dragAndDropController.ts b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts similarity index 98% rename from src/sql/parts/registeredServer/viewlet/dragAndDropController.ts rename to src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts index 8f436d5d5e..d202b42a6d 100644 --- a/src/sql/parts/registeredServer/viewlet/dragAndDropController.ts +++ b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts @@ -11,7 +11,7 @@ import { IConnectionManagementService } from 'sql/parts/connection/common/connec import { ITree, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree'; import * as Constants from 'sql/parts/connection/common/constants'; import { DragMouseEvent } from 'vs/base/browser/mouseEvent'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; /** * Implements drag and drop for the server tree diff --git a/src/sql/parts/registeredServer/viewlet/media/add_server.svg b/src/sql/parts/objectExplorer/viewlet/media/add_server.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/add_server.svg rename to src/sql/parts/objectExplorer/viewlet/media/add_server.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/add_server_inverse.svg b/src/sql/parts/objectExplorer/viewlet/media/add_server_inverse.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/add_server_inverse.svg rename to src/sql/parts/objectExplorer/viewlet/media/add_server_inverse.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/collapsed-dark.svg b/src/sql/parts/objectExplorer/viewlet/media/collapsed-dark.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/collapsed-dark.svg rename to src/sql/parts/objectExplorer/viewlet/media/collapsed-dark.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/connected_active_server.svg b/src/sql/parts/objectExplorer/viewlet/media/connected_active_server.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/connected_active_server.svg rename to src/sql/parts/objectExplorer/viewlet/media/connected_active_server.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/connected_active_server_inverse.svg b/src/sql/parts/objectExplorer/viewlet/media/connected_active_server_inverse.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/connected_active_server_inverse.svg rename to src/sql/parts/objectExplorer/viewlet/media/connected_active_server_inverse.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css b/src/sql/parts/objectExplorer/viewlet/media/connectionViewlet.css similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/connectionViewlet.css rename to src/sql/parts/objectExplorer/viewlet/media/connectionViewlet.css diff --git a/src/sql/parts/registeredServer/viewlet/media/disconnected_server.svg b/src/sql/parts/objectExplorer/viewlet/media/disconnected_server.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/disconnected_server.svg rename to src/sql/parts/objectExplorer/viewlet/media/disconnected_server.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/disconnected_server_inverse.svg b/src/sql/parts/objectExplorer/viewlet/media/disconnected_server_inverse.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/disconnected_server_inverse.svg rename to src/sql/parts/objectExplorer/viewlet/media/disconnected_server_inverse.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/expanded-dark.svg b/src/sql/parts/objectExplorer/viewlet/media/expanded-dark.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/expanded-dark.svg rename to src/sql/parts/objectExplorer/viewlet/media/expanded-dark.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/new_servergroup.svg b/src/sql/parts/objectExplorer/viewlet/media/new_servergroup.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/new_servergroup.svg rename to src/sql/parts/objectExplorer/viewlet/media/new_servergroup.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/new_servergroup_inverse.svg b/src/sql/parts/objectExplorer/viewlet/media/new_servergroup_inverse.svg similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/new_servergroup_inverse.svg rename to src/sql/parts/objectExplorer/viewlet/media/new_servergroup_inverse.svg diff --git a/src/sql/parts/registeredServer/viewlet/media/serverTreeActions.css b/src/sql/parts/objectExplorer/viewlet/media/serverTreeActions.css similarity index 100% rename from src/sql/parts/registeredServer/viewlet/media/serverTreeActions.css rename to src/sql/parts/objectExplorer/viewlet/media/serverTreeActions.css diff --git a/src/sql/parts/registeredServer/viewlet/objectExplorerActions.ts b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts similarity index 97% rename from src/sql/parts/registeredServer/viewlet/objectExplorerActions.ts rename to src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts index e35bd8797c..2b4b096ea2 100644 --- a/src/sql/parts/registeredServer/viewlet/objectExplorerActions.ts +++ b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts @@ -9,19 +9,19 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IConnectionManagementService, IConnectionCompletionOptions, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptDeleteAction, ScriptAlterAction } from 'sql/workbench/common/actions'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; -import { TreeSelectionHandler } from 'sql/parts/registeredServer/viewlet/treeSelectionHandler'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IScriptingService } from 'sql/services/scripting/scriptingService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import * as Constants from 'sql/parts/connection/common/constants'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; diff --git a/src/sql/parts/registeredServer/viewlet/recentConnectionDataSource.ts b/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts similarity index 100% rename from src/sql/parts/registeredServer/viewlet/recentConnectionDataSource.ts rename to src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeActionProvider.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts similarity index 94% rename from src/sql/parts/registeredServer/viewlet/serverTreeActionProvider.ts rename to src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts index 9c5ebccb47..8f9eff76a9 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeActionProvider.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts @@ -14,18 +14,18 @@ import { DisconnectConnectionAction, AddServerAction, DeleteConnectionAction, RefreshAction, EditServerGroupAction } - from 'sql/parts/registeredServer/viewlet/connectionTreeAction'; + from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { DisconnectAction, ObjectExplorerActionUtilities, ManageConnectionAction, OEAction -} from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; +} from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { NewProfilerAction } from 'sql/parts/profiler/contrib/profilerActions'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { NewQueryAction } from 'sql/workbench/common/actions'; diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeController.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts similarity index 93% rename from src/sql/parts/registeredServer/viewlet/serverTreeController.ts rename to src/sql/parts/objectExplorer/viewlet/serverTreeController.ts index 27fcb9fb60..82797aa3f7 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeController.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts @@ -14,9 +14,9 @@ import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ServerTreeActionProvider } from 'sql/parts/registeredServer/viewlet/serverTreeActionProvider'; -import { ObjectExplorerActionsContext } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; +import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; /** * Extends the tree controller to handle clicks on the tree elements diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeDataSource.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts similarity index 93% rename from src/sql/parts/registeredServer/viewlet/serverTreeDataSource.ts rename to src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts index 84a0106422..3036656b51 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeDataSource.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts @@ -7,10 +7,10 @@ import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TPromise } from 'vs/base/common/winjs.base'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeRenderer.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts similarity index 97% rename from src/sql/parts/registeredServer/viewlet/serverTreeRenderer.ts rename to src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts index a55c0208c3..3bd4ede59e 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeRenderer.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts @@ -13,11 +13,11 @@ import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionPr import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { IConnectionProfileGroupTemplateData, IConnectionTemplateData, IObjectExplorerTemplateData } from 'sql/parts/registeredServer/viewlet/templateData'; +import { IConnectionProfileGroupTemplateData, IConnectionTemplateData, IObjectExplorerTemplateData } from 'sql/parts/objectExplorer/viewlet/templateData'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; /** * Renders the tree items. diff --git a/src/sql/parts/registeredServer/viewlet/serverTreeView.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts similarity index 96% rename from src/sql/parts/registeredServer/viewlet/serverTreeView.ts rename to src/sql/parts/objectExplorer/viewlet/serverTreeView.ts index 37392469b8..a6f2d36e23 100644 --- a/src/sql/parts/registeredServer/viewlet/serverTreeView.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts @@ -17,18 +17,18 @@ import { localize } from 'vs/nls'; import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import * as ConnectionUtils from 'sql/parts/connection/common/utils'; -import { ActiveConnectionsFilterAction } from 'sql/parts/registeredServer/viewlet/connectionTreeAction'; +import { ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import { TreeCreationUtils } from 'sql/parts/registeredServer/viewlet/treeCreationUtils'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; -import { TreeSelectionHandler } from 'sql/parts/registeredServer/viewlet/treeSelectionHandler'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import { Button } from 'sql/base/browser/ui/button/button'; import { attachButtonStyler } from 'sql/common/theme/styler'; import Event, { Emitter } from 'vs/base/common/event'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/registeredServer/common/treeNode'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; const $ = builder.$; diff --git a/src/sql/parts/registeredServer/viewlet/templateData.ts b/src/sql/parts/objectExplorer/viewlet/templateData.ts similarity index 92% rename from src/sql/parts/registeredServer/viewlet/templateData.ts rename to src/sql/parts/objectExplorer/viewlet/templateData.ts index e0d29b5521..1525d7f90e 100644 --- a/src/sql/parts/registeredServer/viewlet/templateData.ts +++ b/src/sql/parts/objectExplorer/viewlet/templateData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; export interface IConnectionTemplateData { root: HTMLElement; diff --git a/src/sql/parts/registeredServer/viewlet/treeCreationUtils.ts b/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts similarity index 82% rename from src/sql/parts/registeredServer/viewlet/treeCreationUtils.ts rename to src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts index c2d2597520..d0828319d3 100644 --- a/src/sql/parts/registeredServer/viewlet/treeCreationUtils.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts @@ -7,14 +7,14 @@ import 'vs/css!./media/serverTreeActions'; import nls = require('vs/nls'); import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ServerTreeRenderer } from 'sql/parts/registeredServer/viewlet/serverTreeRenderer'; -import { ServerTreeDataSource } from 'sql/parts/registeredServer/viewlet/serverTreeDataSource'; -import { ServerTreeController } from 'sql/parts/registeredServer/viewlet/serverTreeController'; -import { ServerTreeActionProvider } from 'sql/parts/registeredServer/viewlet/serverTreeActionProvider'; +import { ServerTreeRenderer } from 'sql/parts/objectExplorer/viewlet/serverTreeRenderer'; +import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource'; +import { ServerTreeController } from 'sql/parts/objectExplorer/viewlet/serverTreeController'; +import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; import { IController } from 'vs/base/parts/tree/browser/tree'; -import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/parts/registeredServer/viewlet/dragAndDropController'; -import { RecentConnectionDataSource } from 'sql/parts/registeredServer/viewlet/recentConnectionDataSource'; +import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/parts/objectExplorer/viewlet/dragAndDropController'; +import { RecentConnectionDataSource } from 'sql/parts/objectExplorer/viewlet/recentConnectionDataSource'; export class TreeCreationUtils { /** diff --git a/src/sql/parts/registeredServer/viewlet/treeSelectionHandler.ts b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts similarity index 94% rename from src/sql/parts/registeredServer/viewlet/treeSelectionHandler.ts rename to src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts index 647f718fb5..aec70e5062 100644 --- a/src/sql/parts/registeredServer/viewlet/treeSelectionHandler.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts @@ -6,11 +6,11 @@ import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/parts/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; -import { TreeUpdateUtils } from 'sql/parts/registeredServer/viewlet/treeUpdateUtils'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; export class TreeSelectionHandler { progressRunner: IProgressRunner; diff --git a/src/sql/parts/registeredServer/viewlet/treeUpdateUtils.ts b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts similarity index 97% rename from src/sql/parts/registeredServer/viewlet/treeUpdateUtils.ts rename to src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts index 1014edcb03..2bf748f510 100644 --- a/src/sql/parts/registeredServer/viewlet/treeUpdateUtils.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts @@ -7,11 +7,11 @@ import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionPr import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/parts/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TPromise } from 'vs/base/common/winjs.base'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import errors = require('vs/base/common/errors'); export class TreeUpdateUtils { diff --git a/src/sql/parts/profiler/contrib/profilerActions.ts b/src/sql/parts/profiler/contrib/profilerActions.ts index d695adbe75..1a208e32fa 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.ts +++ b/src/sql/parts/profiler/contrib/profilerActions.ts @@ -10,7 +10,7 @@ import { IProfilerController } from 'sql/parts/profiler/editor/controller/interf import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { BaseActionContext } from 'sql/workbench/common/actions'; import { Task } from 'sql/platform/tasks/common/tasks'; -import { ObjectExplorerActionsContext } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType } from 'sql/parts/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; diff --git a/src/sql/services/bootstrap/bootstrapService.ts b/src/sql/services/bootstrap/bootstrapService.ts index 415b47ce57..fc207b1730 100644 --- a/src/sql/services/bootstrap/bootstrapService.ts +++ b/src/sql/services/bootstrap/bootstrapService.ts @@ -8,7 +8,7 @@ import { BootstrapParams } from 'sql/services/bootstrap/bootstrapParams'; import { IConnectionManagementService, IConnectionDialogService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; import { IScriptingService } from 'sql/services/scripting/scriptingService'; diff --git a/src/sql/services/bootstrap/bootstrapServiceImpl.ts b/src/sql/services/bootstrap/bootstrapServiceImpl.ts index 0a1cef4739..5b6fa70d30 100644 --- a/src/sql/services/bootstrap/bootstrapServiceImpl.ts +++ b/src/sql/services/bootstrap/bootstrapServiceImpl.ts @@ -10,7 +10,7 @@ import { BootstrapParams } from 'sql/services/bootstrap/bootstrapParams'; import { IConnectionManagementService, IConnectionDialogService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { IScriptingService } from 'sql/services/scripting/scriptingService'; import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; diff --git a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts index 57b7ae9592..874698911d 100644 --- a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts +++ b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts @@ -9,7 +9,7 @@ import * as sqlops from 'sqlops'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; diff --git a/src/sql/workbench/api/node/mainThreadDataProtocol.ts b/src/sql/workbench/api/node/mainThreadDataProtocol.ts index 56deea2d82..a1e34fa5c2 100644 --- a/src/sql/workbench/api/node/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/node/mainThreadDataProtocol.ts @@ -15,7 +15,7 @@ import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesServ import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; import * as sqlops from 'sqlops'; import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IScriptingService } from 'sql/services/scripting/scriptingService'; import { IAdminService } from 'sql/parts/admin/common/adminService'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; diff --git a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts index 333c0bcb91..66eb907350 100644 --- a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts @@ -10,7 +10,7 @@ import * as vscode from 'vscode'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/common/actions.ts index bce0b29b53..b98a2f905c 100644 --- a/src/sql/workbench/common/actions.ts +++ b/src/sql/workbench/common/actions.ts @@ -17,7 +17,7 @@ import { IAdminService } from 'sql/parts/admin/common/adminService'; import * as Constants from 'sql/common/constants'; import { ScriptOperation } from 'sql/workbench/common/taskUtilities'; import { Task } from 'sql/platform/tasks/common/tasks'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { ObjectMetadata } from 'sqlops'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index 369b20ee2f..19e35477a3 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -24,7 +24,7 @@ import * as sqlops from 'sqlops'; import nls = require('vs/nls'); import os = require('os'); import path = require('path'); -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; diff --git a/src/sqltest/parts/connection/connectionTreeActions.test.ts b/src/sqltest/parts/connection/connectionTreeActions.test.ts index 623aae6f2f..c8f3510b62 100644 --- a/src/sqltest/parts/connection/connectionTreeActions.test.ts +++ b/src/sqltest/parts/connection/connectionTreeActions.test.ts @@ -14,25 +14,25 @@ import { RefreshAction, AddServerAction, DeleteConnectionAction, DisconnectConnectionAction, ActiveConnectionsFilterAction, RecentConnectionsFilterAction } - from 'sql/parts/registeredServer/viewlet/connectionTreeAction'; + from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import * as Constants from 'sql/parts/connection/common/constants'; import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; -import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/parts/registeredServer/common/objectExplorerService'; -import { TreeNode } from 'sql/parts/registeredServer/common/treeNode'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; +import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { ServerTreeDataSource } from 'sql/parts/registeredServer/viewlet/serverTreeDataSource'; +import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource'; import { Builder, $ } from 'vs/base/browser/builder'; import WinJS = require('vs/base/common/winjs.base'); import { Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/parts/registeredServer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { IConnectionResult, IConnectionParams } from 'sql/parts/connection/common/connectionManagement'; -import { TreeSelectionHandler } from 'sql/parts/registeredServer/viewlet/treeSelectionHandler'; +import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; suite('SQL Connection Tree Action tests', () => { diff --git a/src/sqltest/parts/connection/objectExplorerService.test.ts b/src/sqltest/parts/connection/objectExplorerService.test.ts index 1458ba278d..595670f8c2 100644 --- a/src/sqltest/parts/connection/objectExplorerService.test.ts +++ b/src/sqltest/parts/connection/objectExplorerService.test.ts @@ -8,15 +8,15 @@ import { ObjectExplorerProviderTestService } from 'sqltest/stubs/objectExplorerP import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; -import { NodeType } from 'sql/parts/registeredServer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/registeredServer/common/treeNode'; +import { ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/objectExplorer/common/treeNode'; import { TPromise } from 'vs/base/common/winjs.base'; import * as sqlops from 'sqlops'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import Event, { Emitter } from 'vs/base/common/event'; import { CapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; diff --git a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts index 9064f554fe..b4a0f00650 100644 --- a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts +++ b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts @@ -6,7 +6,7 @@ 'use strict'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ServerTreeView } from 'sql/parts/registeredServer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; diff --git a/src/sqltest/workbench/common/taskUtilities.test.ts b/src/sqltest/workbench/common/taskUtilities.test.ts index 92855cf2ef..f8f316de9e 100644 --- a/src/sqltest/workbench/common/taskUtilities.test.ts +++ b/src/sqltest/workbench/common/taskUtilities.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 02b513bce7..2a5ecc7ff9 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -53,7 +53,7 @@ import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; interface IEditorInputLabel { name: string; @@ -92,7 +92,7 @@ export class TabsTitleControl extends TitleControl { @IWorkspaceConfigurationService private workspaceConfigurationService: IWorkspaceConfigurationService, @IConnectionManagementService private connectionService: IConnectionManagementService, @IQueryEditorService private queryEditorService: IQueryEditorService, - @IObjectExplorerService private objectExplorerService: IObjectExplorerService + @IObjectExplorerService private objectExplorerService: IObjectExplorerService ) { super(contextMenuService, instantiationService, editorService, editorGroupService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService); diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 747b319278..f4bf795241 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -111,7 +111,7 @@ import { IConnectionManagementService, IConnectionDialogService, IErrorMessageSe import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; import { ErrorMessageService } from 'sql/workbench/errorMessageDialog/errorMessageService'; -import { ServerGroupController } from 'sql/parts/registeredServer/serverGroupDialog/serverGroupController'; +import { ServerGroupController } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupController'; import { IBootstrapService } from 'sql/services/bootstrap/bootstrapService'; import { IAngularEventingService, AngularEventingService } from 'sql/services/angularEventing/angularEventingService'; @@ -120,7 +120,7 @@ import { ICapabilitiesService, CapabilitiesService } from 'sql/services/capabili import { ICredentialsService, CredentialsService } from 'sql/services/credentials/credentialsService'; import { ISerializationService, SerializationService } from 'sql/services/serialization/serializationService'; import { IMetadataService, MetadataService } from 'sql/services/metadata/metadataService'; -import { IObjectExplorerService, ObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService, ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { ITaskService, TaskService } from 'sql/parts/taskHistory/common/taskService'; import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; import { QueryModelService } from 'sql/parts/query/execution/queryModelService'; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 0fa32c5d9c..02a9e15b2c 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -57,7 +57,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ // {{SQL CARBON EDIT}} import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; @@ -494,7 +494,7 @@ export class GlobalNewUntitledFileAction extends Action { ) { super(id, label); } - + public run(): TPromise { // {{SQL CARBON EDIT}} TaskUtilities.newQuery(undefined, this.connectionManagementService, this.queryEditorService, this._objectExplorerService, this.editorService); diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts index 695a98659d..3b589e8c42 100644 --- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts +++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts @@ -29,7 +29,7 @@ import { escape } from 'vs/base/common/strings'; import { QUICKOPEN_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen'; // {{SQL CARBON EDIT}} -import { OpenConnectionsViewletAction } from 'sql/parts/registeredServer/common/registeredServer.contribution'; +import { OpenConnectionsViewletAction } from 'sql/parts/objectExplorer/common/registeredServer.contribution'; interface WatermarkEntry { diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index ce790959e9..946707d2d4 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -140,15 +140,15 @@ import 'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay'; import 'sql/parts/taskHistory/common/taskHistory.contribution'; import 'sql/parts/taskHistory/viewlet/taskHistoryViewlet'; import 'sql/parts/tasks/common/tasks.contribution'; -import 'sql/parts/registeredServer/common/registeredServer.contribution'; -import 'sql/parts/registeredServer/viewlet/connectionViewlet'; +import 'sql/parts/objectExplorer/common/registeredServer.contribution'; +import 'sql/parts/objectExplorer/viewlet/connectionViewlet'; import 'sql/workbench/api/node/sqlExtHost.contribution'; import 'sql/parts/connection/common/connection.contribution'; import 'sql/parts/query/common/query.contribution'; import 'sql/parts/query/editor/resultsGridContribution'; import 'sql/parts/profiler/contrib/profiler.contribution'; import 'sql/parts/profiler/contrib/profilerActions.contribution'; -import 'sql/parts/registeredServer/serverGroupDialog/serverGroup.contribution'; +import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; import 'sql/parts/accountManagement/common/accountManagement.contribution'; /* Insights */ import 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution';