seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHE-781:Move all platform-api-client-gwt to the che-core-ide-api module 

Signed-off-by: Vitaly Parfonov <vparfonov@codenvy.com>
6.19.x
Vitaly Parfonov 2016-05-12 09:31:10 +03:00
parent 944aaf165c
commit 826353e6ab
248 changed files with 432 additions and 2101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
assembly/assembly-ide-war/pom.xml
View File

@ -56,42 +56,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-factory</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-git</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-machine</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-project</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-ssh</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-user</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-workspace</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-gwt</artifactId>

19
assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml
View File

@ -65,16 +65,15 @@
<inherits name='org.eclipse.che.plugin.nodejs.NodeJs'/>
<inherits name='org.eclipse.che.plugin.docker.client.dto.Dto'/>
<!-- Platform API GWT client dependencies -->
<inherits name='org.eclipse.che.api.Auth'/>
<inherits name='org.eclipse.che.api.Core'/>
<inherits name='org.eclipse.che.api.Machine'/>
<inherits name='org.eclipse.che.api.Git'/>
<inherits name='org.eclipse.che.api.Project'/>
<inherits name='org.eclipse.che.api.User'/>
<inherits name='org.eclipse.che.api.Factory'/>
<inherits name="org.eclipse.che.api.Workspace"/>
<inherits name="org.eclipse.che.api.Ssh"/>
<inherits name='org.eclipse.che.api.core.Core'/>
<inherits name='org.eclipse.che.api.machine.Machine'/>
<inherits name='org.eclipse.che.api.git.Git'/>
<inherits name='org.eclipse.che.api.project.Project'/>
<inherits name='org.eclipse.che.api.user.User'/>
<inherits name='org.eclipse.che.api.auth.Auth'/>
<inherits name='org.eclipse.che.api.factory.Factory'/>
<inherits name="org.eclipse.che.api.workspace.Workspace"/>
<inherits name="org.eclipse.che.api.ssh.Ssh"/>
<stylesheet src="IDE.css"/>

49
core/ide/che-core-ide-api/pom.xml
View File

@ -42,18 +42,42 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-dto</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-factory-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-git-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-machine-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-model</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-project-shared</artifactId>
@ -62,6 +86,10 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-project-templates-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-ssh-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-user-shared</artifactId>
@ -70,14 +98,6 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-workspace-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-machine</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-project</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-annotations</artifactId>
@ -198,10 +218,19 @@
</dependencies>
<configuration>
<dtoPackages>
<package>org.eclipse.che.ide.api.user</package>
<package>org.eclipse.che.api.auth</package>
<package>org.eclipse.che.api.core</package>
<package>org.eclipse.che.api.factory</package>
<package>org.eclipse.che.api.git</package>
<package>org.eclipse.che.api.project</package>
<package>org.eclipse.che.api.project.templates</package>
<package>org.eclipse.che.api.machine</package>
<package>org.eclipse.che.api.workspace</package>
<package>org.eclipse.che.api.ssh</package>
<package>org.eclipse.che.api.user</package>
</dtoPackages>
<outputDirectory>${dto-generator-out-directory}</outputDirectory>
<genClassName>org.eclipse.che.ide.api.user.dto.DtoClientImpls</genClassName>
<genClassName>org.eclipse.che.ide.api.dto.DtoClientImpls</genClassName>
<impl>client</impl>
</configuration>
</plugin>

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/java/org/eclipse/che/api/auth/client/OAuthServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/auth/OAuthServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/factory/FactoryServiceClientImpl.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClient.java
View File

@ -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;

6
core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/git/GitServiceClientImpl.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachine.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachine.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/DevMachineServer.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/DevMachineServer.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineManager.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/OutputMessageUnmarshaller.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/OutputMessageUnmarshaller.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClient.java
View File

@ -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;

3
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/RecipeServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentState.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentState.java
View File

@ -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.

18
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/WsAgentStateController.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/WsAgentStateController.java
View File

@ -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();

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/DevMachineStateEvent.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/DevMachineStateEvent.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateEvent.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateEvent.java
View File

