MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-88947 Merge "Open Project" and "Open File" actions into one

Browse Source
This commit is contained in:
peter
2012-07-19 13:46:48 +02:00
parent 1afc56ddb6
commit 7993d7ee6c
6 changed files with 1154 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java
+6
View File
@@ -72,4 +72,10 @@ public class OpenProjectAction extends AnAction implements DumbAware {
}
});
}
@Override
public void update(AnActionEvent e) {
super.update(e);
e.getPresentation().setVisible(false);
}
}
platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java
+50 -26
View File
@@ -16,26 +16,26 @@
package com.intellij.ide.actions;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.highlighter.ProjectFileType;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.fileChooser.FileChooser;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileChooser.FileElement;
import com.intellij.openapi.fileChooser.PathChooserDialog;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.ex.FileTypeChooser;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.PlatformProjectOpenProcessor;
import com.intellij.util.Consumer;
@@ -47,15 +47,44 @@ import java.util.List;
public class OpenFileAction extends AnAction implements DumbAware {
public void actionPerformed(AnActionEvent e) {
@Nullable final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
if (project == null &&
PlatformProjectOpenProcessor.getInstanceIfItExists() == null) {
return;
final boolean showFiles = project != null || PlatformProjectOpenProcessor.getInstanceIfItExists() != null;
final FileChooserDescriptor descriptor = new OpenProjectFileChooserDescriptor(true) {
@Override
public boolean isFileSelectable(VirtualFile file) {
if (super.isFileSelectable(file)) {
return true;
}
if (file.isDirectory()) {
return false;
}
return showFiles && !FileElement.isArchive(file);
}
@Override
public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
if (!file.isDirectory() && isFileSelectable(file)) {
if (!showHiddenFiles && FileElement.isFileHidden(file)) return false;
return true;
}
return super.isFileVisible(file, showHiddenFiles);
}
@Override
public boolean isChooseMultiple() {
return showFiles;
}
};
descriptor.setTitle(showFiles ? "Open File or Project" : "Open Project");
VirtualFile userHomeDir = null;
if (SystemInfo.isUnix) {
userHomeDir = VfsUtil.getUserHomeDir();
}
final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createMultipleFilesNoJarsDescriptor();
descriptor.setTitle(IdeBundle.message("title.open.file"));
descriptor.putUserData(PathChooserDialog.PREFER_LAST_OVER_EXPLICIT, Boolean.TRUE);
FileChooser.chooseFiles(descriptor, project, null, new Consumer<List<VirtualFile>>() {
FileChooser.chooseFiles(descriptor, project, userHomeDir, new Consumer<List<VirtualFile>>() {
@Override
public void consume(final List<VirtualFile> files) {
doOpenFile(project, files);
@@ -66,24 +95,29 @@ public class OpenFileAction extends AnAction implements DumbAware {
private static void doOpenFile(@Nullable final Project project,
@NotNull final List<VirtualFile> result) {
for (final VirtualFile file : result) {
if (isProjectFile(file.getName())) {
if (file.isDirectory()) {
ProjectUtil.openOrImport(file.getPath(), project, false);
return;
}
if (OpenProjectFileChooserDescriptor.isProjectFile(file)) {
int answer = Messages.showYesNoDialog(project,
IdeBundle.message("message.open.file.is.project", file.getName(),
ApplicationNamesInfo.getInstance().getProductName()),
IdeBundle.message("message.open.file.is.project", file.getName()),
IdeBundle.message("title.open.project"),
Messages.getQuestionIcon());
if (answer == 0) {
ProjectUtil.openProject(file.getPath(), project, false);
ProjectUtil.openOrImport(file.getPath(), project, false);
return;
}
}
FileType type = FileTypeChooser.getKnownFileTypeOrAssociate(file,project);
FileType type = FileTypeChooser.getKnownFileTypeOrAssociate(file, project);
if (type == null) return;
if (project != null) {
openFile(file, project);
} else {
}
else {
PlatformProjectOpenProcessor.getInstance().doOpenProject(file, null, false);
}
}
@@ -111,14 +145,4 @@ public class OpenFileAction extends AnAction implements DumbAware {
FileEditorManager.getInstance(project).openTextEditor(descriptor, true);
}
public static boolean isProjectFile(final String file) {
return FileTypeManager.getInstance().getFileTypeByFileName(file) instanceof ProjectFileType;
}
public void update(AnActionEvent event) {
Presentation presentation = event.getPresentation();
Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext());
presentation.setEnabled(project != null ||
PlatformProjectOpenProcessor.getInstanceIfItExists() != null);
}
}
platform/platform-impl/src/com/intellij/ide/actions/OpenProjectFileChooserDescriptor.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class OpenProjectFileChooserDescriptor extends FileChooserDescriptor {
return isProjectFile(file) || super.isFileVisible(file, showHiddenFiles) && file.isDirectory();
}
private static boolean isProjectFile(final VirtualFile file) {
public static boolean isProjectFile(final VirtualFile file) {
if (isIprFile(file)) return true;
final ProjectOpenProcessor importProvider = ProjectOpenProcessor.getImportProvider(file);
return importProvider != null;
platform/platform-resources-en/src/messages/ActionsBundle.properties
+3 -3
View File
@@ -227,10 +227,10 @@ action.NewProject.text=_New Project...
action.NewProject.description=Create a new project
action.NewModule.text=Add _Module...
action.NewModule.description=Add new module to the project
action.OpenProject.text=_Open Project...
action.OpenProject.text=Open Project...
action.OpenProject.description=Open an existing project
action.OpenFile.text=Open Fi_le...
action.OpenFile.description=Open file in editor
action.OpenFile.text=_Open...
action.OpenFile.description=Open a project or a file in editor
group.reopen.win.text=_Reopen
group.reopen.mac.text=Open _Recent
group.$LRU.description=List of recently opened projects
platform/platform-resources-en/src/messages/IdeBundle.properties
+1093 -1094
View File
File diff suppressed because it is too large Load Diff
platform/platform-resources/src/idea/Keymap_Netbeans.xml
+1 -1
View File
@@ -243,7 +243,7 @@
<action id="NextTab">
<keyboard-shortcut first-keystroke="control PAGE_DOWN" />
</action>
<action id="OpenProject">
<action id="OpenFile">
<keyboard-shortcut first-keystroke="shift control O" />
</action>
<action id="OptimizeImports">