From 826353e6ab575c8aca0e215d656409fb4fd43bda Mon Sep 17 00:00:00 2001 From: Vitaly Parfonov Date: Thu, 12 May 2016 09:31:10 +0300 Subject: [PATCH] CHE-781:Move all platform-api-client-gwt to the che-core-ide-api module Signed-off-by: Vitaly Parfonov --- assembly/assembly-ide-war/pom.xml | 36 ---- .../resources/org/eclipse/che/ide/IDE.gwt.xml | 19 +- core/ide/che-core-ide-api/pom.xml | 49 ++++- .../eclipse/che/ide/api/app/AppContext.java | 2 +- .../che/ide/api/auth}/OAuthServiceClient.java | 2 +- .../ide/api/auth}/OAuthServiceClientImpl.java | 2 +- .../api/factory}/FactoryServiceClient.java | 2 +- .../factory}/FactoryServiceClientImpl.java | 2 +- .../che/ide/api/git}/GitServiceClient.java | 4 +- .../ide/api/git}/GitServiceClientImpl.java | 6 +- .../ide/api/importer/AbstractImporter.java | 2 +- .../che/ide/api/machine}/DevMachine.java | 4 +- .../ide/api/machine}/DevMachineServer.java | 2 +- .../che/ide/api/machine}/MachineManager.java | 2 +- .../api/machine}/MachineServiceClient.java | 2 +- .../machine}/MachineServiceClientImpl.java | 2 +- .../machine}/OutputMessageUnmarshaller.java | 2 +- .../ide/api/machine}/RecipeServiceClient.java | 2 +- .../api/machine}/RecipeServiceClientImpl.java | 3 +- .../che/ide/api/machine}/WsAgentState.java | 2 +- .../api/machine}/WsAgentStateController.java | 18 +- .../machine}/events/DevMachineStateEvent.java | 2 +- .../machine}/events/WsAgentStateEvent.java | 4 +- .../machine}/events/WsAgentStateHandler.java | 2 +- .../ProjectImportersServiceClient.java | 4 +- .../ProjectImportersServiceClientImpl.java | 4 +- .../api/project}/ProjectServiceClient.java | 4 +- .../project}/ProjectServiceClientImpl.java | 6 +- .../ProjectTemplateServiceClient.java | 2 +- .../ProjectTemplateServiceClientImpl.java | 2 +- .../project}/ProjectTypeServiceClient.java | 4 +- .../ProjectTypeServiceClientImpl.java | 7 +- .../che/ide/api/project}/QueryExpression.java | 2 +- .../api/project/tree/generic/FileNode.java | 3 +- .../api/project/tree/generic/FolderNode.java | 2 +- .../tree/generic/GenericTreeStructure.java | 2 +- .../generic/GenericTreeStructureProvider.java | 2 +- .../api/project/tree/generic/ItemNode.java | 2 +- .../api/project/tree/generic/ProjectNode.java | 2 +- .../che/ide/api/ssh}/SshServiceClient.java | 2 +- .../ide/api/ssh}/SshServiceClientImpl.java | 2 +- .../api/user}/UserProfileServiceClient.java | 2 +- .../user}/UserProfileServiceClientImpl.java | 2 +- .../che/ide/api/user}/UserServiceClient.java | 2 +- .../ide/api/user}/UserServiceClientImpl.java | 2 +- .../workspace}/WorkspaceServiceClient.java | 3 +- .../WorkspaceServiceClientImpl.java | 2 +- .../event/WorkspaceStartedEvent.java | 2 +- .../event/WorkspaceStartedHandler.java | 2 +- .../event/WorkspaceStoppedEvent.java | 2 +- .../event/WorkspaceStoppedHandler.java | 2 +- .../org/eclipse/che/api/auth}/Auth.gwt.xml | 4 +- .../org/eclipse/che/api/core}/Core.gwt.xml | 9 +- .../eclipse/che/api/factory}/Factory.gwt.xml | 5 +- .../org/eclipse/che/api/git}/Git.gwt.xml | 5 +- .../eclipse/che/api/machine}/Machine.gwt.xml | 3 +- .../eclipse/che/api/project}/Project.gwt.xml | 9 +- .../org/eclipse/che/api/ssh}/Ssh.gwt.xml | 4 +- .../org/eclipse/che/api/user}/User.gwt.xml | 3 +- .../che/api/workspace}/Workspace.gwt.xml | 4 +- .../resources/org/eclipse/che/ide/Api.gwt.xml | 4 - .../project/tree/generic/BaseNodeTest.java | 2 +- .../generic/GenericTreeStructureTest.java | 2 +- core/ide/che-core-ide-app/pom.xml | 36 ---- .../che/ide/actions/DeleteItemAction.java | 2 +- .../eclipse/che/ide/actions/PasteAction.java | 2 +- .../che/ide/actions/StopMachineAction.java | 2 +- .../che/ide/actions/StopWorkspaceAction.java | 2 +- .../ide/actions/WorkspaceSnapshotCreator.java | 2 +- .../che/ide/client/BootstrapController.java | 10 +- .../ide/connection/WsConnectionListener.java | 4 +- .../che/ide/context/AppContextImpl.java | 6 +- .../eclipse/che/ide/core/CoreGinModule.java | 54 +++--- .../che/ide/core/ProfileComponent.java | 2 +- .../che/ide/editor/EditorAgentImpl.java | 6 +- .../EditorPropertiesPresenter.java | 4 +- .../navigation/NavigateToFilePresenter.java | 4 +- .../AbstractNewResourceAction.java | 4 +- .../project/ProjectConfigEnforcer.java | 2 +- .../project/ProjectExplorerPresenter.java | 6 +- .../ProjectConfigSynchronizationListener.java | 2 +- .../preferences/PreferencesManagerImpl.java | 2 +- .../che/ide/project/node/NodeManager.java | 2 +- .../resource/AbstractResourceProcessor.java | 2 +- .../node/resource/ItemReferenceProcessor.java | 2 +- .../node/resource/ModuleConfigProcessor.java | 2 +- .../node/resource/ProjectConfigProcessor.java | 2 +- .../local/LocalZipImporterPagePresenter.java | 2 +- .../projectimport/wizard/ProjectImporter.java | 2 +- .../ProjectNotificationSubscriberImpl.java | 2 +- .../projectimport/wizard/ProjectResolver.java | 2 +- .../projectimport/wizard/ProjectUpdater.java | 2 +- .../wizard/mainpage/MainPagePresenter.java | 2 +- .../ProjectTemplatesComponent.java | 2 +- .../ide/projecttype/ProjectTypeComponent.java | 3 +- .../ide/projecttype/wizard/ProjectWizard.java | 2 +- .../ide/search/FullTextSearchPresenter.java | 4 +- .../ide/statepersistance/AppStateManager.java | 8 +- .../workspace/DefaultWorkspaceComponent.java | 4 +- .../workspace/FactoryWorkspaceComponent.java | 6 +- .../che/ide/workspace/WorkspaceComponent.java | 12 +- .../create/CreateWorkspacePresenter.java | 4 +- .../org/eclipse/che/ide/Core.gwt.xml | 13 +- .../ide/actions/StopWorkspaceActionTest.java | 4 +- .../actions/WorkspaceSnapshotCreatorTest.java | 2 +- .../che/ide/editor/EditorAgentImplTest.java | 2 +- .../NavigateToFilePresenterTest.java | 2 +- ...jectConfigSynchronizationListenerTest.java | 4 +- .../che/ide/project/node/NodeManagerTest.java | 7 +- .../LocalZipImporterPagePresenterTest.java | 4 +- .../wizard/ProjectImporterTest.java | 4 +- .../wizard/ProjectUpdaterTest.java | 4 +- .../projecttype/wizard/ProjectWizardTest.java | 4 +- .../search/FullTextSearchPresenterTest.java | 7 +- .../statepersistance/AppStateManagerTest.java | 4 +- .../create/CreateWorkspacePresenterTest.java | 4 +- .../che-core-client-gwt-auth/pom.xml | 156 --------------- .../che-core-client-gwt-core/pom.xml | 126 ------------ .../che-core-client-gwt-factory/pom.xml | 163 ---------------- .../che-core-client-gwt-git/pom.xml | 148 -------------- .../che-core-client-gwt-machine/pom.xml | 153 --------------- .../che-core-client-gwt-project/pom.xml | 180 ------------------ .../che-core-client-gwt-ssh/pom.xml | 143 -------------- .../che-core-client-gwt-user/pom.xml | 156 --------------- .../che-core-client-gwt-workspace/pom.xml | 172 ----------------- core/platform-api-client-gwt/pom.xml | 36 ---- core/pom.xml | 1 - .../org/eclipse/che/plugin/cpp/Cpp.gwt.xml | 2 +- .../che-plugin-debugger-ide/pom.xml | 4 - .../client/debug/AbstractDebugger.java | 4 +- .../debugger/client/debug/DebuggerTest.java | 4 +- .../che-plugin-docker-ext-client/pom.xml | 5 - .../CredentialsPreferencesPresenter.java | 2 +- plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml | 4 - .../plugin-git/che-plugin-git-ext-git/pom.xml | 12 -- .../git/client/GitRepositoryInitializer.java | 2 +- .../action/CompareWithLatestAction.java | 2 +- .../git/client/add/AddToIndexPresenter.java | 2 +- .../git/client/branch/BranchPresenter.java | 4 +- .../checkout/CheckoutReferencePresenter.java | 4 +- .../git/client/commit/CommitPresenter.java | 2 +- .../git/client/compare/ComparePresenter.java | 4 +- .../branchList/BranchListPresenter.java | 2 +- .../revisionsList/RevisionListPresenter.java | 2 +- .../delete/DeleteRepositoryPresenter.java | 4 +- .../ext/git/client/fetch/FetchPresenter.java | 2 +- .../git/client/history/HistoryPresenter.java | 2 +- .../client/init/InitRepositoryPresenter.java | 2 +- .../ext/git/client/merge/MergePresenter.java | 2 +- .../ext/git/client/pull/PullPresenter.java | 2 +- .../client/push/PushToRemotePresenter.java | 2 +- .../git/client/remote/RemotePresenter.java | 4 +- .../add/AddRemoteRepositoryPresenter.java | 2 +- .../remove/RemoveFromIndexPresenter.java | 4 +- .../reset/commit/ResetToCommitPresenter.java | 2 +- .../reset/files/ResetFilesPresenter.java | 2 +- .../client/status/StatusCommandPresenter.java | 2 +- .../ShowProjectGitReadOnlyUrlPresenter.java | 2 +- .../org/eclipse/che/ide/ext/git/Git.gwt.xml | 2 +- .../che/ide/ext/git/client/BaseTest.java | 6 +- .../client/branch/BranchPresenterTest.java | 4 +- .../checkout/CheckoutReferenceTest.java | 2 +- .../client/remote/RemotePresenterTest.java | 4 +- .../che-plugin-git-ssh-client/pom.xml | 9 - .../client/manage/SshKeyManagerPresenter.java | 2 +- .../manage/SshKeyManagerPresenterTest.java | 2 +- .../che-plugin-github-ide/pom.xml | 13 -- .../GitHubAuthenticatorImpl.java | 2 +- .../eclipse/che/plugin/github/GitHub.gwt.xml | 6 +- .../GitHubAuthenticatorImplTest.java | 2 +- .../page/GithubImporterPagePresenterTest.java | 2 +- .../plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml | 5 - .../che-plugin-java-debugger-ide/pom.xml | 4 - .../JavaDebugConfigurationPagePresenter.java | 2 +- ...vaDebugConfigurationPagePresenterTest.java | 4 +- .../extension/ant/client/AntExtension.java | 2 +- .../ant/client/projecttree/AntFolderNode.java | 2 +- .../client/projecttree/AntProjectNode.java | 2 +- .../projecttree/AntProjectTreeStructure.java | 2 +- .../AntProjectTreeStructureProvider.java | 2 +- .../ant/client/wizard/AntPagePresenter.java | 2 +- .../che-plugin-java-ext-lang-client/pom.xml | 8 - .../JavaClasspathServiceClientImpl.java | 2 +- .../LogsOutputHandler.java | 4 +- .../NewJavaSourceFilePresenter.java | 2 +- .../OrganizeImportsPresenter.java | 2 +- .../project/classpath/ClasspathResolver.java | 2 +- .../node/JavaItemReferenceProcessor.java | 2 +- .../client/project/node/JavaNodeManager.java | 2 +- .../JavaCompilerPreferencePresenter.java | 4 +- .../org/eclipse/che/ide/ext/java/Java.gwt.xml | 2 +- .../OrganizeImportsPresenterTest.java | 4 +- .../classpath/ClasspathResolverTest.java | 4 +- .../JavaCompilerPreferencePresenterTest.java | 2 +- .../eclipse/che/ide/ext/java/JavaTest.gwt.xml | 2 +- .../che-plugin-java-plain-ide/pom.xml | 4 - .../che/plugin/java/plain/PlainJava.gwt.xml | 2 +- .../che-plugin-machine-ext-client/pom.xml | 16 -- .../machine/client/MachineExtension.java | 4 +- .../client/actions/DestroyMachineAction.java | 2 +- .../client/actions/RestartMachineAction.java | 2 +- .../client/actions/SelectCommandComboBox.java | 8 +- .../client/command/CommandManager.java | 2 +- .../command/edit/EditCommandsPresenter.java | 2 +- .../CurrentProjectPathProvider.java | 4 +- .../DevMachineHostNameProvider.java | 4 +- .../valueproviders/ServerPortProvider.java | 6 +- .../client/inject/MachineGinModule.java | 2 +- .../client/machine/MachineManagerImpl.java | 24 +-- .../client/machine/MachineStatusNotifier.java | 8 +- .../create/CreateMachinePresenter.java | 6 +- .../CommandOutputConsolePresenter.java | 4 +- .../processes/ProcessesPresenter.java | 2 +- .../sufficientinfo/MachineInfoPresenter.java | 4 +- .../machine/panel/MachinePanelPresenter.java | 10 +- .../widgets/recipe/RecipePartPresenter.java | 2 +- .../processes/ConsolesPanelPresenter.java | 8 +- .../client/targets/TargetsPresenter.java | 6 +- .../che/ide/extension/machine/Machine.gwt.xml | 2 +- .../actions/DestroyMachineActionTest.java | 2 +- .../client/actions/NewTerminalActionTest.java | 2 +- .../actions/RestartMachineActionTest.java | 2 +- .../client/command/CommandManagerTest.java | 4 +- .../edit/EditCommandsPresenterTest.java | 2 +- .../machine/MachineStateNotifierTest.java | 6 +- .../create/CreateMachinePresenterTest.java | 8 +- .../processes/ProcessesPresenterTest.java | 4 +- .../MachineInfoPresenterTest.java | 6 +- .../panel/MachinePanelPresenterTest.java | 6 +- .../recipe/RecipePartPresenterTest.java | 2 +- .../recipe/editor/RecipeFileFactoryTest.java | 2 +- .../processes/ConsolesPanelPresenterTest.java | 4 +- .../che-plugin-machine-ssh-client/pom.xml | 9 - .../client/manage/SshKeyManagerPresenter.java | 2 +- .../plugin-maven/che-plugin-maven-ide/pom.xml | 8 - .../comunnication/MavenMessagesHandler.java | 8 +- .../module/CreateMavenModulePresenter.java | 2 +- .../client/wizard/MavenPagePresenter.java | 2 +- .../eclipse/che/plugin/nodejs/NodeJs.gwt.xml | 4 +- .../eclipse/che/plugin/python/Python.gwt.xml | 2 +- .../che-plugin-sdk-env-local/pom.xml | 4 - .../client/CheWorkspaceStoppedHandler.java | 6 +- .../plugin-svn/che-plugin-svn-ext-ide/pom.xml | 8 - .../filteredtree/FilteredProjectNode.java | 2 +- .../filteredtree/FilteredTreeStructure.java | 2 +- .../FilteredTreeStructureProvider.java | 2 +- .../plugin-web/che-plugin-web-ext-web/pom.xml | 5 - pom.xml | 45 ----- 248 files changed, 432 insertions(+), 2101 deletions(-) rename core/{platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth}/OAuthServiceClient.java (95%) rename core/{platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth}/OAuthServiceClientImpl.java (97%) rename core/{platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory}/FactoryServiceClient.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory}/FactoryServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git}/GitServiceClient.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git}/GitServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/DevMachine.java (96%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/DevMachineServer.java (97%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/MachineManager.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/MachineServiceClient.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/MachineServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/OutputMessageUnmarshaller.java (96%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/RecipeServiceClient.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/RecipeServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/WsAgentState.java (93%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/WsAgentStateController.java (95%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/events/DevMachineStateEvent.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/events/WsAgentStateEvent.java (94%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine}/events/WsAgentStateHandler.java (95%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectImportersServiceClient.java (88%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectImportersServiceClientImpl.java (93%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectServiceClient.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectTemplateServiceClient.java (96%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectTemplateServiceClientImpl.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectTypeServiceClient.java (93%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/ProjectTypeServiceClientImpl.java (94%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project}/QueryExpression.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh}/SshServiceClient.java (96%) rename core/{platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh}/SshServiceClientImpl.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user}/UserProfileServiceClient.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user}/UserProfileServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user}/UserServiceClient.java (97%) rename core/{platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user}/UserServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/WorkspaceServiceClient.java (98%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/WorkspaceServiceClientImpl.java (99%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/event/WorkspaceStartedEvent.java (96%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/event/WorkspaceStartedHandler.java (94%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/event/WorkspaceStoppedEvent.java (95%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client => ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace}/event/WorkspaceStoppedHandler.java (94%) rename core/{platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/auth}/Auth.gwt.xml (87%) rename core/{platform-api-client-gwt/che-core-client-gwt-core/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core}/Core.gwt.xml (77%) rename core/{platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/factory}/Factory.gwt.xml (89%) rename core/{platform-api-client-gwt/che-core-client-gwt-git/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git}/Git.gwt.xml (87%) rename core/{platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/machine}/Machine.gwt.xml (92%) rename core/{platform-api-client-gwt/che-core-client-gwt-project/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/project}/Project.gwt.xml (77%) rename core/{platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/ssh}/Ssh.gwt.xml (91%) rename core/{platform-api-client-gwt/che-core-client-gwt-user/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/user}/User.gwt.xml (91%) rename core/{platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources/org/eclipse/che/api => ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/workspace}/Workspace.gwt.xml (87%) delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-auth/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-core/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-ssh/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml delete mode 100644 core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml delete mode 100644 core/platform-api-client-gwt/pom.xml diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index 5c3e85d1ab..6bd3536fad 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -56,42 +56,6 @@ javax.inject javax.inject - - org.eclipse.che.core - che-core-client-gwt-auth - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-client-gwt-factory - - - org.eclipse.che.core - che-core-client-gwt-git - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - - - org.eclipse.che.core - che-core-client-gwt-ssh - - - org.eclipse.che.core - che-core-client-gwt-user - - - org.eclipse.che.core - che-core-client-gwt-workspace - org.eclipse.che.core che-core-commons-gwt diff --git a/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml b/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml index b9ad88fda3..6b7311ce12 100644 --- a/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml +++ b/assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml @@ -65,16 +65,15 @@ - - - - - - - - - - + + + + + + + + + diff --git a/core/ide/che-core-ide-api/pom.xml b/core/ide/che-core-ide-api/pom.xml index 4681014b8b..274508dac3 100644 --- a/core/ide/che-core-ide-api/pom.xml +++ b/core/ide/che-core-ide-api/pom.xml @@ -42,18 +42,42 @@ com.google.inject.extensions guice-assistedinject + + javax.inject + javax.inject + javax.validation validation-api + + + org.eclipse.che.core + che-core-api-auth org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-api-dto + org.eclipse.che.core che-core-api-factory-shared + + org.eclipse.che.core + che-core-api-git-shared + + + org.eclipse.che.core + che-core-api-machine-shared + + + org.eclipse.che.core + che-core-api-model + org.eclipse.che.core che-core-api-project-shared @@ -62,6 +86,10 @@ org.eclipse.che.core che-core-api-project-templates-shared + + org.eclipse.che.core + che-core-api-ssh-shared + org.eclipse.che.core che-core-api-user-shared @@ -70,14 +98,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - org.eclipse.che.core che-core-commons-annotations @@ -198,10 +218,19 @@ - org.eclipse.che.ide.api.user + org.eclipse.che.api.auth + org.eclipse.che.api.core + org.eclipse.che.api.factory + org.eclipse.che.api.git + org.eclipse.che.api.project + org.eclipse.che.api.project.templates + org.eclipse.che.api.machine + org.eclipse.che.api.workspace + org.eclipse.che.api.ssh + org.eclipse.che.api.user ${dto-generator-out-directory} - org.eclipse.che.ide.api.user.dto.DtoClientImpls + org.eclipse.che.ide.api.dto.DtoClientImpls client diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java index a743796e0b..41452a6856 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.api.app; import org.eclipse.che.api.factory.shared.dto.Factory; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import java.util.List; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClient.java similarity index 95% rename from core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClient.java index 7b62b8fce2..a740136d6f 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.auth.client; +package org.eclipse.che.ide.api.auth; import org.eclipse.che.api.auth.shared.dto.OAuthToken; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClientImpl.java similarity index 97% rename from core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClientImpl.java index ccea6bf043..f04d6768fa 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.auth.client; +package org.eclipse.che.ide.api.auth; import org.eclipse.che.api.auth.shared.dto.OAuthToken; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClient.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClient.java index fb136792af..d4cb88fa0a 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.factory.gwt.client; +package org.eclipse.che.ide.api.factory; import org.eclipse.che.api.factory.shared.dto.Factory; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClientImpl.java index 9c83a45073..ad5e283477 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.factory.gwt.client; +package org.eclipse.che.ide.api.factory; import com.google.common.base.Joiner; import com.google.gwt.http.client.RequestBuilder; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClient.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClient.java index 77f75a9e23..fb50fc975b 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.git.gwt.client; +package org.eclipse.che.ide.api.git; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.CheckoutRequest; @@ -26,7 +26,7 @@ import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.api.git.shared.ShowFileContentResponse; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.api.git.shared.StatusFormat; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.commons.annotation.Nullable; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java index bb6612040b..d0f9c72f58 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.git.gwt.client; +package org.eclipse.che.ide.api.git; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -46,8 +46,8 @@ import org.eclipse.che.api.git.shared.ShowFileContentRequest; import org.eclipse.che.api.git.shared.ShowFileContentResponse; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.api.git.shared.StatusFormat; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.WsAgentStateController; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java index 99abb994e3..2c50158d19 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.api.importer; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachine.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachine.java similarity index 96% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachine.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachine.java index c89128f06f..d05de79961 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachine.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachine.java @@ -8,13 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import com.google.common.base.Strings; import com.google.gwt.user.client.Window; -import org.eclipse.che.api.core.model.machine.MachineStatus; -import org.eclipse.che.api.core.model.machine.Server; import org.eclipse.che.api.machine.shared.Constants; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.ServerDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachineServer.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachineServer.java similarity index 97% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachineServer.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachineServer.java index 0be9c7fee8..415fa70bbb 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachineServer.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachineServer.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import org.eclipse.che.api.core.model.machine.Server; import org.eclipse.che.api.machine.shared.dto.ServerDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineManager.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineManager.java index 73f019ecf9..faa100ccaa 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineManager.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import org.eclipse.che.api.core.model.machine.Machine; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClient.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClient.java index a04ad8668e..f815119900 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import org.eclipse.che.api.core.model.machine.Command; import org.eclipse.che.api.machine.shared.dto.MachineDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java index b4fa0c2a04..32c0cf56ed 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import com.google.inject.Inject; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/OutputMessageUnmarshaller.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/OutputMessageUnmarshaller.java similarity index 96% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/OutputMessageUnmarshaller.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/OutputMessageUnmarshaller.java index 3a9daac65d..c2783ca605 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/OutputMessageUnmarshaller.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/OutputMessageUnmarshaller.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONString; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClient.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClient.java index e99897a51f..43623c1744 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import org.eclipse.che.api.machine.shared.dto.recipe.NewRecipe; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java index 6effc7f7e9..4338e9a3e3 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; @@ -20,7 +20,6 @@ import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper.RequestCall; -import org.eclipse.che.ide.dto.DtoFactory; import org.eclipse.che.ide.rest.AsyncRequestFactory; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.RestContext; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentState.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentState.java similarity index 93% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentState.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentState.java index e6779986cf..1a6e79cd5e 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentState.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentState.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; /** * Describes state of a ws-agent. diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentStateController.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java similarity index 95% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentStateController.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java index 1c17fbdf63..2007778004 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentStateController.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client; +package org.eclipse.che.ide.api.machine; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; @@ -19,7 +19,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper; import org.eclipse.che.ide.rest.AsyncRequestCallback; @@ -39,8 +39,6 @@ import org.eclipse.che.ide.websocket.events.WebSocketClosedEvent; import java.util.ArrayList; import java.util.List; -import static org.eclipse.che.api.machine.gwt.client.WsAgentState.STARTED; -import static org.eclipse.che.api.machine.gwt.client.WsAgentState.STOPPED; import static org.eclipse.che.ide.ui.loaders.initialization.InitialLoadingInfo.Operations.WS_AGENT_BOOTING; import static org.eclipse.che.ide.ui.loaders.initialization.OperationInfo.Status.IN_PROGRESS; import static org.eclipse.che.ide.ui.loaders.initialization.OperationInfo.Status.SUCCESS; @@ -83,7 +81,7 @@ public class WsAgentStateController implements ConnectionOpenedHandler, Connecti public void initialize(DevMachine devMachine) { this.devMachine = devMachine; - this.state = STOPPED; + this.state = WsAgentState.STOPPED; initialLoadingInfo.setOperationStatus(WS_AGENT_BOOTING.getValue(), IN_PROGRESS); checkHttpConnection(); } @@ -91,8 +89,8 @@ public class WsAgentStateController implements ConnectionOpenedHandler, Connecti @Override public void onClose(WebSocketClosedEvent event) { Log.info(getClass(), "Test WS connection closed with code " + event.getCode() + " reason: " + event.getReason()); - if (state.equals(STARTED)) { - state = STOPPED; + if (state.equals(WsAgentState.STARTED)) { + state = WsAgentState.STOPPED; eventBus.fireEvent(WsAgentStateEvent.createWsAgentStoppedEvent()); } } @@ -100,8 +98,8 @@ public class WsAgentStateController implements ConnectionOpenedHandler, Connecti @Override public void onError() { Log.info(getClass(), "Test WS connection error"); - if (state.equals(STARTED)) { - state = STOPPED; + if (state.equals(WsAgentState.STARTED)) { + state = WsAgentState.STOPPED; eventBus.fireEvent(WsAgentStateEvent.createWsAgentStoppedEvent()); } } @@ -125,7 +123,7 @@ public class WsAgentStateController implements ConnectionOpenedHandler, Connecti } private void started() { - state = STARTED; + state = WsAgentState.STARTED; initialLoadingInfo.setOperationStatus(WS_AGENT_BOOTING.getValue(), SUCCESS); loader.hide(); diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/DevMachineStateEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/DevMachineStateEvent.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/DevMachineStateEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/DevMachineStateEvent.java index dcbb1a54ed..6e84c0c47f 100755 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/DevMachineStateEvent.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/DevMachineStateEvent.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client.events; +package org.eclipse.che.ide.api.machine.events; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateEvent.java similarity index 94% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateEvent.java index 9b4e3961eb..10bec6dbdb 100755 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateEvent.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateEvent.java @@ -8,11 +8,11 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client.events; +package org.eclipse.che.ide.api.machine.events; import com.google.gwt.event.shared.GwtEvent; -import org.eclipse.che.api.machine.gwt.client.WsAgentState; +import org.eclipse.che.ide.api.machine.WsAgentState; /** * Event that describes the fact that ws-agent state has been changed. diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateHandler.java similarity index 95% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateHandler.java index 0e364c92b2..0fe37b68dc 100755 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.machine.gwt.client.events; +package org.eclipse.che.ide.api.machine.events; import com.google.gwt.event.shared.EventHandler; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClient.java similarity index 88% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClient.java index 5292107552..820412c85d 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClient.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.project.shared.dto.ProjectImporterData; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClientImpl.java similarity index 93% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClientImpl.java index ef7f5975e9..180375f069 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClientImpl.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.project.shared.dto.ProjectImporterData; import org.eclipse.che.ide.MimeType; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClient.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClient.java index 4bcc704752..f64a4d2bcb 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClient.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.project.shared.dto.SourceEstimation; import org.eclipse.che.api.project.shared.dto.TreeElement; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClientImpl.java index 93ce7c84d5..cbe1206d7d 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClientImpl.java @@ -8,13 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.WsAgentStateController; import org.eclipse.che.api.project.shared.dto.CopyOptions; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.project.shared.dto.MoveOptions; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClient.java similarity index 96% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClient.java index 0be8757147..b8131e00d8 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; import org.eclipse.che.api.project.templates.shared.dto.ProjectTemplateDescriptor; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java index 1747d315ba..8d0882c677 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; import com.google.inject.Inject; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClient.java similarity index 93% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClient.java index 4882905878..0f59736203 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClient.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.project.shared.dto.ProjectTypeDto; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClientImpl.java similarity index 94% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClientImpl.java index 49b55aaa88..4f7c2420cd 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClientImpl.java @@ -8,18 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.project.shared.dto.ProjectTypeDto; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; -import org.eclipse.che.api.promises.client.Operation; -import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper.RequestCall; import org.eclipse.che.ide.rest.AsyncRequestFactory; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/QueryExpression.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/QueryExpression.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/QueryExpression.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/QueryExpression.java index 1545d876bb..739b50ad0c 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/QueryExpression.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/QueryExpression.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.project.gwt.client; +package org.eclipse.che.ide.api.project; /** @author Artem Zatsarynnyi */ public class QueryExpression { diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FileNode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FileNode.java index 53882ef304..224b0f07b7 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FileNode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FileNode.java @@ -16,8 +16,7 @@ import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.rest.shared.dto.Link; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FolderNode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FolderNode.java index 24f887f515..ad26f39ee5 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FolderNode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FolderNode.java @@ -15,7 +15,7 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructure.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructure.java index ef79ab0e8b..59aa24bad5 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructure.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructure.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.api.project.tree.generic; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureProvider.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureProvider.java index 3fe4b0496c..55d7e77d4c 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureProvider.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureProvider.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.api.project.tree.generic; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.project.tree.TreeStructureProvider; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ItemNode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ItemNode.java index c7a2fb346d..f7e0a8b33f 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ItemNode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ItemNode.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.api.project.tree.generic; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.event.RenameNodeEvent; diff --git a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ProjectNode.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ProjectNode.java index 800c7d43fb..a4ea7f3e77 100644 --- a/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ProjectNode.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ProjectNode.java @@ -15,7 +15,7 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.commons.annotation.Nullable; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClient.java similarity index 96% rename from core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClient.java index b442cc36dd..7e3f21912f 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.ssh.gwt.client; +package org.eclipse.che.ide.api.ssh; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java index 0b054898b4..9bdc860841 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.ssh.gwt.client; +package org.eclipse.che.ide.api.ssh; import com.google.inject.Inject; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClient.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClient.java index 678c027166..f1bbad020b 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.user.gwt.client; +package org.eclipse.che.ide.api.user; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClientImpl.java index a7b147e5c2..c6d7b6d19b 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.user.gwt.client; +package org.eclipse.che.ide.api.user; import com.google.inject.Inject; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClient.java similarity index 97% rename from core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClient.java index 57cacf8dad..5d84a46e81 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClient.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.user.gwt.client; +package org.eclipse.che.ide.api.user; import org.eclipse.che.api.user.shared.dto.UserDescriptor; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClientImpl.java index 7d556a7a31..804b094055 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.user.gwt.client; +package org.eclipse.che.ide.api.user; import com.google.inject.Inject; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClient.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClient.java similarity index 98% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClient.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClient.java index e34a938986..bc1db9f23a 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClient.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClient.java @@ -8,14 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client; +package org.eclipse.che.ide.api.workspace; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.SnapshotDto; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.workspace.server.WorkspaceService; import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClientImpl.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClientImpl.java similarity index 99% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClientImpl.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClientImpl.java index 85e00d5ccb..9ae781b280 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClientImpl.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClientImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client; +package org.eclipse.che.ide.api.workspace; import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedEvent.java similarity index 96% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedEvent.java index 605daaa817..1970067c91 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedEvent.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedEvent.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client.event; +package org.eclipse.che.ide.api.workspace.event; import com.google.gwt.event.shared.GwtEvent; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedHandler.java similarity index 94% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedHandler.java index 5d3c53b961..333f7aea66 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client.event; +package org.eclipse.che.ide.api.workspace.event; import com.google.gwt.event.shared.EventHandler; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedEvent.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedEvent.java similarity index 95% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedEvent.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedEvent.java index 7f094cf0b7..ff9caffbf3 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedEvent.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedEvent.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client.event; +package org.eclipse.che.ide.api.workspace.event; import com.google.gwt.event.shared.GwtEvent; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedHandler.java b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedHandler.java similarity index 94% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedHandler.java rename to core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedHandler.java index 52a1bb39d9..9304599bc8 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedHandler.java +++ b/core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.gwt.client.event; +package org.eclipse.che.ide.api.workspace.event; import com.google.gwt.event.shared.EventHandler; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources/org/eclipse/che/api/Auth.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/auth/Auth.gwt.xml similarity index 87% rename from core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources/org/eclipse/che/api/Auth.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/auth/Auth.gwt.xml index 089213de53..c2eeea513f 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources/org/eclipse/che/api/Auth.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/auth/Auth.gwt.xml @@ -15,7 +15,5 @@ - - - + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources/org/eclipse/che/api/Core.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml similarity index 77% rename from core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources/org/eclipse/che/api/Core.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml index 26bd1312b0..abd9d8f96a 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources/org/eclipse/che/api/Core.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml @@ -15,9 +15,8 @@ - - - - - + + + + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources/org/eclipse/che/api/Factory.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/factory/Factory.gwt.xml similarity index 89% rename from core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources/org/eclipse/che/api/Factory.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/factory/Factory.gwt.xml index 7a824cb8a6..3d98f2401f 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources/org/eclipse/che/api/Factory.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/factory/Factory.gwt.xml @@ -15,6 +15,5 @@ - - - \ No newline at end of file + + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources/org/eclipse/che/api/Git.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml similarity index 87% rename from core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources/org/eclipse/che/api/Git.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml index e40d95020b..fa0a165baf 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources/org/eclipse/che/api/Git.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml @@ -16,8 +16,7 @@ - + - - + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources/org/eclipse/che/api/Machine.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/machine/Machine.gwt.xml similarity index 92% rename from core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources/org/eclipse/che/api/Machine.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/machine/Machine.gwt.xml index 626d1188f6..df5e421e31 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources/org/eclipse/che/api/Machine.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/machine/Machine.gwt.xml @@ -18,6 +18,5 @@ - - + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources/org/eclipse/che/api/Project.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/project/Project.gwt.xml similarity index 77% rename from core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources/org/eclipse/che/api/Project.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/project/Project.gwt.xml index ad2ff54e3d..681636c342 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources/org/eclipse/che/api/Project.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/project/Project.gwt.xml @@ -16,10 +16,9 @@ - - - - - + + + + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources/org/eclipse/che/api/Ssh.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/ssh/Ssh.gwt.xml similarity index 91% rename from core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources/org/eclipse/che/api/Ssh.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/ssh/Ssh.gwt.xml index cbb4518958..7bb741acbd 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources/org/eclipse/che/api/Ssh.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/ssh/Ssh.gwt.xml @@ -16,6 +16,6 @@ - - + + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources/org/eclipse/che/api/User.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/user/User.gwt.xml similarity index 91% rename from core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources/org/eclipse/che/api/User.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/user/User.gwt.xml index 787ab246d1..c2eeea513f 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources/org/eclipse/che/api/User.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/user/User.gwt.xml @@ -15,6 +15,5 @@ - - + diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources/org/eclipse/che/api/Workspace.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/workspace/Workspace.gwt.xml similarity index 87% rename from core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources/org/eclipse/che/api/Workspace.gwt.xml rename to core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/workspace/Workspace.gwt.xml index e42c351afd..9f73b18884 100644 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources/org/eclipse/che/api/Workspace.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/workspace/Workspace.gwt.xml @@ -16,6 +16,6 @@ - - + + diff --git a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml index 5da1851a41..4b92809cfe 100644 --- a/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml +++ b/core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml @@ -21,10 +21,6 @@ - - - - diff --git a/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/BaseNodeTest.java b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/BaseNodeTest.java index 0c0790391a..5a86f6bc9c 100644 --- a/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/BaseNodeTest.java +++ b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/BaseNodeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.api.project.tree.generic; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.ide.api.project.tree.TreeSettings; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import com.google.web.bindery.event.shared.EventBus; diff --git a/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureTest.java b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureTest.java index e201f1d325..4d3f71e5f2 100644 --- a/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureTest.java +++ b/core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.api.project.tree.generic; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-app/pom.xml b/core/ide/che-core-ide-app/pom.xml index 84b0913333..4a3945bb32 100644 --- a/core/ide/che-core-ide-app/pom.xml +++ b/core/ide/che-core-ide-app/pom.xml @@ -91,42 +91,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-auth - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-client-gwt-factory - - - org.eclipse.che.core - che-core-client-gwt-git - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - - - org.eclipse.che.core - che-core-client-gwt-ssh - - - org.eclipse.che.core - che-core-client-gwt-user - - - org.eclipse.che.core - che-core-client-gwt-workspace - org.eclipse.che.core che-core-commons-annotations diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java index dd1deba096..b299ff6260 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java @@ -17,7 +17,7 @@ import com.google.gwt.core.client.Callback; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java index 6553b1179e..cc4d3e84bb 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.actions; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.Resources; import org.eclipse.che.ide.api.action.Action; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopMachineAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopMachineAction.java index 774a714663..fa1cb18552 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopMachineAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopMachineAction.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.actions; import com.google.inject.Inject; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.Action; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopWorkspaceAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopWorkspaceAction.java index 5d6b1af117..020c21ab3e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopWorkspaceAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopWorkspaceAction.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.actions; import com.google.inject.Inject; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java index c717b18589..b832251e99 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java @@ -16,7 +16,7 @@ import com.google.inject.Singleton; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/BootstrapController.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/BootstrapController.java index 7decbb6bd5..8723857efc 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/BootstrapController.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/BootstrapController.java @@ -25,15 +25,15 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.WsAgentStateController; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedHandler; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedHandler; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.component.Component; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/connection/WsConnectionListener.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/connection/WsConnectionListener.java index d7b75027b8..8142dc1885 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/connection/WsConnectionListener.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/connection/WsConnectionListener.java @@ -13,8 +13,8 @@ package org.eclipse.che.ide.connection; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedHandler; import org.eclipse.che.ide.api.ConnectionClosedInformer; import org.eclipse.che.ide.api.event.HttpSessionDestroyedEvent; import org.eclipse.che.ide.util.loging.Log; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java index 9e5eba9d06..d80106ce89 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java @@ -15,9 +15,9 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.factory.shared.dto.Factory; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java index 062b420851..2c32d89b09 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java @@ -21,32 +21,32 @@ import com.google.inject.name.Named; import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.SimpleEventBus; -import org.eclipse.che.api.auth.client.OAuthServiceClient; -import org.eclipse.che.api.auth.client.OAuthServiceClientImpl; -import org.eclipse.che.api.factory.gwt.client.FactoryServiceClient; -import org.eclipse.che.api.factory.gwt.client.FactoryServiceClientImpl; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; -import org.eclipse.che.api.git.gwt.client.GitServiceClientImpl; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClientImpl; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClientImpl; -import org.eclipse.che.api.project.gwt.client.ProjectImportersServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectImportersServiceClientImpl; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClientImpl; -import org.eclipse.che.api.project.gwt.client.ProjectTemplateServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectTemplateServiceClientImpl; -import org.eclipse.che.api.project.gwt.client.ProjectTypeServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectTypeServiceClientImpl; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClientImpl; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClientImpl; -import org.eclipse.che.api.user.gwt.client.UserServiceClient; -import org.eclipse.che.api.user.gwt.client.UserServiceClientImpl; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClientImpl; +import org.eclipse.che.ide.api.auth.OAuthServiceClient; +import org.eclipse.che.ide.api.auth.OAuthServiceClientImpl; +import org.eclipse.che.ide.api.factory.FactoryServiceClient; +import org.eclipse.che.ide.api.factory.FactoryServiceClientImpl; +import org.eclipse.che.ide.api.git.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClientImpl; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClientImpl; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClientImpl; +import org.eclipse.che.ide.api.project.ProjectImportersServiceClient; +import org.eclipse.che.ide.api.project.ProjectImportersServiceClientImpl; +import org.eclipse.che.ide.api.project.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClientImpl; +import org.eclipse.che.ide.api.project.ProjectTemplateServiceClient; +import org.eclipse.che.ide.api.project.ProjectTemplateServiceClientImpl; +import org.eclipse.che.ide.api.project.ProjectTypeServiceClient; +import org.eclipse.che.ide.api.project.ProjectTypeServiceClientImpl; +import org.eclipse.che.ide.api.ssh.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClientImpl; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClientImpl; +import org.eclipse.che.ide.api.user.UserServiceClient; +import org.eclipse.che.ide.api.user.UserServiceClientImpl; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClientImpl; import org.eclipse.che.ide.Resources; import org.eclipse.che.ide.actions.ActionManagerImpl; import org.eclipse.che.ide.actions.find.FindActionView; @@ -191,9 +191,9 @@ import org.eclipse.che.ide.ui.dialogs.message.MessageDialogFooter; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogPresenter; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogView; import org.eclipse.che.ide.ui.dialogs.message.MessageDialogViewImpl; -import org.eclipse.che.ide.ui.dropdown.DropDownListFactory; import org.eclipse.che.ide.ui.dropdown.DropDownWidget; import org.eclipse.che.ide.ui.dropdown.DropDownWidgetImpl; +import org.eclipse.che.ide.ui.dropdown.DropDownListFactory; import org.eclipse.che.ide.ui.loaders.initialization.LoaderView; import org.eclipse.che.ide.ui.loaders.initialization.LoaderViewImpl; import org.eclipse.che.ide.ui.loaders.request.LoaderFactory; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/ProfileComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/ProfileComponent.java index a35ae9370f..c37127aff5 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/ProfileComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/ProfileComponent.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.core; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; import org.eclipse.che.ide.api.app.CurrentUser; import org.eclipse.che.ide.api.component.Component; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java index a6446a9d14..04168906cb 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java @@ -15,9 +15,9 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.commons.annotation.Nullable; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java index d83c6ada7c..a509786f61 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.ide.api.event.EditorSettingsChangedEvent; import org.eclipse.che.ide.editor.preferences.EditorPreferenceSection; import org.eclipse.che.ide.editor.preferences.editorproperties.sections.EditorPreferenceSectionFactory; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/navigation/NavigateToFilePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/navigation/NavigateToFilePresenter.java index 0698d2c87d..880a19ea3d 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/navigation/NavigateToFilePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/navigation/NavigateToFilePresenter.java @@ -17,8 +17,8 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java index daaf700b8b..77e184d2ed 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.newresource; import com.google.inject.Inject; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectConfigEnforcer.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectConfigEnforcer.java index 48be9bf229..1608efb739 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectConfigEnforcer.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectConfigEnforcer.java @@ -14,7 +14,7 @@ import com.google.common.base.Predicate; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java index 13aab18d62..9fd7351abe 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java @@ -21,9 +21,9 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.Constants; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Operation; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java index baf03ca884..9edb9b4596 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.Constants; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.ProjectProblemDto; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesManagerImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesManagerImpl.java index ad6ee90d41..5c73c8ee24 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesManagerImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesManagerImpl.java @@ -17,7 +17,7 @@ import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.js.Promises; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.preferences.PreferencesManager; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/NodeManager.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/NodeManager.java index dd1c7e1246..0679548b27 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/NodeManager.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/NodeManager.java @@ -18,7 +18,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.project.ProjectConfig; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/AbstractResourceProcessor.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/AbstractResourceProcessor.java index 9916c5a226..196ec6bdf3 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/AbstractResourceProcessor.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/AbstractResourceProcessor.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.project.node.resource; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ItemReferenceProcessor.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ItemReferenceProcessor.java index 4f1c2ebd48..b32f5734e3 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ItemReferenceProcessor.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ItemReferenceProcessor.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ModuleConfigProcessor.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ModuleConfigProcessor.java index c1cf7756bf..f171968aa2 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ModuleConfigProcessor.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ModuleConfigProcessor.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper; import org.eclipse.che.api.promises.client.js.JsPromiseError; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ProjectConfigProcessor.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ProjectConfigProcessor.java index 464c411078..5bdfc4ced6 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ProjectConfigProcessor.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ProjectConfigProcessor.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Operation; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenter.java index 368b9b9277..da283a0f4b 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.FormPanel; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java index cb2caf353c..59ecff44f7 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java @@ -16,7 +16,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectNotificationSubscriberImpl.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectNotificationSubscriberImpl.java index d9096a5963..c98a517d6b 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectNotificationSubscriberImpl.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectNotificationSubscriberImpl.java @@ -15,7 +15,7 @@ import com.google.gwt.json.client.JSONParser; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.WsAgentStateController; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectResolver.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectResolver.java index 8f2a022316..4411f79c9e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectResolver.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectResolver.java @@ -15,7 +15,7 @@ import com.google.common.base.Predicate; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.Constants; import org.eclipse.che.api.project.shared.dto.ProjectTypeDto; import org.eclipse.che.api.project.shared.dto.SourceEstimation; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdater.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdater.java index f09f20acef..a17a27aef9 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdater.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdater.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java index a3f220443f..eca31ca0d5 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; -import org.eclipse.che.api.project.gwt.client.ProjectImportersServiceClient; +import org.eclipse.che.ide.api.project.ProjectImportersServiceClient; import org.eclipse.che.api.project.shared.dto.ProjectImporterData; import org.eclipse.che.api.project.shared.dto.ProjectImporterDescriptor; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTemplatesComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTemplatesComponent.java index 81a0654d94..1fb1b8ac52 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTemplatesComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTemplatesComponent.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.projecttype; -import org.eclipse.che.api.project.gwt.client.ProjectTemplateServiceClient; +import org.eclipse.che.ide.api.project.ProjectTemplateServiceClient; import org.eclipse.che.api.project.templates.shared.dto.ProjectTemplateDescriptor; import org.eclipse.che.ide.api.project.type.ProjectTemplateRegistry; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTypeComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTypeComponent.java index 02a2a20141..c81a975530 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTypeComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTypeComponent.java @@ -14,8 +14,7 @@ import com.google.gwt.core.client.Callback; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectTypeServiceClient; +import org.eclipse.che.ide.api.project.ProjectTypeServiceClient; import org.eclipse.che.api.project.shared.dto.ProjectTypeDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java index 281cd70052..f99ccc0939 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.Constants; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.CoreLocalizationConstant; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/search/FullTextSearchPresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/search/FullTextSearchPresenter.java index 2fcc050921..fa7bf0e094 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/search/FullTextSearchPresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/search/FullTextSearchPresenter.java @@ -14,8 +14,8 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; -import org.eclipse.che.api.project.gwt.client.QueryExpression; +import org.eclipse.che.ide.api.project.ProjectServiceClient; +import org.eclipse.che.ide.api.project.QueryExpression; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java index 5cbecb9c6a..2300fb6c7e 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java @@ -15,13 +15,13 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedHandler; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.action.ActionManager; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java index 72933b9635..28350099d3 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java @@ -17,11 +17,11 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.actions.WorkspaceSnapshotCreator; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java index 1ac99b8a8d..6adc514ce8 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java @@ -17,14 +17,14 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.workspace.WorkspaceStatus; -import org.eclipse.che.api.factory.gwt.client.FactoryServiceClient; +import org.eclipse.che.ide.api.factory.FactoryServiceClient; import org.eclipse.che.api.factory.shared.dto.Factory; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.actions.WorkspaceSnapshotCreator; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java index 7555bdca3a..8de1df49d4 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java @@ -16,18 +16,18 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.workspace.WorkspaceStatus; -import org.eclipse.che.api.machine.gwt.client.MachineManager; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.MachineManager; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.SnapshotDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.api.workspace.shared.dto.event.WorkspaceStatusEvent; diff --git a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenter.java b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenter.java index a47df7aa94..4fba94b00c 100644 --- a/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenter.java +++ b/core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenter.java @@ -17,7 +17,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.LimitsDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineSourceDto; @@ -26,7 +26,7 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; diff --git a/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml b/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml index d2ec1819c2..f5f3cebbd9 100644 --- a/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml +++ b/core/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml @@ -19,11 +19,13 @@ - - - - + + + + + + @@ -33,6 +35,5 @@ - - + diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/StopWorkspaceActionTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/StopWorkspaceActionTest.java index 1a4c9a761f..09519e9326 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/StopWorkspaceActionTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/StopWorkspaceActionTest.java @@ -14,7 +14,7 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.ActionEvent; @@ -86,4 +86,4 @@ public class StopWorkspaceActionTest { verify(workspaceService).stop("id"); verify(workspace).getId(); } -} \ No newline at end of file +} diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreatorTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreatorTest.java index b34ba8279c..ae1485d7bd 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreatorTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreatorTest.java @@ -16,7 +16,7 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/EditorAgentImplTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/EditorAgentImplTest.java index 8a3f7d3628..931bd87fa4 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/EditorAgentImplTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/EditorAgentImplTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.editor; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java index 09590c3fa9..fdfe957e73 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.navigation; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java index fa46bd41a8..eb37189b3e 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListenerTest.java @@ -13,8 +13,8 @@ package org.eclipse.che.ide.part.explorer.project.synchronize; import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.Constants; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.ProjectProblemDto; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/node/NodeManagerTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/node/NodeManagerTest.java index 40077795e2..90c8ccd08b 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/node/NodeManagerTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/node/NodeManagerTest.java @@ -14,15 +14,14 @@ import com.google.common.collect.Sets; import com.google.web.bindery.event.shared.Event; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; -import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.project.node.Node; import org.eclipse.che.ide.api.project.node.settings.NodeSettings; @@ -46,8 +45,6 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java index b0a103a087..686545f91f 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenterTest.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.ui.FormPanel; import com.google.web.bindery.event.shared.Event; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java index 93e7f7c6ef..c01a564b9e 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java @@ -13,8 +13,8 @@ package org.eclipse.che.ide.projectimport.wizard; import com.google.gwt.event.shared.EventBus; import com.google.web.bindery.event.shared.Event; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdaterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdaterTest.java index 3c3641a9b1..63bc031beb 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdaterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdaterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.projectimport.wizard; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java index 1fc7b4f88f..6dddf64028 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java @@ -14,8 +14,8 @@ import com.google.web.bindery.event.shared.Event; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.SourceStorageDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java index 24700fa055..9d558906b5 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java @@ -13,9 +13,9 @@ package org.eclipse.che.ide.search; import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; -import org.eclipse.che.api.project.gwt.client.QueryExpression; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; +import org.eclipse.che.ide.api.project.QueryExpression; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; @@ -40,7 +40,6 @@ import java.util.List; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java index 8f48265308..691135bf72 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java @@ -14,9 +14,9 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.inject.Provider; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; diff --git a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenterTest.java b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenterTest.java index 03db90c21e..61e5ab2f5f 100644 --- a/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenterTest.java +++ b/core/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/create/CreateWorkspacePresenterTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.workspace.create; import com.google.gwt.core.client.Callback; import com.google.inject.Provider; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.LimitsDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; @@ -23,7 +23,7 @@ import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; diff --git a/core/platform-api-client-gwt/che-core-client-gwt-auth/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-auth/pom.xml deleted file mode 100644 index 6eb3c4016f..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-auth/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-auth - jar - Che Core API :: Client GWT :: Auth - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - javax.inject - javax.inject - - - org.eclipse.che.core - che-core-api-auth - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-auth - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - - - org.eclipse.che.api.auth.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.auth.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-core/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-core/pom.xml deleted file mode 100644 index c6d51e9ac2..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-core/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-core - jar - Che Core API :: Client GWT :: Core - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - com.google.gwt - gwt-user - ${com.google.gwt.version} - - - org.eclipse.che.core - che-core-api-core - ${project.version} - - - - - org.eclipse.che.api.core.rest.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.core.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml deleted file mode 100644 index f45dc31c46..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-factory/pom.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-factory - jar - Che Core API :: Client GWT :: Factory - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.guava - guava - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-factory-shared - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-client-gwt-workspace - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/resources - - - src/main/java - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - generate-client-dto - process-sources - - generate - - - - org.eclipse.che.api.factory.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.factory.gwt.client.dto.DtoClientImpls - client - - - - - - org.eclipse.che.core - che-core-api-factory - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-factory - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-workspace - ${project.version} - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml deleted file mode 100644 index 78d3add425..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-git/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-git - jar - Che Core API :: Client GWT :: GIT - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.gwt - gwt-user - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-git-shared - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - org.eclipse.che.core - che-core-ide-api - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-git-shared - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - - - org.eclipse.che.api.git.shared - - ${dto-generator-out-directory} - org.eclipse.che.api.git.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml deleted file mode 100644 index 9a6f89550a..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-machine/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-machine - jar - Che Core API :: Client GWT :: Machine - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.guava - guava - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-machine-shared - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-machine - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - - - org.eclipse.che.api.machine.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.machine.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml deleted file mode 100644 index e4cc3e94f1..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-project/pom.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-project - jar - Che Core API :: Client GWT :: Project - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - javax.inject - javax.inject - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-machine-shared - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-api-project-shared - - - org.eclipse.che.core - che-core-api-project-templates-shared - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-workspace - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-project-shared - ${project.version} - - - org.eclipse.che.core - che-core-api-project-templates-shared - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-workspace - ${project.version} - - - - - org.eclipse.che.api.project.shared.dto - org.eclipse.che.api.project.templates.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.project.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-ssh/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-ssh/pom.xml deleted file mode 100644 index bb9907fd40..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-ssh/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-ssh - jar - Che Core API :: Client GWT :: SSH - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-ssh-shared - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/resources - - - src/main/java - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - generate-client-dto - process-sources - - generate - - - - org.eclipse.che.api.ssh.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.ssh.gwt.client.dto.DtoClientImpls - client - - - - - - org.eclipse.che.core - che-core-api-core - ${project.version} - - - org.eclipse.che.core - che-core-api-ssh-shared - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml deleted file mode 100644 index 2dc494cfc1..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-user/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-user - jar - Che Core API :: Client GWT :: User - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-user-shared - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-user - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - - - org.eclipse.che.api.user.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.user.gwt.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml b/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml deleted file mode 100644 index 71915e59da..0000000000 --- a/core/platform-api-client-gwt/che-core-client-gwt-workspace/pom.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - 4.0.0 - - che-core-client-gwt-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - - che-core-client-gwt-workspace - jar - Che Core API :: Client GWT :: Workspace - - ${project.build.directory}/generated-sources/dto/ - false - - - - com.google.inject - guice - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-dto - - - org.eclipse.che.core - che-core-api-machine-shared - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-client-gwt-core - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - com.google.gwt - gwt-user - provided - - - org.eclipse.che.core - che-core-api-workspace - provided - - - - - - src/main/java - - - src/main/resources - - - ${dto-generator-out-directory} - - - - - org.eclipse.che.core - che-core-api-dto-maven-plugin - ${project.version} - - - process-sources - - generate - - - - - - org.eclipse.che.core - che-core-api-core - ${project.version} - - - org.eclipse.che.core - che-core-api-workspace - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-machine - ${project.version} - - - - - org.eclipse.che.api.workspace.shared.dto - - ${dto-generator-out-directory} - org.eclipse.che.api.workspace.client.dto.DtoClientImpls - client - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - - diff --git a/core/platform-api-client-gwt/pom.xml b/core/platform-api-client-gwt/pom.xml deleted file mode 100644 index f2886b8913..0000000000 --- a/core/platform-api-client-gwt/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - che-core-parent - org.eclipse.che.core - 4.3.0-RC1-SNAPSHOT - ../pom.xml - - che-core-client-gwt-parent - pom - Che Core API :: Client GWT :: Parent - - che-core-client-gwt-core - che-core-client-gwt-auth - che-core-client-gwt-machine - che-core-client-gwt-workspace - che-core-client-gwt-project - che-core-client-gwt-user - che-core-client-gwt-factory - che-core-client-gwt-git - che-core-client-gwt-ssh - - diff --git a/core/pom.xml b/core/pom.xml index 9590f57d20..b2f7d81bf7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -33,7 +33,6 @@ ../wsmaster ../wsagent platform-api - platform-api-client-gwt ide diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml index fa05245236..160df50f8f 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/src/main/resources/org/eclipse/che/plugin/cpp/Cpp.gwt.xml @@ -20,7 +20,7 @@ - + diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml index 2e3af80a48..1498dc2047 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml @@ -50,10 +50,6 @@ org.eclipse.che.core che-core-api-workspace - - org.eclipse.che.core - che-core-client-gwt-machine - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java index 8a1d0f8b26..c8cc568f07 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/ide/ext/debugger/client/debug/AbstractDebugger.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Operation; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java index bbe6327822..d3647b44ce 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/ide/ext/debugger/client/debug/DebuggerTest.java @@ -14,8 +14,8 @@ import com.google.common.collect.ImmutableList; import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/plugins/plugin-docker/che-plugin-docker-ext-client/pom.xml b/plugins/plugin-docker/che-plugin-docker-ext-client/pom.xml index 3ae60923d0..cba5a89c5f 100644 --- a/plugins/plugin-docker/che-plugin-docker-ext-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-ext-client/pom.xml @@ -50,11 +50,6 @@ javax.validation validation-api - - org.eclipse.che.core - che-core-client-gwt-user - ${project.version} - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java b/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java index dfffcec509..1f072a5c89 100644 --- a/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java +++ b/plugins/plugin-docker/che-plugin-docker-ext-client/src/main/java/org/eclipse/che/plugin/docker/ext/client/manage/CredentialsPreferencesPresenter.java @@ -15,7 +15,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; import org.eclipse.che.ide.dto.DtoFactory; diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml index 5ce9f70d4b..13c2ac43e6 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml @@ -50,10 +50,6 @@ org.eclipse.che.core che-core-api-workspace - - org.eclipse.che.core - che-core-client-gwt-machine - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml index 2e1ac6c3cf..d8f3cf59cf 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -65,18 +65,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-git - - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitRepositoryInitializer.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitRepositoryInitializer.java index 49d8d1f1e5..775cb05eb6 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitRepositoryInitializer.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitRepositoryInitializer.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.ext.git.client; import com.google.gwt.user.client.rpc.AsyncCallback; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java index 931aef29f2..1006f1a2b1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.git.client.action; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenter.java index e0334766c2..a5874f6d8e 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.git.client.add; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java index 9d907fbd25..73656a476c 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java @@ -15,10 +15,10 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.CheckoutRequest; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferencePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferencePresenter.java index 76575e2d2a..89ee4192a6 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferencePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferencePresenter.java @@ -14,9 +14,9 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.CheckoutRequest; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.editor.EditorAgent; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java index 5b205bccfc..b789aac018 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenter.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.LogResponse; import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java index 1ee5fd0873..e70ac1de31 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/ComparePresenter.java @@ -14,9 +14,9 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.ShowFileContentResponse; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.event.FileContentUpdateEvent; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java index af903d233e..b03408bc2a 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/branchList/BranchListPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.git.client.compare.branchList; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java index 43c762e95b..98abd23757 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/revisionsList/RevisionListPresenter.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.LogResponse; import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/delete/DeleteRepositoryPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/delete/DeleteRepositoryPresenter.java index e14530b54f..37d2113c7b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/delete/DeleteRepositoryPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/delete/DeleteRepositoryPresenter.java @@ -14,8 +14,8 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java index 546c609aef..e10d53aa32 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenter.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.Remote; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java index 757f22aaab..9908680217 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenter.java @@ -17,7 +17,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.LogResponse; import org.eclipse.che.api.git.shared.Revision; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenter.java index 3dfe4a740f..8173d199be 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenter.java @@ -15,7 +15,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java index 748a9f78e5..5cec515004 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenter.java @@ -15,7 +15,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.MergeResult; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java index 1877280bcb..5f5ccb30fb 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/pull/PullPresenter.java @@ -15,7 +15,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.PullResponse; import org.eclipse.che.api.git.shared.Remote; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java index 7a8e2b87f7..04bbabeaa7 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/push/PushToRemotePresenter.java @@ -15,7 +15,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.PushResponse; import org.eclipse.che.api.git.shared.Remote; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenter.java index b27a8b564c..556f157a21 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenter.java @@ -15,9 +15,9 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Remote; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.event.project.ProjectUpdatedEvent; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenter.java index 52780e8cd9..b690b5fb4e 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.rest.AsyncRequestCallback; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java index 9c8fccf3d9..dd510e0cf9 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java @@ -13,8 +13,7 @@ package org.eclipse.che.ide.ext.git.client.remove; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; -import org.eclipse.che.commons.annotation.Nullable; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; import org.eclipse.che.ide.api.editor.EditorAgent; @@ -22,7 +21,6 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.event.FileEvent; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.project.node.HasStorablePath; -import org.eclipse.che.ide.api.project.node.Node; import org.eclipse.che.ide.api.project.tree.VirtualFile; import org.eclipse.che.ide.api.selection.Selection; import org.eclipse.che.ide.api.selection.SelectionAgent; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java index 78386037e1..738ace6fb9 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/commit/ResetToCommitPresenter.java @@ -15,7 +15,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.ErrorCodes; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.LogResponse; import org.eclipse.che.api.git.shared.ResetRequest; import org.eclipse.che.api.git.shared.Revision; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java index a0fc301152..a82feb3d0c 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenter.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.IndexFile; import org.eclipse.che.api.git.shared.Status; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenter.java index f5243bb02a..19a0a0fca6 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.git.client.status; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/url/ShowProjectGitReadOnlyUrlPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/url/ShowProjectGitReadOnlyUrlPresenter.java index c65d9e7a78..5100f5417a 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/url/ShowProjectGitReadOnlyUrlPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/url/ShowProjectGitReadOnlyUrlPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.git.client.url; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; import org.eclipse.che.api.git.shared.Remote; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml index fa54addc09..b5a9498331 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/Git.gwt.xml @@ -21,7 +21,7 @@ - + diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java index 2b1d3bf428..46c00613fa 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java @@ -12,9 +12,9 @@ package org.eclipse.che.ide.ext.git.client; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.git.gwt.client.GitServiceClient; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.git.GitServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java index eb5f03cc1f..ccafef9ca2 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.ext.git.client.branch; import org.eclipse.che.api.git.shared.Branch; import org.eclipse.che.api.git.shared.CheckoutRequest; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.editor.EditorAgent; import org.eclipse.che.ide.api.editor.EditorInput; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java index 0a2ea30a33..305052f26d 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.ext.git.client.checkout; import org.eclipse.che.api.git.shared.CheckoutRequest; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.ProjectProblemDto; import org.eclipse.che.ide.api.editor.EditorAgent; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenterTest.java index 0498a4840d..5f9307dac9 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/RemotePresenterTest.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.googlecode.gwt.test.utils.GwtReflectionUtils; import org.eclipse.che.api.git.shared.Remote; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.event.project.ProjectUpdatedEvent; import org.eclipse.che.ide.api.notification.StatusNotification; diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml b/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml index ec0f82fd70..3e5777df57 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ssh-client/pom.xml @@ -48,10 +48,6 @@ org.eclipse.che.core che-core-api-user-shared - - org.eclipse.che.core - che-core-client-gwt-ssh - com.google.gwt gwt-user @@ -62,11 +58,6 @@ guice provided - - org.eclipse.che.core - che-core-client-gwt-user - provided - org.eclipse.che.core che-core-commons-gwt diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java b/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java index 144efbb0f6..f28e7644f0 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ssh-client/src/main/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenter.java @@ -18,7 +18,7 @@ import com.google.inject.Singleton; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentUser; diff --git a/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java b/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java index 4d3ef311bd..45bdce554c 100644 --- a/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ssh-client/src/test/java/org/eclipse/che/ide/ext/git/ssh/client/manage/SshKeyManagerPresenterTest.java @@ -20,7 +20,7 @@ import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.api.promises.client.js.JsPromiseError; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index 50c08d949e..c726e44a4b 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -61,14 +61,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-ssh - org.eclipse.che.core che-core-commons-gwt @@ -118,11 +110,6 @@ junit test - - org.eclipse.che.core - che-core-client-gwt-user - test - org.hamcrest hamcrest-core diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java index 8ee4c20bed..98dbd3be6c 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java @@ -19,7 +19,7 @@ import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.api.promises.client.callback.AsyncPromiseHelper; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml b/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml index 7ce7292c28..54de3f4d9c 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml +++ b/plugins/plugin-github/che-plugin-github-ide/src/main/resources/org/eclipse/che/plugin/github/GitHub.gwt.xml @@ -19,12 +19,12 @@ - + - - + + diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java index 8b2e9be42f..630b456e2d 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java @@ -15,7 +15,7 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java index fc5d138e25..2771d51b84 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java @@ -19,7 +19,7 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import org.eclipse.che.api.project.shared.dto.ProjectImporterDescriptor; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.user.gwt.client.UserServiceClient; +import org.eclipse.che.ide.api.user.UserServiceClient; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.SourceStorageDto; diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml index 0b1dec40a5..db9e29e8a2 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -60,11 +60,6 @@ gwt-user provided - - org.eclipse.che.core - che-core-client-gwt-user - provided - ch.qos.logback logback-classic diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java/che-plugin-java-debugger-ide/pom.xml index 71f4bbf490..c14f103c52 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/pom.xml @@ -50,10 +50,6 @@ org.eclipse.che.core che-core-api-workspace - - org.eclipse.che.core - che-core-client-gwt-machine - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenter.java b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenter.java index f221438264..a200643f44 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenter.java +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/src/main/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/plugins/plugin-java/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenterTest.java b/plugins/plugin-java/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenterTest.java index 2687aa6843..ce386197dd 100644 --- a/plugins/plugin-java/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/ide/ext/java/jdi/client/configuration/JavaDebugConfigurationPagePresenterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.ext.java.jdi.client.configuration; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.debug.DebugConfiguration; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/AntExtension.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/AntExtension.java index 8116d6feba..ae89d90bee 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/AntExtension.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/AntExtension.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ProjectDescriptor; import org.eclipse.che.ide.api.event.FileEvent; import org.eclipse.che.ide.api.event.FileEventHandler; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntFolderNode.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntFolderNode.java index 642e9daf6f..bec597e0da 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntFolderNode.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntFolderNode.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client.projecttree; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.ide.api.project.tree.AbstractTreeNode; import org.eclipse.che.ide.api.project.tree.TreeNode; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectNode.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectNode.java index 17fb845936..ad0d3f2052 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectNode.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectNode.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client.projecttree; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.project.shared.dto.ProjectDescriptor; import org.eclipse.che.ide.api.project.tree.AbstractTreeNode; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructure.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructure.java index 73e39a07f9..04fa1126ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructure.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructure.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client.projecttree; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructureProvider.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructureProvider.java index f51bb8e174..92ea5c6b9a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructureProvider.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/projecttree/AntProjectTreeStructureProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client.projecttree; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.icon.IconRegistry; import org.eclipse.che.ide.api.project.tree.TreeStructure; diff --git a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/wizard/AntPagePresenter.java b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/wizard/AntPagePresenter.java index 1eccf8d9c8..08d740990a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/wizard/AntPagePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-ant/src/main/java/org/eclipse/che/ide/extension/ant/client/wizard/AntPagePresenter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.ant.client.wizard; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.client.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ImportProject; import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardMode; import org.eclipse.che.ide.api.wizard.AbstractWizardPage; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml index d894bb116d..53b2406f91 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml @@ -62,14 +62,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java index fb9a20e09d..d9cc5cba0a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.java.client.dependenciesupdater; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; +import org.eclipse.che.ide.api.machine.WsAgentStateController; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/LogsOutputHandler.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/LogsOutputHandler.java index 087bf8b5c9..4e7e04e8b1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/LogsOutputHandler.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/LogsOutputHandler.java @@ -15,8 +15,8 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.ide.ext.java.client.event.DependencyUpdatedEvent; import org.eclipse.che.ide.ext.java.client.event.DependencyUpdatedEventHandler; import org.eclipse.che.ide.extension.machine.client.outputspanel.OutputsContainerPresenter; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java index 899e9dfa33..a829a4e391 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/newsourcefile/NewJavaSourceFilePresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java index 399e645122..61f5da5516 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.java.client.organizeimports; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolver.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolver.java index 6add0331f9..37c41a7d0a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolver.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolver.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java index 656c74bd26..60852c2b58 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaItemReferenceProcessor.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.ext.java.client.project.node; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.js.Promises; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaNodeManager.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaNodeManager.java index 91d85a1ba9..ed7c3240da 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaNodeManager.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/node/JavaNodeManager.java @@ -15,7 +15,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java index 470fbc5b9b..d2aa85920f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenter.java @@ -16,8 +16,8 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml index f491010084..08828fba34 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/resources/org/eclipse/che/ide/ext/java/Java.gwt.xml @@ -20,7 +20,7 @@ - + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java index ca2529a14e..db5a4b6484 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.ext.java.client.organizeimports; import com.google.gwtmockito.GwtMockitoTestRunner; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; @@ -229,4 +229,4 @@ public class OrganizeImportsPresenterTest { verify(view).hide(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolverTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolverTest.java index 59d198fb66..6e160fd959 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolverTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/project/classpath/ClasspathResolverTest.java @@ -14,8 +14,8 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.web.bindery.event.shared.Event; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java index 145817b694..f01d0e1ba3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Provider; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml index 507aa6e19a..86d02ca645 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/org/eclipse/che/ide/ext/java/JavaTest.gwt.xml @@ -21,7 +21,7 @@ - + diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml index 0b8f0b2f21..babe61ca53 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml @@ -38,10 +38,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - org.eclipse.che.core che-core-commons-gwt diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml index 381115c300..189816b480 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/resources/org/eclipse/che/plugin/java/plain/PlainJava.gwt.xml @@ -19,7 +19,7 @@ - + diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml index 97a0bb16be..00c1d850fe 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/pom.xml @@ -73,22 +73,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - - - org.eclipse.che.core - che-core-client-gwt-user - - - org.eclipse.che.core - che-core-client-gwt-workspace - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java index 76ba2896bf..966e698728 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java @@ -15,8 +15,8 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.ide.actions.StopMachineAction; import org.eclipse.che.ide.actions.StopWorkspaceAction; import org.eclipse.che.ide.api.action.ActionManager; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineAction.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineAction.java index 82ac339504..095e31f974 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineAction.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineAction.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.extension.machine.client.actions; import com.google.inject.Inject; import org.eclipse.che.api.core.model.machine.Machine; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineAction.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineAction.java index 4cdb25b1f0..e72b201217 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineAction.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineAction.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.extension.machine.client.actions; import com.google.inject.Inject; import org.eclipse.che.api.core.model.machine.Machine; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/SelectCommandComboBox.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/SelectCommandComboBox.java index 4a25a4fe11..c006883de3 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/SelectCommandComboBox.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/SelectCommandComboBox.java @@ -17,9 +17,9 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.machine.Machine; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; @@ -27,7 +27,7 @@ import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.FunctionException; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/CommandManager.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/CommandManager.java index bc57a76c0a..771d7cd345 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/CommandManager.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/CommandManager.java @@ -14,7 +14,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.core.model.machine.Machine; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.promises.client.Function; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java index 98ad1deb46..60b3e6ddb5 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenter.java @@ -21,7 +21,7 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/CurrentProjectPathProvider.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/CurrentProjectPathProvider.java index 77bf5dbd52..ef34dba122 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/CurrentProjectPathProvider.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/CurrentProjectPathProvider.java @@ -14,8 +14,8 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/DevMachineHostNameProvider.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/DevMachineHostNameProvider.java index 78fadc09a0..1361228fc2 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/DevMachineHostNameProvider.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/DevMachineHostNameProvider.java @@ -14,8 +14,8 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/ServerPortProvider.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/ServerPortProvider.java index 9b7e391b26..2c966c9e3d 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/ServerPortProvider.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/command/valueproviders/ServerPortProvider.java @@ -15,9 +15,9 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.ServerDto; import org.eclipse.che.api.promises.client.Operation; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/inject/MachineGinModule.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/inject/MachineGinModule.java index 3fa9d53dc2..8eca31bb45 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/inject/MachineGinModule.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/inject/MachineGinModule.java @@ -17,7 +17,7 @@ import com.google.gwt.inject.client.multibindings.GinMultibinder; import com.google.inject.Singleton; import com.google.inject.name.Names; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.machine.shared.Constants; import org.eclipse.che.ide.api.extension.ExtensionGinModule; import org.eclipse.che.ide.api.outputconsole.OutputConsole; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineManagerImpl.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineManagerImpl.java index 047deab094..b7ad60fa93 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineManagerImpl.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineManagerImpl.java @@ -15,12 +15,12 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.rest.shared.dto.LinkParameter; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.MachineManager; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.OutputMessageUnmarshaller; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; -import org.eclipse.che.api.machine.gwt.client.events.DevMachineStateEvent; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.MachineManager; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.OutputMessageUnmarshaller; +import org.eclipse.che.ide.api.machine.WsAgentStateController; +import org.eclipse.che.ide.api.machine.events.DevMachineStateEvent; import org.eclipse.che.api.machine.shared.dto.LimitsDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; @@ -29,9 +29,9 @@ import org.eclipse.che.api.machine.shared.dto.event.MachineStatusEvent; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedHandler; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedHandler; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.parts.PerspectiveManager; import org.eclipse.che.ide.dto.DtoFactory; @@ -47,9 +47,9 @@ import org.eclipse.che.ide.websocket.WebSocketException; import org.eclipse.che.ide.websocket.rest.SubscriptionHandler; import org.eclipse.che.ide.websocket.rest.Unmarshallable; -import static org.eclipse.che.api.machine.gwt.client.MachineManager.MachineOperationType.DESTROY; -import static org.eclipse.che.api.machine.gwt.client.MachineManager.MachineOperationType.RESTART; -import static org.eclipse.che.api.machine.gwt.client.MachineManager.MachineOperationType.START; +import static org.eclipse.che.ide.api.machine.MachineManager.MachineOperationType.DESTROY; +import static org.eclipse.che.ide.api.machine.MachineManager.MachineOperationType.RESTART; +import static org.eclipse.che.ide.api.machine.MachineManager.MachineOperationType.START; import static org.eclipse.che.api.machine.shared.Constants.LINK_REL_GET_MACHINE_LOGS_CHANNEL; import static org.eclipse.che.api.machine.shared.Constants.LINK_REL_GET_MACHINE_STATUS_CHANNEL; import static org.eclipse.che.ide.extension.machine.client.perspective.OperationsPerspective.OPERATIONS_PERSPECTIVE_ID; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStatusNotifier.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStatusNotifier.java index db46d24f8d..23113bf1df 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStatusNotifier.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStatusNotifier.java @@ -16,8 +16,8 @@ import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.machine.Machine; import org.eclipse.che.api.machine.shared.dto.event.MachineStatusEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedHandler; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; @@ -33,8 +33,8 @@ import org.eclipse.che.ide.websocket.rest.Unmarshallable; import javax.validation.constraints.NotNull; -import static org.eclipse.che.api.machine.gwt.client.MachineManager.MachineOperationType; -import static org.eclipse.che.api.machine.gwt.client.MachineManager.MachineOperationType.RESTART; +import static org.eclipse.che.ide.api.machine.MachineManager.MachineOperationType; +import static org.eclipse.che.ide.api.machine.MachineManager.MachineOperationType.RESTART; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.PROGRESS; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenter.java index 6a7139a200..1276703359 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenter.java @@ -14,9 +14,9 @@ import com.google.gwt.regexp.shared.RegExp; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.MachineManager; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.MachineManager; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; import org.eclipse.che.api.promises.client.Operation; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/CommandOutputConsolePresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/CommandOutputConsolePresenter.java index 7fb3a7ae51..d1b8fd552a 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/CommandOutputConsolePresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/outputspanel/console/CommandOutputConsolePresenter.java @@ -15,8 +15,8 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.OutputMessageUnmarshaller; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.OutputMessageUnmarshaller; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.machine.shared.dto.event.MachineProcessEvent; import org.eclipse.che.api.promises.client.Operation; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenter.java index 8e3bcb9449..c4f1934c05 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenter.java @@ -15,7 +15,7 @@ import com.google.gwt.user.client.ui.IsWidget; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenter.java index 810ad78998..287a373223 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenter.java @@ -17,9 +17,9 @@ import com.google.inject.Inject; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.extension.machine.client.machine.Machine; import org.eclipse.che.ide.extension.machine.client.perspective.widgets.tab.content.TabPresenter; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenter.java index d8d5f5a4bf..9c19638995 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenter.java @@ -17,16 +17,16 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.machine.MachineStatus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedHandler; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedHandler; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.event.ActivePartChangedEvent; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenter.java index dee3a0c7e2..5a30c11a69 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenter.java @@ -16,7 +16,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.recipe.NewRecipe; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeUpdate; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java index 6cd2c40808..ac186868dd 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenter.java @@ -16,16 +16,16 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.events.DevMachineStateEvent; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.events.DevMachineStateEvent; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedHandler; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.mvp.View; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java index f9a3007bf4..d80226206c 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/targets/TargetsPresenter.java @@ -17,8 +17,8 @@ import com.google.gwt.user.client.Timer; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.LimitsDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; @@ -31,7 +31,7 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources/org/eclipse/che/ide/extension/machine/Machine.gwt.xml b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources/org/eclipse/che/ide/extension/machine/Machine.gwt.xml index 04e11cde16..3553e490c6 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources/org/eclipse/che/ide/extension/machine/Machine.gwt.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/resources/org/eclipse/che/ide/extension/machine/Machine.gwt.xml @@ -19,7 +19,7 @@ - + diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java index 9b25ad8764..d25f93b323 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/DestroyMachineActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.machine.client.actions; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/NewTerminalActionTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/NewTerminalActionTest.java index 5657abdf0a..1f9529e3b8 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/NewTerminalActionTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/NewTerminalActionTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.extension.machine.client.actions; import com.google.gwtmockito.GwtMockitoTestRunner; -import org.eclipse.che.api.machine.gwt.client.DevMachine; +import org.eclipse.che.ide.api.machine.DevMachine; import org.eclipse.che.ide.api.action.ActionEvent; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.parts.WorkspaceAgent; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineActionTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineActionTest.java index b119faca96..ab9ab8c265 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineActionTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/actions/RestartMachineActionTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.extension.machine.client.actions; import com.google.gwtmockito.GwtMockitoTestRunner; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.ide.api.action.ActionEvent; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/CommandManagerTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/CommandManagerTest.java index 533ae06061..af78f13fe5 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/CommandManagerTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/CommandManagerTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.machine.client.command; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java index c6b35756d8..53a68966e4 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/command/edit/EditCommandsPresenterTest.java @@ -14,7 +14,7 @@ import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateNotifierTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateNotifierTest.java index 4cea67db6b..d1a890c070 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateNotifierTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateNotifierTest.java @@ -12,12 +12,12 @@ package org.eclipse.che.ide.extension.machine.client.machine; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.MachineManager; +import org.eclipse.che.ide.api.machine.MachineManager; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.machine.shared.dto.event.MachineStatusEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedHandler; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedHandler; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenterTest.java index 843bb41379..6c72efea4f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/machine/create/CreateMachinePresenterTest.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.che.ide.extension.machine.client.machine.create; -import org.eclipse.che.api.machine.gwt.client.DevMachine; -import org.eclipse.che.api.machine.gwt.client.MachineManager; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.DevMachine; +import org.eclipse.che.ide.api.machine.MachineManager; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineDto; -import org.eclipse.che.api.project.gwt.client.ProjectTypeServiceClient; +import org.eclipse.che.ide.api.project.ProjectTypeServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenterTest.java index a501902fd5..edc186d969 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/processes/ProcessesPresenterTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine import com.google.gwt.user.client.ui.AcceptsOneWidget; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.Promise; @@ -99,4 +99,4 @@ public class ProcessesPresenterTest { verify(view).setVisible(true); } -} \ No newline at end of file +} diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenterTest.java index 2df86863bd..aa4bd503cd 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/appliance/sufficientinfo/MachineInfoPresenterTest.java @@ -13,9 +13,9 @@ package org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine import com.google.gwt.user.client.ui.AcceptsOneWidget; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.user.gwt.client.UserProfileServiceClient; +import org.eclipse.che.ide.api.user.UserProfileServiceClient; import org.eclipse.che.api.user.shared.dto.ProfileDescriptor; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.api.workspace.shared.dto.WorkspaceConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.extension.machine.client.machine.Machine; @@ -187,4 +187,4 @@ public class MachineInfoPresenterTest { verify(view).setVisible(true); } -} \ No newline at end of file +} diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java index f931a706f8..ed63ae118c 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/machine/panel/MachinePanelPresenterTest.java @@ -14,15 +14,15 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.machine.MachineStatus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; +import org.eclipse.che.ide.api.machine.MachineServiceClient; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStartedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStartedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenterTest.java index 57e7447277..3c1362e816 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/RecipePartPresenterTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.ide.extension.machine.client.perspective.widgets.recipe; import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.RecipeServiceClient; +import org.eclipse.che.ide.api.machine.RecipeServiceClient; import org.eclipse.che.api.machine.shared.dto.recipe.NewRecipe; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeDescriptor; import org.eclipse.che.api.machine.shared.dto.recipe.RecipeUpdate; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeFileFactoryTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeFileFactoryTest.java index bcb2bf3a26..bad019a5b6 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeFileFactoryTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/perspective/widgets/recipe/editor/RecipeFileFactoryTest.java @@ -14,7 +14,7 @@ import com.google.inject.Provider; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.rest.shared.dto.Link; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentProject; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java index 51d56d36ec..ef28920480 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/test/java/org/eclipse/che/ide/extension/machine/client/processes/ConsolesPanelPresenterTest.java @@ -16,8 +16,8 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.core.model.machine.MachineStatus; -import org.eclipse.che.api.machine.gwt.client.MachineServiceClient; -import org.eclipse.che.api.machine.gwt.client.events.DevMachineStateEvent; +import org.eclipse.che.ide.api.machine.MachineServiceClient; +import org.eclipse.che.ide.api.machine.events.DevMachineStateEvent; import org.eclipse.che.api.machine.shared.dto.CommandDto; import org.eclipse.che.api.machine.shared.dto.MachineConfigDto; import org.eclipse.che.api.machine.shared.dto.MachineDto; diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index e844375974..12c8e01861 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -40,10 +40,6 @@ org.eclipse.che.core che-core-api-ssh-shared - - org.eclipse.che.core - che-core-client-gwt-ssh - com.google.gwt gwt-user @@ -54,11 +50,6 @@ guice provided - - org.eclipse.che.core - che-core-client-gwt-user - provided - org.eclipse.che.core che-core-commons-gwt diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java index 58b11950b7..00b400f15f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/manage/SshKeyManagerPresenter.java @@ -20,7 +20,7 @@ import com.google.inject.Singleton; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.api.ssh.gwt.client.SshServiceClient; +import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index 7f63477d9d..62ab2c6250 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -60,14 +60,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandler.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandler.java index 59212c65b0..949b28d3ae 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandler.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandler.java @@ -14,10 +14,10 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.gwt.client.WsAgentStateController; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateEvent; -import org.eclipse.che.api.machine.gwt.client.events.WsAgentStateHandler; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.machine.WsAgentStateController; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; +import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java index 96ddee01dd..0d2b855f56 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/module/CreateMavenModulePresenter.java @@ -13,7 +13,7 @@ package org.eclipse.che.plugin.maven.client.module; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.GeneratorDescription; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java index 4128e18a80..f3922c2b70 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/main/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenter.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.SourceEstimation; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml index a9d458bd7d..160df50f8f 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/src/main/resources/org/eclipse/che/plugin/nodejs/NodeJs.gwt.xml @@ -20,9 +20,9 @@ - + - \ No newline at end of file + diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml index fa05245236..160df50f8f 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/src/main/resources/org/eclipse/che/plugin/python/Python.gwt.xml @@ -20,7 +20,7 @@ - + diff --git a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml index 82a0be6ba3..ff7f3fb56c 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-env-local/pom.xml @@ -45,10 +45,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-workspace - org.eclipse.che.core che-core-commons-gwt diff --git a/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheWorkspaceStoppedHandler.java b/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheWorkspaceStoppedHandler.java index f7febfec38..331bd8f63a 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheWorkspaceStoppedHandler.java +++ b/plugins/plugin-sdk/che-plugin-sdk-env-local/src/main/java/org/eclipse/che/env/local/client/CheWorkspaceStoppedHandler.java @@ -15,9 +15,9 @@ import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; -import org.eclipse.che.api.workspace.gwt.client.WorkspaceServiceClient; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedEvent; -import org.eclipse.che.api.workspace.gwt.client.event.WorkspaceStoppedHandler; +import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedEvent; +import org.eclipse.che.ide.api.workspace.event.WorkspaceStoppedHandler; import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto; import org.eclipse.che.ide.api.component.Component; import org.eclipse.che.ide.workspace.start.StartWorkspacePresenter; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml index 2594d5370a..2cff889cbf 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml @@ -54,14 +54,6 @@ org.eclipse.che.core che-core-api-workspace-shared - - org.eclipse.che.core - che-core-client-gwt-machine - - - org.eclipse.che.core - che-core-client-gwt-project - org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredProjectNode.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredProjectNode.java index da55adddad..733a8360d2 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredProjectNode.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredProjectNode.java @@ -14,7 +14,7 @@ import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.commons.annotation.Nullable; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructure.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructure.java index 3e641f6cba..f3ea527405 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructure.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructure.java @@ -12,7 +12,7 @@ package org.eclipse.che.plugin.svn.ide.common.filteredtree; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.api.project.shared.dto.ItemReference; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; import org.eclipse.che.ide.api.app.AppContext; diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructureProvider.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructureProvider.java index b367ff0a54..5a90ffd9eb 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructureProvider.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/main/java/org/eclipse/che/plugin/svn/ide/common/filteredtree/FilteredTreeStructureProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.che.plugin.svn.ide.common.filteredtree; -import org.eclipse.che.api.project.gwt.client.ProjectServiceClient; +import org.eclipse.che.ide.api.project.ProjectServiceClient; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.project.tree.TreeStructure; import org.eclipse.che.ide.api.project.tree.TreeStructureProvider; diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index ec649bdd10..e76235c0d8 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -52,11 +52,6 @@ gin provided - - org.eclipse.che.core - che-core-client-gwt-project - provided - org.eclipse.che.core che-core-commons-gwt diff --git a/pom.xml b/pom.xml index 12ecf6204b..aa70c386fd 100644 --- a/pom.xml +++ b/pom.xml @@ -191,51 +191,6 @@ che-core-api-workspace-shared ${project.version} - - org.eclipse.che.core - che-core-client-gwt-auth - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-core - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-factory - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-git - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-machine - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-project - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-ssh - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-user - ${project.version} - - - org.eclipse.che.core - che-core-client-gwt-workspace - ${project.version} - org.eclipse.che.core che-core-commons-annotations