Merge pull request #3074 from #2923

Remove events panel from operation perspective
eclipse-che · Nov 15, 2016 · 93985ff · 93985ff
2 parents e3c0653 + 7479278
commit 93985ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/.../java/org/eclipse/che/ide/extension/machine/client/perspective/OperationsPerspective.java b/.../java/org/eclipse/che/ide/extension/machine/client/perspective/OperationsPerspective.java
@@ -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;
@@ -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;
@@ -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);
 

diff --git a/...nsion/machine/client/perspective/widgets/machine/appliance/MachineAppliancePresenter.java b/...nsion/machine/client/perspective/widgets/machine/appliance/MachineAppliancePresenter.java
@@ -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;
@@ -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;
@@ -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,
@@ -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;
@@ -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
@@ -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);