From 320542d23c5b4293e76d91edc6fab1ddce061dc2 Mon Sep 17 00:00:00 2001 From: Dmitry Shnurenko Date: Wed, 20 Apr 2016 10:50:06 +0300 Subject: [PATCH] CHE-990: Change MachineDto type to model type --- .../machine/gwt/client/MachineManager.java | 5 ++-- .../client/actions/DestroyMachineAction.java | 12 ++++------ .../actions/ExecuteSelectedCommandAction.java | 4 ++-- .../client/actions/RestartMachineAction.java | 4 ++-- .../client/actions/SelectCommandComboBox.java | 17 ++++++------- .../client/command/CommandManager.java | 4 ++-- .../client/machine/MachineManagerImpl.java | 24 ++++++++++--------- .../client/machine/MachineStateEvent.java | 10 ++++---- .../client/machine/MachineStatusNotifier.java | 6 ++--- .../machine/panel/MachinePanelPresenter.java | 11 +++++---- 10 files changed, 48 insertions(+), 49 deletions(-) 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/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java index 9a6ca198b64..73f019ecf98 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/platform-api-client-gwt/che-core-client-gwt-machine/src/main/java/org/eclipse/che/api/machine/gwt/client/MachineManager.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.che.api.machine.gwt.client; +import org.eclipse.che.api.core.model.machine.Machine; 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.Promise; @@ -68,7 +69,7 @@ enum MachineOperationType { * @param machine * contains information about machine state */ - Promise destroyMachine(MachineDto machine); + Promise destroyMachine(Machine machine); /** @@ -77,7 +78,7 @@ enum MachineOperationType { * @param machine * contains information about machine state */ - void restartMachine(final MachineDto machine); + void restartMachine(final Machine machine); /** * Checks if the the status for dev machine is tracked by machine manager. 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 9589b03252f..82ac339504b 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 @@ -12,13 +12,12 @@ 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.api.machine.shared.dto.MachineDto; 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; import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.panel.MachinePanelPresenter; -import org.eclipse.che.ide.ui.dialogs.DialogFactory; import javax.validation.constraints.NotNull; import java.util.Collections; @@ -35,13 +34,11 @@ public class DestroyMachineAction extends AbstractPerspectiveAction { private final MachineLocalizationConstant locale; private final MachinePanelPresenter panelPresenter; private final MachineManager machineManager; - private final DialogFactory dialogFactory; @Inject public DestroyMachineAction(MachineLocalizationConstant locale, MachinePanelPresenter panelPresenter, - MachineManager machineManager, - DialogFactory dialogFactory) { + MachineManager machineManager) { super(Collections.singletonList(OPERATIONS_PERSPECTIVE_ID), locale.machineDestroyTitle(), locale.machineDestroyDescription(), @@ -50,13 +47,12 @@ public DestroyMachineAction(MachineLocalizationConstant locale, this.locale = locale; this.panelPresenter = panelPresenter; this.machineManager = machineManager; - this.dialogFactory = dialogFactory; } /** {@inheritDoc} */ @Override public void updateInPerspective(@NotNull ActionEvent event) { - final MachineDto selectedMachine = panelPresenter.getSelectedMachineState(); + final Machine selectedMachine = panelPresenter.getSelectedMachineState(); event.getPresentation().setEnabled(selectedMachine != null && !selectedMachine.getConfig().isDev() && panelPresenter.isMachineRunning()); @@ -67,7 +63,7 @@ public void updateInPerspective(@NotNull ActionEvent event) { /** {@inheritDoc} */ @Override public void actionPerformed(@NotNull ActionEvent event) { - final MachineDto selectedMachine = panelPresenter.getSelectedMachineState(); + final Machine selectedMachine = panelPresenter.getSelectedMachineState(); if (selectedMachine == null) { return; } diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/ExecuteSelectedCommandAction.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/ExecuteSelectedCommandAction.java index e9056c0026d..e5a7b333d0c 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/ExecuteSelectedCommandAction.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/actions/ExecuteSelectedCommandAction.java @@ -13,7 +13,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.machine.shared.dto.MachineDto; +import org.eclipse.che.api.core.model.machine.Machine; 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; @@ -58,7 +58,7 @@ public void updateInPerspective(ActionEvent event) { @Override public void actionPerformed(ActionEvent e) { final CommandConfiguration command = selectCommandAction.getSelectedCommand(); - MachineDto machine = selectCommandAction.getSelectedMachine(); + Machine machine = selectCommandAction.getSelectedMachine(); if (command != null && machine != null) { commandManager.execute(command, machine); 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 2208432bc32..4cdb25b1f0c 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 @@ -12,8 +12,8 @@ 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.api.machine.shared.dto.MachineDto; 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; @@ -34,7 +34,7 @@ public class RestartMachineAction extends AbstractPerspectiveAction { private final MachineManager machineManager; private final MachineLocalizationConstant locale; - private MachineDto selectedMachine; + private Machine selectedMachine; @Inject public RestartMachineAction(MachineLocalizationConstant locale, 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 bff3b719d3b..4a25a4fe113 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 @@ -16,6 +16,7 @@ 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; @@ -72,12 +73,12 @@ public class SelectCommandComboBox extends AbstractPerspectiveAction implements WsAgentStateHandler, MachineStateEvent.Handler { - public static final String GROUP_COMMANDS = "CommandsGroup"; - public static final String GROUP_MACHINES = "MachinesGroup"; + public static final String GROUP_COMMANDS = "CommandsGroup"; + public static final String GROUP_MACHINES = "MachinesGroup"; private final MachineLocalizationConstant locale; private final MachineResources resources; - private final Map registeredMachineMap; + private final Map registeredMachineMap; private final ActionManager actionManager; private final WorkspaceServiceClient workspaceServiceClient; private final MachineServiceClient machineServiceClient; @@ -283,7 +284,7 @@ private void selectLastUsedCommand() { } @Nullable - public MachineDto getSelectedMachine() { + public Machine getSelectedMachine() { if (machinesListWidget.getSelectedId() == null) { return null; } @@ -337,14 +338,14 @@ public void onMachineCreating(MachineStateEvent event) { @Override public void onMachineRunning(MachineStateEvent event) { - MachineDto machine = event.getMachine(); + Machine machine = event.getMachine(); addMachineAction(machine); } @Override public void onMachineDestroyed(MachineStateEvent event) { - MachineDto machine = event.getMachine(); + Machine machine = event.getMachine(); final String machineId = machine.getId(); @@ -367,7 +368,7 @@ private void addMachineActions(List machines) { updateMachineActions(); } - private void addMachineAction(MachineDto machine) { + private void addMachineAction(Machine machine) { registeredMachineMap.put(machine.getId(), machine); updateMachineActions(); @@ -416,7 +417,7 @@ private String getMachineCategory(MachineConfigDto machineConfig) { if (machineConfig.isDev()) { return locale.devMachineCategory(); } - return machineConfig.getType(); + return machineConfig.getType(); } private class MachineDtoListEntryComparator implements Comparator> { 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 9b3f9c76c8e..9c93d0bbcc5 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 @@ -13,9 +13,9 @@ 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.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; @@ -83,7 +83,7 @@ public CommandManager(DtoFactory dtoFactory, * @param machine * machine in which command will be executed */ - public void execute(@NotNull CommandConfiguration command, @NotNull MachineDto machine) { + public void execute(@NotNull CommandConfiguration command, @NotNull Machine machine) { executeCommand(command, machine.getId()); } 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 b49bb63429f..047deab0948 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 @@ -183,8 +183,8 @@ public void onWorkspaceStopped(WorkspaceStoppedEvent event) { } @Override - public void restartMachine(final MachineDto machineState) { - eventBus.addHandler(MachineStateEvent.TYPE, new MachineStateEvent.Handler () { + public void restartMachine(final org.eclipse.che.api.core.model.machine.Machine machineState) { + eventBus.addHandler(MachineStateEvent.TYPE, new MachineStateEvent.Handler() { @Override public void onMachineCreating(MachineStateEvent event) { @@ -234,9 +234,9 @@ public void startDevMachine(String recipeURL, String displayName) { * @param isDev * @param operationType * @param sourceType - * "dockerfile" or "ssh-config" + * "dockerfile" or "ssh-config" * @param machineType - * "docker" or "ssh" + * "docker" or "ssh" */ private void startMachine(final String recipeURL, final String displayName, @@ -266,10 +266,10 @@ public void apply(final MachineDto machineDto) throws OperationException { eventBus.fireEvent(new MachineStateEvent(machineDto, MachineStateEvent.MachineAction.CREATING)); subscribeToChannel(machineDto.getConfig() - .getLink(LINK_REL_GET_MACHINE_LOGS_CHANNEL) - .getParameter("channel") - .getDefaultValue(), - outputHandler); + .getLink(LINK_REL_GET_MACHINE_LOGS_CHANNEL) + .getParameter("channel") + .getDefaultValue(), + outputHandler); RunningListener runningListener = null; @@ -302,7 +302,8 @@ public void apply(MachineDto machineDto) throws OperationException { @Override public boolean isDevMachineStatusTracked(MachineDto machine) { - final LinkParameter statusChannelLinkParameter = machine.getConfig().getLink(LINK_REL_GET_MACHINE_STATUS_CHANNEL).getParameter("channel"); + final LinkParameter statusChannelLinkParameter = + machine.getConfig().getLink(LINK_REL_GET_MACHINE_STATUS_CHANNEL).getParameter("channel"); if (statusChannelLinkParameter == null) { return false; } @@ -312,7 +313,7 @@ public boolean isDevMachineStatusTracked(MachineDto machine) { } @Override - public Promise destroyMachine(final MachineDto machineState) { + public Promise destroyMachine(final org.eclipse.che.api.core.model.machine.Machine machineState) { return machineServiceClient.destroyMachine(machineState.getId()).then(new Operation() { @Override public void apply(Void arg) throws OperationException { @@ -337,7 +338,8 @@ public void onDevMachineCreating(MachineConfigDto machineConfig) { if (logsChannelLinkParameter != null) { outputChannel = logsChannelLinkParameter.getDefaultValue(); } - final LinkParameter statusChannelLinkParameter = machineConfig.getLink(LINK_REL_GET_MACHINE_STATUS_CHANNEL).getParameter("channel"); + final LinkParameter statusChannelLinkParameter = + machineConfig.getLink(LINK_REL_GET_MACHINE_STATUS_CHANNEL).getParameter("channel"); if (statusChannelLinkParameter != null) { statusChannel = statusChannelLinkParameter.getDefaultValue(); } diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateEvent.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateEvent.java index ba58f184dc0..5bf81fa201e 100755 --- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateEvent.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/MachineStateEvent.java @@ -13,8 +13,6 @@ import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; -import org.eclipse.che.api.machine.shared.dto.MachineDto; - /** * Event that describes the fact that machine state has been changed. * @@ -28,7 +26,7 @@ public interface Handler extends EventHandler { * Is called when creating a machine. * * @param event - * state event + * state event */ void onMachineCreating(MachineStateEvent event); @@ -55,7 +53,7 @@ public interface Handler extends EventHandler { */ public static Type TYPE = new Type<>(); - private final MachineDto machine; + private final org.eclipse.che.api.core.model.machine.Machine machine; private final MachineAction machineAction; @@ -67,7 +65,7 @@ public interface Handler extends EventHandler { * @param machineAction * the type of action */ - public MachineStateEvent(MachineDto machine, MachineAction machineAction) { + public MachineStateEvent(org.eclipse.che.api.core.model.machine.Machine machine, MachineAction machineAction) { this.machine = machine; this.machineAction = machineAction; } @@ -77,7 +75,7 @@ public Type getAssociatedType() { return TYPE; } - public MachineDto getMachine() { + public org.eclipse.che.api.core.model.machine.Machine getMachine() { return machine; } 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 bbdb6981517..3a776d13cba 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 @@ -14,7 +14,7 @@ import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.shared.dto.MachineDto; +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; @@ -87,7 +87,7 @@ public void onWorkspaceStarted(WorkspaceStartedEvent event) { * @param machine * machine to track */ - void trackMachine(MachineDto machine, MachineOperationType operationType) { + void trackMachine(Machine machine, MachineOperationType operationType) { trackMachine(machine, null, operationType); } @@ -99,7 +99,7 @@ void trackMachine(MachineDto machine, MachineOperationType operationType) { * @param runningListener * listener that will be notified when machine is running */ - void trackMachine(final MachineDto machine, final RunningListener runningListener, final MachineOperationType operationType) { + void trackMachine(final Machine machine, final RunningListener runningListener, final MachineOperationType operationType) { final String machineName = machine.getConfig().getName(); final String workspaceId = appContext.getWorkspace().getId(); final String wsChannel = MACHINE_STATUS_WS_CHANNEL + workspaceId + ":" + machineName; 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 a57affb82f4..f9122f58435 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 @@ -70,8 +70,9 @@ public class MachinePanelPresenter extends BasePresenter implements MachinePanel private final MachineTreeNode rootNode; private final List machineNodes; private final AppContext appContext; - private MachineDto selectedMachine; - private boolean isMachineRunning; + + private org.eclipse.che.api.core.model.machine.Machine selectedMachine; + private boolean isMachineRunning; @Inject public MachinePanelPresenter(MachinePanelView view, @@ -131,7 +132,7 @@ public void apply(List machines) throws OperationException { }); } - private void addNodeToTree(MachineDto machine) { + private void addNodeToTree(org.eclipse.che.api.core.model.machine.Machine machine) { MachineTreeNode machineNode = entityFactory.createMachineNode(rootNode, machine, null); existingMachineNodes.put(machine.getId(), machineNode); @@ -150,7 +151,7 @@ private void selectFirstNode() { /** * Returns selected machine state. */ - public MachineDto getSelectedMachineState() { + public org.eclipse.che.api.core.model.machine.Machine getSelectedMachineState() { return selectedMachine; } @@ -279,7 +280,7 @@ public void onMachineRunning(final MachineStateEvent event) { */ @Override public void onMachineDestroyed(MachineStateEvent event) { - MachineDto machine = event.getMachine(); + org.eclipse.che.api.core.model.machine.Machine machine = event.getMachine(); MachineTreeNode deletedNode = existingMachineNodes.get(machine.getId());