CODENVY-425: do not show terminal in factory workspaces, use newTermi…

…nal action instead. (#1128) Signed-off-by: Max Shaposhnik <[email protected]>
eclipse-che · Apr 27, 2016 · b272065 · b272065
1 parent e88fc75
commit b272065
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...t-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java b/...t-client/src/main/java/org/eclipse/che/ide/extension/machine/client/MachineExtension.java
@@ -22,6 +22,7 @@
 import org.eclipse.che.ide.api.action.ActionManager;
 import org.eclipse.che.ide.api.action.DefaultActionGroup;
 import org.eclipse.che.ide.api.action.IdeActions;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.constraints.Constraints;
 import org.eclipse.che.ide.api.extension.Extension;
 import org.eclipse.che.ide.api.icon.Icon;
@@ -81,6 +82,7 @@ public class MachineExtension {
     public MachineExtension(MachineResources machineResources,
                             final EventBus eventBus,
                             final WorkspaceAgent workspaceAgent,
+                            final AppContext   appContext,
                             final ConsolesPanelPresenter consolesPanelPresenter,
                             final Provider<ServerPortProvider> machinePortProvider,
                             final OutputsContainerPresenter outputsContainerPresenter,
@@ -94,11 +96,12 @@ public MachineExtension(MachineResources machineResources,
             public void onWsAgentStarted(WsAgentStateEvent event) {
                 machinePortProvider.get();
                 perspectiveManager.setPerspectiveId(PROJECT_PERSPECTIVE_ID);
-
                 workspaceAgent.openPart(outputsContainerPresenter, PartStackType.INFORMATION);
                 workspaceAgent.openPart(consolesPanelPresenter, PartStackType.INFORMATION);
 
-                consolesPanelPresenter.newTerminal();
+                if (appContext.getFactory() == null) {
+                    consolesPanelPresenter.newTerminal();
+                }
             }
 
             @Override

diff --git a/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java b/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java
@@ -218,7 +218,7 @@ protected void validateProjectActions(Factory factory) throws BadRequestExceptio
 
         for (Action applicationAction : applicationActions) {
             String id = applicationAction.getId();
-            if ("openFile".equals(id) || "findReplace".equals(id) || "runCommand".equals(id)) {
+            if ("openFile".equals(id) || "findReplace".equals(id) || "runCommand".equals(id) || "newTerminal".equals(id)) {
                 throw new BadRequestException(format(FactoryConstants.INVALID_ACTION_SECTION, id));
             }
         }