@ -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.

2
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/events/WsAgentStateHandler.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/events/WsAgentStateHandler.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClient.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectImportersServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectImportersServiceClientImpl.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClient.java
View File

@ -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;

6
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTemplateServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClient.java
View File

@ -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;

7
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/ProjectTypeServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTypeServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/java/org/eclipse/che/api/project/gwt/client/QueryExpression.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/QueryExpression.java
View File

@ -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 {

3
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FileNode.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/FolderNode.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructure.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureProvider.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ItemNode.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/tree/generic/ProjectNode.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/java/org/eclipse/che/api/ssh/gwt/client/SshServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserProfileServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserProfileServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-user/src/main/java/org/eclipse/che/api/user/gwt/client/UserServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/user/UserServiceClientImpl.java
View File

@ -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;

3
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClient.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClient.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/WorkspaceServiceClientImpl.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClientImpl.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedEvent.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedEvent.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStartedHandler.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStartedHandler.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedEvent.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedEvent.java
View File

@ -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;

2
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/java/org/eclipse/che/api/workspace/gwt/client/event/WorkspaceStoppedHandler.java → core/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/event/WorkspaceStoppedHandler.java
View File

@ -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;

4
core/platform-api-client-gwt/che-core-client-gwt-auth/src/main/resources/org/eclipse/che/api/Auth.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/auth/Auth.gwt.xml
View File

@ -15,7 +15,5 @@
<module>
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.json.JSON"/>
<source path='auth/shared'/>
<source path='auth/client'/>
<source path='auth/gwt'/>
<source path='shared'/>
</module>

9
core/platform-api-client-gwt/che-core-client-gwt-core/src/main/resources/org/eclipse/che/api/Core.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/core/Core.gwt.xml
View File

@ -15,9 +15,8 @@
<module>
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.json.JSON"/>
<source path='core/rest/shared'/>
<source path='core/gwt'/>
<source path='core/model/workspace'/>
<source path='core/model/machine'/>
<source path='core/model/project'/>
<source path='rest/shared'/>
<source path='model/workspace'/>
<source path='model/machine'/>
<source path='model/project'/>
</module>

5
core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/resources/org/eclipse/che/api/Factory.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/factory/Factory.gwt.xml
View File

@ -15,6 +15,5 @@
<module>
<inherits name="com.google.gwt.user.User"/>
<inherits name="com.google.gwt.json.JSON"/>
<source path="factory/shared"/>
<source path="factory/gwt"/>
</module>
<source path="shared"/>
</module>

5
core/platform-api-client-gwt/che-core-client-gwt-git/src/main/resources/org/eclipse/che/api/Git.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/git/Git.gwt.xml
View File

@ -16,8 +16,7 @@
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.json.JSON"/>
<inherits name="org.eclipse.che.ide.Commons"/>
<inherits name="org.eclipse.che.api.Machine"/>
<inherits name="org.eclipse.che.api.machine.Machine"/>
<inherits name="org.eclipse.che.ide.Api"/>
<source path='git/gwt'/>
<source path='git/shared'/>
<source path='shared'/>
</module>

3
core/platform-api-client-gwt/che-core-client-gwt-machine/src/main/resources/org/eclipse/che/api/Machine.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/machine/Machine.gwt.xml
View File

@ -18,6 +18,5 @@
<inherits name="org.eclipse.che.ide.Commons"/>
<inherits name="org.eclipse.che.api.core.model.Model"/>
<inherits name="org.eclipse.che.api.promises.Promises"/>
<source path='machine/gwt'/>
<source path='machine/shared'/>
<source path='shared'/>
</module>

9
core/platform-api-client-gwt/che-core-client-gwt-project/src/main/resources/org/eclipse/che/api/Project.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/project/Project.gwt.xml
View File

@ -16,10 +16,9 @@
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.json.JSON"/>
<inherits name="org.eclipse.che.ide.Commons"/>
<inherits name="org.eclipse.che.api.Machine"/>
<inherits name="org.eclipse.che.api.Workspace"/>
<source path='project/gwt'/>
<source path='project/shared'/>
<source path='project/templates'/>
<inherits name="org.eclipse.che.api.machine.Machine"/>
<inherits name="org.eclipse.che.api.workspace.Workspace"/>
<source path='shared'/>
<source path='templates'/>
<source path='vfs/impl/file'/>
</module>

4
core/platform-api-client-gwt/che-core-client-gwt-ssh/src/main/resources/org/eclipse/che/api/Ssh.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/ssh/Ssh.gwt.xml
View File

@ -16,6 +16,6 @@
<inherits name="com.google.gwt.user.User"/>
<inherits name="com.google.gwt.json.JSON"/>
<source path="ssh/shared"/>
<source path="ssh/gwt"/>
<source path="shared"/>
<source path="gwt"/>
</module>

3
core/platform-api-client-gwt/che-core-client-gwt-user/src/main/resources/org/eclipse/che/api/User.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/user/User.gwt.xml
View File

@ -15,6 +15,5 @@
<module>
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.json.JSON"/>
<source path='user/gwt'/>
<source path='user/shared'/>
<source path='shared'/>
</module>

4
core/platform-api-client-gwt/che-core-client-gwt-workspace/src/main/resources/org/eclipse/che/api/Workspace.gwt.xml → core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/api/workspace/Workspace.gwt.xml
View File

@ -16,6 +16,6 @@
<inherits name="com.google.gwt.user.User"/>
<inherits name="com.google.gwt.json.JSON"/>
<inherits name="org.eclipse.che.api.promises.Promises"/>
<inherits name="org.eclipse.che.api.Machine"/>
<source path="workspace" excludes="server"/>
<inherits name="org.eclipse.che.api.machine.Machine"/>
<source path="shared"/>
</module>

4
core/ide/che-core-ide-api/src/main/resources/org/eclipse/che/ide/Api.gwt.xml
View File

@ -21,10 +21,6 @@
<inherits name="com.google.gwt.inject.Inject"/>
<inherits name="com.google.gwt.user.Debug"/>
<inherits name="org.vectomatic.libgwtsvg"/>
<inherits name="org.eclipse.che.api.Core"/>
<inherits name="org.eclipse.che.api.Project"/>
<inherits name="org.eclipse.che.api.Machine"/>
<inherits name="org.eclipse.che.api.Workspace"/>
<inherits name="org.eclipse.che.api.promises.Promises"/>
<source path="api"/>

2
core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/BaseNodeTest.java
View File

@ -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;

2
core/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/project/tree/generic/GenericTreeStructureTest.java
View File

@ -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;

36
core/ide/che-core-ide-app/pom.xml
View File

@ -91,42 +91,6 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-workspace-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-auth</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-factory</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-git</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-machine</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-project</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-ssh</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-user</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-client-gwt-workspace</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-commons-annotations</artifactId>

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/DeleteItemAction.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/PasteAction.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopMachineAction.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/StopWorkspaceAction.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/WorkspaceSnapshotCreator.java
View File

@ -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;

10
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/client/BootstrapController.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/connection/WsConnectionListener.java
View File

@ -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;

6
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java
View File

@ -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;

54
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/ProfileComponent.java
View File

@ -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;

6
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/preferences/editorproperties/EditorPropertiesPresenter.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/navigation/NavigateToFilePresenter.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/newresource/AbstractNewResourceAction.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectConfigEnforcer.java
View File

@ -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;

6
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizationListener.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesManagerImpl.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/NodeManager.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/AbstractResourceProcessor.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ItemReferenceProcessor.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ModuleConfigProcessor.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/node/resource/ProjectConfigProcessor.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/local/LocalZipImporterPagePresenter.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectNotificationSubscriberImpl.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectResolver.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectUpdater.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTemplatesComponent.java
View File

@ -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;

3
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/ProjectTypeComponent.java
View File

@ -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;

2
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/search/FullTextSearchPresenter.java
View File

@ -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;

8
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java
View File

@ -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;

4
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java
View File

@ -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;

6
core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More