Fixing Go Into functionality

Vitaliy Guliy · Vitaliy Guliy · commit af3d892322c1 · 2017-06-22T13:10:17.000+03:00
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/parts/base/BaseView.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/parts/base/BaseView.java
@@ -17,7 +17,6 @@
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
 import com.google.gwt.user.client.ui.FocusWidget;
-import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Widget;
 
 import org.eclipse.che.ide.api.mvp.View;
@@ -61,17 +60,6 @@ public BaseView() {
         initWidget(container);
     }
 
-    /**
-     * Add a button on part toolbar,
-     *
-     * @param button button
-     */
-    public final void addToolButton(@NotNull IsWidget button) {
-        if (button != null) {
-//            toolbarHeader.addEast(button, 18);
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public final void setDelegate(T delegate) {
@@ -101,7 +89,6 @@ public final void setContentWidget(Widget widget) {
      */
     @Override
     public void setTitle(@NotNull String title) {
-//        titleLabel.setText(title);
     }
 
     /** {@inheritDoc} */
@@ -129,6 +116,9 @@ protected void focusView() {
         getElement().focus();
     }
 
+    /**
+     * Handles loosing the focus.
+     */
     protected void blurView() {
         getElement().blur();
     }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java
@@ -57,6 +57,12 @@ public interface CoreLocalizationConstant extends Messages {
     @Key("action.delete.description")
     String deleteItemActionDescription();
 
+    @Key("action.goInto.text")
+    String goIntoActionText();
+
+    @Key("action.goBack.text")
+    String goBackActionText();
+
     /* Cut */
     @Key("action.cut.text")
     String cutItemsActionText();
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/GoIntoAction.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/GoIntoAction.java
@@ -13,6 +13,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.action.ProjectAction;
 import org.eclipse.che.ide.api.data.tree.Node;
@@ -30,16 +31,28 @@
 public class GoIntoAction extends ProjectAction {
 
     private final ProjectExplorerPresenter projectExplorer;
+    private final CoreLocalizationConstant localizationConstant;
 
     @Inject
-    public GoIntoAction(ProjectExplorerPresenter projectExplorer) {
-        super("Go into");
+    public GoIntoAction(ProjectExplorerPresenter projectExplorer,
+                        CoreLocalizationConstant localizationConstant) {
+        super(localizationConstant.goIntoActionText());
+
         this.projectExplorer = projectExplorer;
+        this.localizationConstant = localizationConstant;
     }
 
     /** {@inheritDoc} */
     @Override
     protected void updateProjectAction(ActionEvent e) {
+        if (projectExplorer.isGoIntoActivated()) {
+            e.getPresentation().setText(localizationConstant.goBackActionText());
+            e.getPresentation().setEnabledAndVisible(true);
+            return;
+        }
+
+        e.getPresentation().setText(localizationConstant.goIntoActionText());
+
         List<?> selection = projectExplorer.getSelection().getAllElements();
 
         e.getPresentation().setEnabledAndVisible(!projectExplorer.isGoIntoActivated()
@@ -50,6 +63,11 @@ protected void updateProjectAction(ActionEvent e) {
     /** {@inheritDoc} */
     @Override
     public void actionPerformed(ActionEvent e) {
+        if (projectExplorer.isGoIntoActivated()) {
+            projectExplorer.goBack();
+            return;
+        }
+
         List<?> selection = projectExplorer.getSelection().getAllElements();
 
         if (selection.isEmpty() || selection.size() > 1) {
@@ -66,4 +84,5 @@ public void actionPerformed(ActionEvent e) {
     private boolean isNodeSupportGoInto(Object node) {
         return node instanceof Node && ((Node)node).supportGoInto();
     }
+
 }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/command/toolbar/selector/PanelSelectorPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/command/toolbar/selector/PanelSelectorPresenter.java
@@ -20,6 +20,8 @@
 import org.eclipse.che.ide.api.parts.Perspective;
 import org.eclipse.che.ide.api.parts.PerspectiveManager;
 
+import static org.eclipse.che.ide.api.parts.PartStack.State.MINIMIZED;
+
 /**
  * Presenter to manage Panel selector widget and perspective layout.
  */
@@ -110,7 +112,7 @@ private void showPanels(boolean left, boolean bottom, boolean right) {
         PartStack rightPartStack = perspective.getPartStack(PartStackType.TOOLING);
 
         if (left) {
-            if (PartStack.State.MINIMIZED == leftPartStack.getPartStackState()) {
+            if (MINIMIZED == leftPartStack.getPartStackState()) {
                 leftPartStack.unMinimize();
             } else {
                 leftPartStack.restore();
@@ -120,7 +122,7 @@ private void showPanels(boolean left, boolean bottom, boolean right) {
         }
 
         if (bottom) {
-            if (PartStack.State.MINIMIZED == bottomPartStack.getPartStackState()) {
+            if (MINIMIZED == bottomPartStack.getPartStackState()) {
                 bottomPartStack.unMinimize();
             } else {
                 bottomPartStack.restore();
@@ -130,7 +132,7 @@ private void showPanels(boolean left, boolean bottom, boolean right) {
         }
 
         if (right) {
-            if (PartStack.State.MINIMIZED == rightPartStack.getPartStackState()) {
+            if (MINIMIZED == rightPartStack.getPartStackState()) {
                 rightPartStack.unMinimize();
             } else {
                 rightPartStack.restore();
@@ -159,29 +161,29 @@ private void updateButtonState() {
             return;
         }
 
-        if (PartStack.State.MINIMIZED != leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == rightPartStack.getPartStackState()) {
+        if (MINIMIZED != leftPartStack.getPartStackState() &&
+                MINIMIZED == bottomPartStack.getPartStackState() &&
+                MINIMIZED == rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.LEFT);
-        } else if (PartStack.State.MINIMIZED != leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED != bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == rightPartStack.getPartStackState()) {
+        } else if (MINIMIZED != leftPartStack.getPartStackState() &&
+                MINIMIZED != bottomPartStack.getPartStackState() &&
+                MINIMIZED == rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.LEFT_BOTTOM);
-        } else if (PartStack.State.MINIMIZED == leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == rightPartStack.getPartStackState()) {
+        } else if (MINIMIZED == leftPartStack.getPartStackState() &&
+                MINIMIZED == bottomPartStack.getPartStackState() &&
+                MINIMIZED == rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.FULL_EDITOR);
-        } else if (PartStack.State.MINIMIZED == leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED != bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == rightPartStack.getPartStackState()) {
+        } else if (MINIMIZED == leftPartStack.getPartStackState() &&
+                MINIMIZED != bottomPartStack.getPartStackState() &&
+                MINIMIZED == rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.BOTTOM);
-        } else if (PartStack.State.MINIMIZED == leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED == bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED != rightPartStack.getPartStackState()) {
+        } else if (MINIMIZED == leftPartStack.getPartStackState() &&
+                MINIMIZED == bottomPartStack.getPartStackState() &&
+                MINIMIZED != rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.RIGHT);
-        } else if (PartStack.State.MINIMIZED != leftPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED != bottomPartStack.getPartStackState() &&
-                PartStack.State.MINIMIZED != rightPartStack.getPartStackState()) {
+        } else if (MINIMIZED != leftPartStack.getPartStackState() &&
+                MINIMIZED != bottomPartStack.getPartStackState() &&
+                MINIMIZED != rightPartStack.getPartStackState()) {
             view.setState(PanelSelectorView.State.LEFT_RIGHT_BOTTOM);
         }
     }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/PartStackPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/PartStackPresenter.java
@@ -380,7 +380,7 @@ public void collapse() {
         previousActivePart = activePart;
 
         activeTab = null;
-        activeTab = null;
+        activePart = null;
 
         // Notify the part stack state has been changed.
         Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
@@ -457,8 +457,13 @@ public void execute() {
             }
         });
 
-        activePart.onOpen();
-        selectActiveTab(activeTab);
+        if (activePart != null) {
+            activePart.onOpen();
+        }
+
+        if (activeTab != null) {
+            selectActiveTab(activeTab);
+        }
     }
 
     @Override
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/PartStackViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/PartStackViewImpl.java
@@ -113,7 +113,7 @@ public void setWidget(IsWidget widget) {
         setMaximized(false);
 
         addMaximizeButton();
-        addMimimizeButton();
+        addMinimizeButton();
         addMenuButton();
     }
 
@@ -142,7 +142,7 @@ public void onClick(ClickEvent event) {
     /**
      * Adds button to minimize part stack.
      */
-    private void addMimimizeButton() {
+    private void addMinimizeButton() {
         SVGImage minimize = new SVGImage(resources.collapseExpandIcon());
         minimize.getElement().setAttribute("name", "workBenchIconMinimize");
         ToolButton minimizeToolButton = new ToolButton(minimize);
@@ -170,7 +170,7 @@ private void addMenuButton() {
         menuButton.add(menuToolButton);
         menuToolButton.addClickHandler(new ClickHandler() {
             @Override
-            public void onClick(final ClickEvent event) {
+            public void onClick(ClickEvent event) {
                 Scheduler.get().scheduleDeferred(() -> {
                     int left = getAbsoluteLeft(menuToolButton.getElement());
                     int top = getAbsoluteTop(menuToolButton.getElement());
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java
@@ -422,8 +422,15 @@ public void go(AcceptsOneWidget container) {
      *         node which should be activated in "Go Into" mode
      */
     @Deprecated
-    public void goInto(Node node) {
-        view.setGoIntoModeOn(node);
+    public boolean goInto(Node node) {
+        return view.setGoIntoModeOn(node);
+    }
+
+    /**
+     * Deactivate "Go Into" mode.
+     */
+    public void goBack() {
+        view.setGoIntoModeOff();
     }
 
     /**
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerView.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerView.java
@@ -34,6 +34,11 @@ public interface ProjectExplorerView extends View<ProjectExplorerView.ActionDele
      */
     boolean setGoIntoModeOn(Node node);
 
+    /**
+     * Deactivate "Go Into" mode.
+     */
+    void setGoIntoModeOff();
+
     /**
      * Get "Go Into" state on current tree.
      *
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerViewImpl.java
diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties
