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

Inspection configurable: "copy to project" really does copy, "set as global" -- as previous IDEA-154618

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-04-14 12:29:25 +03:00
parent e39de895a4
commit 16166c8584
3 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
+39 -29
View File
@@ -75,7 +75,6 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.List;
import java.util.function.Supplier;
public abstract class InspectionToolsConfigurable extends BaseConfigurable
implements ErrorsConfigurable, SearchableConfigurable, Configurable.NoScroll {
@@ -112,15 +111,28 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable
return myProjectProfileManager.getProject();
}
@Nullable
private InspectionProfileImpl copyToNewProfile(ModifiableModel selectedProfile, @NotNull Project project) {
@NotNull
private InspectionProfileImpl copyToNewProfile(ModifiableModel selectedProfile,
@NotNull Project project,
boolean modifyName,
boolean modifyLevel) {
LOG.assertTrue(modifyLevel || modifyName);
String profileDefaultName = selectedProfile.getName();
do {
profileDefaultName += " (copy)";
if (modifyName) {
do {
profileDefaultName += " (copy)";
}
while (hasName(profileDefaultName, modifyLevel != myPanels.get(selectedProfile).isProjectLevel()));
}
while (hasName(profileDefaultName, myPanels.get(selectedProfile).isProjectLevel()));
final ProfileManager profileManager = selectedProfile.getProfileManager();
ProfileManager profileManager = selectedProfile.getProfileManager();
if (modifyLevel) {
if (profileManager == myApplicationProfileManager) {
profileManager = myProjectProfileManager;
} else {
profileManager = myApplicationProfileManager;
}
}
InspectionProfileImpl inspectionProfile =
new InspectionProfileImpl(profileDefaultName, InspectionToolRegistrar.getInstance(), profileManager);
@@ -128,7 +140,11 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable
inspectionProfile.setName(profileDefaultName);
inspectionProfile.initInspectionTools(project);
inspectionProfile.setModified(true);
return inspectionProfile;
final InspectionProfileImpl modifiableModel = (InspectionProfileImpl)inspectionProfile.getModifiableModel();
modifiableModel.setModified(true);
addProfile(modifiableModel, inspectionProfile);
return modifiableModel;
}
protected void addProfile(InspectionProfileImpl model, InspectionProfileImpl profile) {
@@ -229,35 +245,29 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable
}
@Override
public void setIsProjectLevel(boolean isProjectLevel) {
public boolean canChangeProfileLevel() {
return !hasName(getSelectedPanel().getCurrentProfileName(), !isProjectLevel());
}
@Override
public void moveToProject() {
final SingleInspectionProfilePanel selectedPanel = getSelectedPanel();
LOG.assertTrue(selectedPanel != null, "No settings selectedPanel for: " + getSelectedObject());
copyToNewProfile(getSelectedObject(), getProject(), false, true);
}
final String name = getSelectedPanel().getCurrentProfileName();
for (SingleInspectionProfilePanel p : myPanels.values()) {
if (p != selectedPanel && Comparing.equal(p.getCurrentProfileName(), name)) {
final boolean curShared = p.isProjectLevel();
if (curShared == isProjectLevel) {
Messages.showErrorDialog((isProjectLevel ? "Shared" : "Application level") + " profile with same name exists.", "Inspections Settings");
return;
}
}
}
selectedPanel.setIsProjectLevel(isProjectLevel);
@Override
public void setAsGlobal() {
final SingleInspectionProfilePanel selectedPanel = getSelectedPanel();
LOG.assertTrue(selectedPanel != null, "No settings selectedPanel for: " + getSelectedObject());
selectedPanel.setIsProjectLevel(false);
myProfiles.invalidate();
myProfiles.repaint();
}
@Override
public void copy() {
final InspectionProfileImpl newProfile = copyToNewProfile(getSelectedObject(), getProject());
if (newProfile != null) {
final InspectionProfileImpl modifiableModel = (InspectionProfileImpl)newProfile.getModifiableModel();
modifiableModel.setModified(true);
modifiableModel.setProjectLevel(false);
addProfile(modifiableModel, newProfile);
rename(modifiableModel);
}
rename(copyToNewProfile(getSelectedObject(), getProject(), true, false));
}
@Override
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/ManageButton.java
+18 -11
View File
@@ -18,7 +18,6 @@ package com.intellij.profile.codeInspection.ui.header;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.ex.CheckboxAction;
import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
import com.intellij.openapi.project.DumbAware;
import org.jetbrains.annotations.NotNull;
@@ -62,19 +61,27 @@ public class ManageButton extends ComboBoxAction implements DumbAware {
return group;
}
private class ShareWithTeamCheckBoxAction extends CheckboxAction implements DumbAware {
public ShareWithTeamCheckBoxAction() {
super("Copy to Project");
@Override
protected boolean shouldShowDisabledActions() {
return true;
}
private class ShareWithTeamCheckBoxAction extends AnAction implements DumbAware {
@Override
public void update(AnActionEvent e) {
final boolean isProjectLevel = myBuilder.isProjectLevel();
e.getPresentation().setText(isProjectLevel ? "Set as Global" : "Copy to Project");
e.getPresentation().setEnabled(myBuilder.canChangeProfileLevel());
}
@Override
public boolean isSelected(AnActionEvent e) {
return myBuilder.isProjectLevel();
}
@Override
public void setSelected(AnActionEvent e, boolean state) {
myBuilder.setIsProjectLevel(state);
public void actionPerformed(AnActionEvent e) {
if (myBuilder.isProjectLevel()) {
myBuilder.setAsGlobal();
}
else {
myBuilder.moveToProject();
}
}
}
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/ManageButtonBuilder.java
+5 -1
View File
@@ -21,7 +21,11 @@ package com.intellij.profile.codeInspection.ui.header;
public interface ManageButtonBuilder {
boolean isProjectLevel();
void setIsProjectLevel(boolean share);
boolean canChangeProfileLevel();
void moveToProject();
void setAsGlobal();
void copy();