Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove events panel from operation perspective #3074

Merged
merged 1 commit into from
Nov 15, 2016
Merged

Remove events panel from operation perspective #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .../java/org/eclipse/che/ide/extension/machine/client/perspective/OperationsPerspective.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import com.google.inject.Singleton;
import com.google.web.bindery.event.shared.EventBus;

import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.parts.PartStack;
import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.appliance.MachineAppliancePresenter;
import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.panel.MachinePanelPresenter;
Expand All @@ -29,7 +28,6 @@

import javax.validation.constraints.NotNull;

import static org.eclipse.che.ide.api.constraints.Constraints.FIRST;
import static org.eclipse.che.ide.api.parts.PartStackType.EDITING;
import static org.eclipse.che.ide.api.parts.PartStackType.INFORMATION;
import static org.eclipse.che.ide.api.parts.PartStackType.NAVIGATION;
Expand All @@ -52,18 +50,14 @@ public OperationsPerspective(PerspectiveViewImpl view,
PartStackPresenterFactory stackPresenterFactory,
MachinePanelPresenter machinePanel,
RecipePartPresenter recipePanel,
NotificationManager notificationManager,
MachineAppliancePresenter infoContainer,
EventBus eventBus,
DynaProvider dynaProvider) {
super(OPERATIONS_PERSPECTIVE_ID, view, stackPresenterFactory, partViewFactory, controllerFactory, eventBus, dynaProvider);

notificationManager.addRule(OPERATIONS_PERSPECTIVE_ID);

//central panel
partStacks.put(EDITING, infoContainer);

addPart(notificationManager, INFORMATION, FIRST);
addPart(machinePanel, NAVIGATION);
addPart(recipePanel, NAVIGATION);

Expand Down
25 changes: 12 additions & 13 deletions ...nsion/machine/client/perspective/widgets/machine/appliance/MachineAppliancePresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant;
import org.eclipse.che.ide.extension.machine.client.inject.factories.EntityFactory;
import org.eclipse.che.ide.extension.machine.client.inject.factories.WidgetsFactory;
import org.eclipse.che.ide.extension.machine.client.perspective.terminal.container.TerminalContainer;
import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.appliance.recipe.RecipeTabPresenter;
import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.appliance.server.ServerPresenter;
import org.eclipse.che.ide.extension.machine.client.perspective.widgets.machine.appliance.sufficientinfo.MachineInfoPresenter;
Expand Down Expand Up @@ -55,7 +54,7 @@ public class MachineAppliancePresenter extends PartStackPresenter implements Act

private final MachineApplianceView view;
private final TabContainerPresenter tabContainer;
private final TerminalContainer terminalContainer;
// private final TerminalContainer terminalContainer;
private final MachineInfoPresenter infoPresenter;
private final ServerPresenter serverPresenter;
private final RecipeTabPresenter recipeTabPresenter;
Expand All @@ -81,7 +80,7 @@ public MachineAppliancePresenter(EventBus eventBus,
WidgetsFactory widgetsFactory,
EntityFactory entityFactory,
TabItemFactory tabItemFactory,
final TerminalContainer terminalContainer,
// final TerminalContainer terminalContainer,
MachineInfoPresenter infoPresenter,
RecipesContainerPresenter recipesContainer,
ServerPresenter serverPresenter,
Expand All @@ -91,7 +90,7 @@ public MachineAppliancePresenter(EventBus eventBus,

this.view = view;
this.tabContainer = tabContainer;
this.terminalContainer = terminalContainer;
// this.terminalContainer = terminalContainer;
this.recipesContainerPresenter = recipesContainer;
this.infoPresenter = infoPresenter;
this.recipeTabPresenter = recipeTabPresenter;
Expand All @@ -105,14 +104,14 @@ public MachineAppliancePresenter(EventBus eventBus,
final String infoTabName = locale.tabInfo();
final String serverTabName = locale.tabServer();

TabSelectHandler terminalHandler = new TabSelectHandler() {
@Override
public void onTabSelected() {
activeTabs.put(selectedMachine.getId(), terminalTabName);
terminalContainer.addOrShowTerminal(selectedMachine);
}
};
createAndAddTab(terminalTabName, terminalContainer, terminalHandler);
// TabSelectHandler terminalHandler = new TabSelectHandler() {
// @Override
// public void onTabSelected() {
// activeTabs.put(selectedMachine.getId(), terminalTabName);
// terminalContainer.addOrShowTerminal(selectedMachine);
// }
// };
// createAndAddTab(terminalTabName, terminalContainer, terminalHandler);

TabSelectHandler infoHandler = new TabSelectHandler() {
@Override
Expand Down Expand Up @@ -158,7 +157,7 @@ public void showAppliance(MachineEntity machine) {
activeTab = activeTab != null ? activeTab : locale.tabInfo();
tabContainer.showTab(activeTab);

terminalContainer.addOrShowTerminal(machine);
// terminalContainer.addOrShowTerminal(machine);
infoPresenter.update(machine);
recipeTabPresenter.updateInfo(machine);
serverPresenter.updateInfo(machine);
Expand Down