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

Cleanup (unused action; pointless action groups)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-08-25 20:11:07 +04:00
parent a141680e77
commit 71a8879ced
3 changed files with 3 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java
-84
View File
@@ -1,84 +0,0 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileChooser.FileChooser;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.PathChooserDialog;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.projectImport.ProjectOpenProcessor;
import com.intellij.projectImport.ProjectOpenProcessorBase;
import com.intellij.util.Consumer;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
public class OpenProjectAction extends AnAction implements DumbAware {
public void actionPerformed(AnActionEvent e) {
final FileChooserDescriptor descriptor = new OpenProjectFileChooserDescriptor(true);
descriptor.setTitle(IdeBundle.message("title.open.project"));
final Set<String> extensions = new LinkedHashSet<String>();
extensions.add(ProjectFileType.DOT_DEFAULT_EXTENSION);
final ProjectOpenProcessor[] openProcessors = Extensions.getExtensions(ProjectOpenProcessor.EXTENSION_POINT_NAME);
for (ProjectOpenProcessor openProcessor : openProcessors) {
if (!(openProcessor instanceof ProjectOpenProcessorBase)) continue;
final String[] supportedExtensions = ((ProjectOpenProcessorBase)openProcessor).getSupportedExtensions();
if (supportedExtensions != null) {
Collections.addAll(extensions, supportedExtensions);
}
}
descriptor.setDescription(IdeBundle.message("filter.project.files", StringUtil.join(extensions, ", ")));
VirtualFile userHomeDir = null;
if (SystemInfo.isUnix) {
userHomeDir = VfsUtil.getUserHomeDir();
}
descriptor.putUserData(PathChooserDialog.PREFER_LAST_OVER_EXPLICIT, Boolean.TRUE);
final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
FileChooser.chooseFiles(descriptor, project, userHomeDir, new Consumer<List<VirtualFile>>() {
@Override
public void consume(final List<VirtualFile> files) {
if (files.size() == 1) {
ProjectUtil.openOrImport(files.get(0).getPath(), project, false);
}
}
});
}
@Override
public void update(AnActionEvent e) {
super.update(e);
e.getPresentation().setEnabledAndVisible(ActionPlaces.WELCOME_SCREEN.equals(e.getPlace()));
}
}
platform/platform-resources-en/src/messages/ActionsBundle.properties
-2
View File
@@ -251,8 +251,6 @@ action.NewModule.text=New _Module...
action.NewModule.description=Create new module from scratch and add it to the project
action.ImportProject.description=Create project structure for directory with existing sources or convert existing project model
action.ImportModule.description=Import module from directory with existing sources or from existing project model
action.OpenProject.text=Open Project...
action.OpenProject.description=Open an existing project
action.OpenFile.text=_Open...
action.OpenFile.description=Open a project or a file in editor
group.reopen.win.text=_Reopen Project
resources/src/idea/RichPlatformActions.xml
+3 -12
View File
@@ -50,17 +50,10 @@
<action id="NewModule" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleAction"/>
<action id="ImportProject" class="com.intellij.ide.actions.ImportProjectAction" text="Import Project..."/>
<action id="ImportModule" class="com.intellij.ide.actions.ImportModuleAction" text="Import Module..."/>
<action id="OpenProject" class="com.intellij.ide.actions.OpenProjectAction"/>
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction"/>
<add-to-group group-id="FileOpenGroup" anchor="first"/>
</group>
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
<add-to-group group-id="OpenProjectGroup" anchor="before" relative-to-action="OpenFile"/>
</action>
<group>
<add-to-group group-id="ExportImportGroup" anchor="first"/>
</group>
<action id="SaveAsNewFormat" class="com.intellij.ide.actions.SaveAsDirectoryBasedFormatAction" text="Save as Directory-Based Format...">
<add-to-group group-id="ExportImportGroup" anchor="last"/>
</action>
@@ -362,11 +355,9 @@
<!-- ****************************************************************** -->
<group id="WelcomeScreen.QuickStart.IDEA">
<action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction"
icon="AllIcons.General.CreateNewProject"/>
<action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction" icon="AllIcons.General.CreateNewProject"/>
<action id="WelcomeScreen.ImportProject" class="com.intellij.ide.actions.ImportProjectAction" icon="AllIcons.General.ImportProject"/>
<action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction"
icon="AllIcons.General.OpenProject"/>
<action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction" icon="AllIcons.General.OpenProject"/>
<add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
</group>