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

'create library from files' action: speed search added and fixed creating module library

Browse Source
This commit is contained in:
nik
2011-10-07 12:17:40 +04:00
parent a925a82bee
commit 60fff0ec61
3 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java
+18 -37
View File
@@ -41,6 +41,7 @@ import javax.swing.*;
import javax.swing.event.DocumentEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.List;
/**
@@ -51,10 +52,8 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
private final ModulesCombobox myModulesCombobox;
private final Project myProject;
private final List<OrderRoot> myRoots;
private JPanel myPanel;
private final LibrariesContainer myLibrariesContainer;
private final JPanel myPanel;
private final String myDefaultName;
@Nullable private final ModifiableRootModel myModifiableModel;
public CreateLibraryFromFilesDialog(@NotNull Project project, @NotNull List<OrderRoot> roots) {
super(project, true);
@@ -62,21 +61,12 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
myProject = project;
myRoots = roots;
final FormBuilder builder = LibraryNameAndLevelPanel.createFormBuilder();
Module module = findModule(roots);
if (module != null) {
myModifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();
myLibrariesContainer = LibrariesContainerFactory.createContainer(myModifiableModel);
}
else {
myModifiableModel = null;
myLibrariesContainer = LibrariesContainerFactory.createContainer(project);
}
myDefaultName = myLibrariesContainer.suggestUniqueLibraryName(LibraryEditingUtil.suggestLibraryName(roots));
myNameAndLevelPanel = new LibraryNameAndLevelPanel(builder, myDefaultName, myLibrariesContainer.getAvailableLevels(), LibrariesContainer.LibraryLevel.PROJECT);
myDefaultName = LibrariesContainerFactory.createContainer(project).suggestUniqueLibraryName(LibraryEditingUtil.suggestLibraryName(roots));
myNameAndLevelPanel = new LibraryNameAndLevelPanel(builder, myDefaultName, Arrays.asList(LibrariesContainer.LibraryLevel.values()), LibrariesContainer.LibraryLevel.PROJECT);
myNameAndLevelPanel.setDefaultName(myDefaultName);
myModulesCombobox = new ModulesCombobox();
myModulesCombobox.fillModules(myProject);
myModulesCombobox.setSelectedModule(module);
myModulesCombobox.setSelectedModule(findModule(roots));
builder.addLabeledComponent("&Add to module:", myModulesCombobox);
myPanel = builder.getPanel();
myNameAndLevelPanel.getLibraryNameField().selectAll();
@@ -141,21 +131,20 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
final LibrariesContainer.LibraryLevel level = myNameAndLevelPanel.getLibraryLevel();
AccessToken token = WriteAction.start();
try {
final Library library = myLibrariesContainer.createLibrary(myNameAndLevelPanel.getLibraryName(),
level, myRoots);
if (myModifiableModel != null) {
if (level == LibrariesContainer.LibraryLevel.MODULE) {
myModifiableModel.commit();
}
else {
myModifiableModel.dispose();
}
}
final Module module = myModulesCombobox.getSelectedModule();
if (module != null && level != LibrariesContainer.LibraryLevel.MODULE) {
final ModifiableRootModel model = ModuleRootManager.getInstance(module).getModifiableModel();
model.addLibraryEntry(library);
model.commit();
final String libraryName = myNameAndLevelPanel.getLibraryName();
if (level == LibrariesContainer.LibraryLevel.MODULE) {
final ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();
LibrariesContainerFactory.createContainer(modifiableModel).createLibrary(libraryName, level, myRoots);
modifiableModel.commit();
}
else {
final Library library = LibrariesContainerFactory.createContainer(myProject).createLibrary(libraryName, level, myRoots);
if (module != null) {
final ModifiableRootModel model = ModuleRootManager.getInstance(module).getModifiableModel();
model.addLibraryEntry(library);
model.commit();
}
}
}
finally {
@@ -164,14 +153,6 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
super.doOKAction();
}
@Override
public void doCancelAction() {
if (myModifiableModel != null) {
myModifiableModel.dispose();
}
super.doCancelAction();
}
@Override
protected JComponent createCenterPanel() {
return myPanel;
java/idea-ui/src/com/intellij/ide/projectView/actions/MarkLibraryRootAction.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.ide.projectView.actions;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -73,7 +74,7 @@ public class MarkLibraryRootAction extends AnAction {
public void update(AnActionEvent e) {
final Project project = getEventProject(e);
boolean visible = false;
if (project != null) {
if (project != null && ModuleManager.getInstance(project).getModules().length > 0) {
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
for (VirtualFile root : getRoots(e)) {
if (!root.isInLocalFileSystem() && !fileIndex.isInLibraryClasses(root)) {