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

Jump to bottom

CHE-8240: Switch to project explorer tab for reavel resources action. #8460

Merged
merged 2 commits into from
Jan 26, 2018
Merged

CHE-8240: Switch to project explorer tab for reavel resources action. #8460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922ed68
CHE-8240: Switch to project explorer tab for reavel resources action.
AndrienkoAleksandr Jan 25, 2018
b29d80d
Addressed to pull request changes
AndrienkoAleksandr Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 31 additions & 1 deletion ...core-ide-app/src/main/java/org/eclipse/che/ide/resources/action/RevealResourceAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

import static com.google.common.base.Preconditions.checkState;
import static java.util.Collections.singletonList;
import static org.eclipse.che.ide.api.parts.PartStackType.NAVIGATION;
import static org.eclipse.che.ide.part.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
import static org.eclipse.che.ide.resource.Path.valueOf;

import com.google.common.annotations.Beta;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.web.bindery.event.shared.EventBus;
import java.util.Map;
Expand All @@ -25,7 +27,11 @@
import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
import org.eclipse.che.ide.api.action.ActionEvent;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.parts.PartPresenter;
import org.eclipse.che.ide.api.parts.PartStack;
import org.eclipse.che.ide.api.parts.WorkspaceAgent;
import org.eclipse.che.ide.api.resources.Resource;
import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter;
import org.eclipse.che.ide.resource.Path;
import org.eclipse.che.ide.resources.reveal.RevealResourceEvent;

Expand All @@ -43,16 +49,24 @@ public class RevealResourceAction extends AbstractPerspectiveAction {

private final AppContext appContext;
private final EventBus eventBus;
private final Provider<ProjectExplorerPresenter> projectExplorerPresenterProvider;
private final WorkspaceAgent workspaceAgent;

@Inject
public RevealResourceAction(
AppContext appContext, EventBus eventBus, CoreLocalizationConstant localizedConstant) {
AppContext appContext,
EventBus eventBus,
CoreLocalizationConstant localizedConstant,
Provider<ProjectExplorerPresenter> projectExplorerPresenterProvider,
WorkspaceAgent workspaceAgent) {
super(
singletonList(PROJECT_PERSPECTIVE_ID),
localizedConstant.actionRevealResourceText(),
localizedConstant.actionRevealResourceDescription());
this.appContext = appContext;
this.eventBus = eventBus;
this.projectExplorerPresenterProvider = projectExplorerPresenterProvider;
this.workspaceAgent = workspaceAgent;
}

/** {@inheritDoc} */
Expand All @@ -74,13 +88,29 @@ public void actionPerformed(ActionEvent e) {

checkState(!path.isEmpty());

ensureProjectExplorerPart();
eventBus.fireEvent(new RevealResourceEvent(path));
} else {
final Resource[] resources = appContext.getResources();

checkState(resources != null && resources.length == 1);

ensureProjectExplorerPart();
eventBus.fireEvent(new RevealResourceEvent(resources[0]));
}
}

private void ensureProjectExplorerPart() {
PartStack navigationPartStack = workspaceAgent.getPartStack(NAVIGATION);
PartPresenter activePart = navigationPartStack.getActivePart();
ProjectExplorerPresenter projectExplorerPresenter = projectExplorerPresenterProvider.get();

if (activePart == null) {
workspaceAgent.openPart(projectExplorerPresenter, NAVIGATION);
}

if (!(activePart instanceof ProjectExplorerPresenter)) {
workspaceAgent.setActivePart(projectExplorerPresenter);
}
}
}