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

naming conventions: allow default delegation for more cases, ui

Browse Source
This commit is contained in:
Anna.Kozlova
2017-09-26 14:33:30 +02:00
parent e6a2e87e65
commit fcecbe8d79
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/codeInspection/NamingConventionWithFallbackBean.java
+2 -2
View File
@@ -23,8 +23,8 @@ import java.awt.*;
public class NamingConventionWithFallbackBean extends NamingConventionBean {
public boolean inheritDefaultSettings = false;
public NamingConventionWithFallbackBean(String regex, int minLength, int maxLength) {
super(regex, minLength, maxLength);
public NamingConventionWithFallbackBean(String regex, int minLength, int maxLength, String... predefinedNames) {
super(regex, minLength, maxLength, predefinedNames);
}
public boolean isInheritDefaultSettings() {
plugins/InspectionGadgets/src/com/siyeh/ig/naming/AbstractNamingConventionInspection.java
+14 -3
View File
@@ -18,11 +18,13 @@ package com.siyeh.ig.naming;
import com.intellij.codeInspection.NamingConvention;
import com.intellij.codeInspection.NamingConventionBean;
import com.intellij.codeInspection.NamingConventionWithFallbackBean;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.ui.CheckBoxList;
import com.intellij.ui.CheckBoxListListener;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.xmlb.XmlSerializationException;
import com.intellij.util.xmlb.XmlSerializer;
import com.siyeh.ig.BaseInspection;
@@ -39,6 +41,8 @@ import java.util.List;
import java.util.function.Consumer;
public abstract class AbstractNamingConventionInspection<T> extends BaseInspection {
private static final Logger LOG = Logger.getInstance(AbstractNamingConventionInspection.class);
protected final Map<String, NamingConvention<T>> myNamingConventions = new LinkedHashMap<>();
protected final Map<String, NamingConventionBean> myNamingConventionBeans = new LinkedHashMap<>();
protected final Set<String> myDisabledShortNames = new HashSet<>();
@@ -46,8 +50,12 @@ public abstract class AbstractNamingConventionInspection<T> extends BaseInspecti
public AbstractNamingConventionInspection(NamingConvention<T>[] extensions, final String defaultConventionShortName) {
for (NamingConvention<T> convention : extensions) {
myNamingConventions.put(convention.getShortName(), convention);
myNamingConventionBeans.put(convention.getShortName(), convention.createDefaultBean());
String shortName = convention.getShortName();
NamingConvention<T> oldConvention = myNamingConventions.put(shortName, convention);
if (oldConvention != null) {
LOG.error("Duplicated short names: " + shortName + " first: " + oldConvention + "; second: " + convention);
}
myNamingConventionBeans.put(shortName, convention.createDefaultBean());
}
initDisabledState();
myDefaultConventionShortName = defaultConventionShortName;
@@ -158,7 +166,9 @@ public abstract class AbstractNamingConventionInspection<T> extends BaseInspecti
int selectedIndex = list.getSelectedIndex();
NamingConvention<T> item = list.getItemAt(selectedIndex);
if (item != null) {
layout.show(descriptionPanel, item.getShortName());
String shortName = item.getShortName();
layout.show(descriptionPanel, shortName);
UIUtil.setEnabled(descriptionPanel, list.isItemSelected(selectedIndex), true);
}
});
list.setCheckBoxListListener(new CheckBoxListListener() {
@@ -166,6 +176,7 @@ public abstract class AbstractNamingConventionInspection<T> extends BaseInspecti
public void checkBoxSelectionChanged(int index, boolean value) {
NamingConvention<T> convention = new ArrayList<>(myNamingConventions.values()).get(index);
setEnabled(value, convention.getShortName());
UIUtil.setEnabled(descriptionPanel, value, true);
}
});
list.setSelectedIndex(0);
plugins/InspectionGadgets/src/com/siyeh/ig/naming/AnnotationNamingConvention.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.siyeh.ig.naming;
import com.intellij.codeInspection.NamingConvention;
import com.intellij.codeInspection.NamingConventionBean;
import com.intellij.codeInspection.NamingConventionWithFallbackBean;
import com.intellij.psi.PsiClass;
import com.siyeh.InspectionGadgetsBundle;
@@ -27,7 +28,7 @@ public class AnnotationNamingConvention extends NamingConvention<PsiClass> {
@Override
public NamingConventionBean createDefaultBean() {
return new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
return new NamingConventionWithFallbackBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
}
@Override
plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedClassNamingConvention.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.siyeh.ig.naming;
import com.intellij.codeInspection.NamingConvention;
import com.intellij.codeInspection.NamingConventionBean;
import com.intellij.codeInspection.NamingConventionWithFallbackBean;
import com.intellij.psi.PsiClass;
import com.siyeh.InspectionGadgetsBundle;
@@ -27,7 +28,7 @@ public class EnumeratedClassNamingConvention extends NamingConvention<PsiClass>
@Override
public NamingConventionBean createDefaultBean() {
return new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
return new NamingConventionWithFallbackBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
}
@Override
plugins/InspectionGadgets/src/com/siyeh/ig/naming/InterfaceNamingConvention.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.siyeh.ig.naming;
import com.intellij.codeInspection.NamingConvention;
import com.intellij.codeInspection.NamingConventionBean;
import com.intellij.codeInspection.NamingConventionWithFallbackBean;
import com.intellij.psi.PsiClass;
import com.siyeh.InspectionGadgetsBundle;
@@ -27,7 +28,7 @@ public class InterfaceNamingConvention extends NamingConvention<PsiClass> {
@Override
public NamingConventionBean createDefaultBean() {
return new NamingConventionBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
return new NamingConventionWithFallbackBean("[A-Z][A-Za-z\\d]*", DEFAULT_MIN_LENGTH, DEFAULT_MAX_LENGTH);
}
@Override