loggerFactoryMethodNames = new ArrayList();
+ @Override
@NotNull
public String getDisplayName() {
- return InspectionGadgetsBundle.message(
- "logger.initialized.with.foreign.class.display.name");
+ return InspectionGadgetsBundle.message("logger.initialized.with.foreign.class.display.name");
}
+ @Override
@NotNull
protected String buildErrorString(Object... infos) {
- return InspectionGadgetsBundle.message(
- "logger.initialized.with.foreign.class.problem.descriptor");
+ return InspectionGadgetsBundle.message("logger.initialized.with.foreign.class.problem.descriptor");
}
@Override
public JComponent createOptionsPanel() {
- return new Form().getContentPanel();
+ final ListTable table = new ListTable(
+ new ListWrappingTableModel(Arrays.asList(loggerFactoryClassNames, loggerFactoryMethodNames),
+ InspectionGadgetsBundle.message("logger.factory.class.names"),
+ InspectionGadgetsBundle.message("logger.factory.methods.name")));
+ return UiUtils.createAddRemovePanel(table);
}
+ @Override
@Nullable
protected InspectionGadgetsFix buildFix(Object... infos) {
return new LoggerInitializedWithForeignClassFix((String)infos[0]);
}
- private static class LoggerInitializedWithForeignClassFix
- extends InspectionGadgetsFix {
+ private static class LoggerInitializedWithForeignClassFix extends InspectionGadgetsFix {
private final String newClassName;
@@ -73,6 +88,7 @@ public class LoggerInitializedWithForeignClassInspection
this.newClassName = newClassName;
}
+ @Override
@NotNull
public String getName() {
return InspectionGadgetsBundle.message(
@@ -80,28 +96,26 @@ public class LoggerInitializedWithForeignClassInspection
newClassName);
}
- protected void doFix(Project project, ProblemDescriptor descriptor)
- throws IncorrectOperationException {
+ @Override
+ protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
final PsiElement element = descriptor.getPsiElement();
if (!(element instanceof PsiClassObjectAccessExpression)) {
return;
}
- final PsiClassObjectAccessExpression classObjectAccessExpression =
- (PsiClassObjectAccessExpression)element;
- replaceExpression(classObjectAccessExpression,
- newClassName + ".class");
+ final PsiClassObjectAccessExpression classObjectAccessExpression = (PsiClassObjectAccessExpression)element;
+ replaceExpression(classObjectAccessExpression, newClassName + ".class");
}
}
+ @Override
public BaseInspectionVisitor buildVisitor() {
return new LoggerInitializedWithForeignClassVisitor();
}
- private class LoggerInitializedWithForeignClassVisitor
- extends BaseInspectionVisitor {
+ private class LoggerInitializedWithForeignClassVisitor extends BaseInspectionVisitor {
- public void visitClassObjectAccessExpression(
- PsiClassObjectAccessExpression expression) {
+ @Override
+ public void visitClassObjectAccessExpression(PsiClassObjectAccessExpression expression) {
super.visitClassObjectAccessExpression(expression);
final PsiElement parent = expression.getParent();
if (!(parent instanceof PsiExpressionList)) {
@@ -111,10 +125,13 @@ public class LoggerInitializedWithForeignClassInspection
if (!(grandParent instanceof PsiMethodCallExpression)) {
return;
}
- final PsiMethodCallExpression methodCallExpression =
- (PsiMethodCallExpression)grandParent;
- final PsiClass containingClass = PsiTreeUtil.getParentOfType(
- expression, PsiClass.class);
+ final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent;
+ final PsiExpressionList argumentList = methodCallExpression.getArgumentList();
+ final PsiExpression[] expressions = argumentList.getExpressions();
+ if (expressions.length != 1) {
+ return;
+ }
+ final PsiClass containingClass = PsiTreeUtil.getParentOfType(expression, PsiClass.class);
if (containingClass == null) {
return;
}
@@ -122,19 +139,23 @@ public class LoggerInitializedWithForeignClassInspection
if (containingClassName == null) {
return;
}
- final PsiReferenceExpression methodExpression =
- methodCallExpression.getMethodExpression();
- final String referenceName = methodExpression.getReferenceName();
- if (!loggerFactoryMethodName.equals(referenceName)) {
- return;
- }
final PsiMethod method = methodCallExpression.resolveMethod();
if (method == null) {
return;
}
final PsiClass aClass = method.getContainingClass();
+ if (aClass == null) {
+ return;
+ }
final String className = aClass.getQualifiedName();
- if (!loggerClassName.equals(className)) {
+ final int index = loggerFactoryClassNames.indexOf(className);
+ if (index < 0) {
+ return;
+ }
+ final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+ final String referenceName = methodExpression.getReferenceName();
+ final String loggerFactoryMethodName = loggerFactoryMethodNames.get(index);
+ if (!loggerFactoryMethodName.equals(referenceName)) {
return;
}
final PsiTypeElement operand = expression.getOperand();
@@ -154,60 +175,20 @@ public class LoggerInitializedWithForeignClassInspection
}
}
- class Form {
-
- private JPanel contentPanel;
- private JTextField loggerClassNameTextField;
- private JTextField loggerFactoryMethodNameTextField;
-
- Form() {
- loggerClassNameTextField.setText(loggerClassName);
- final DocumentListener listener = new DocumentListener() {
-
- public void changedUpdate(DocumentEvent e) {
- textChanged();
- }
-
- public void insertUpdate(DocumentEvent e) {
- textChanged();
- }
-
- public void removeUpdate(DocumentEvent e) {
- textChanged();
- }
-
- private void textChanged() {
- loggerClassName = loggerClassNameTextField.getText();
- }
- };
- final Document document = loggerClassNameTextField.getDocument();
- document.addDocumentListener(listener);
- loggerFactoryMethodNameTextField.setText(loggerFactoryMethodName);
- final DocumentListener factoryListener = new DocumentListener() {
-
- public void changedUpdate(DocumentEvent e) {
- textChanged();
- }
-
- public void insertUpdate(DocumentEvent e) {
- textChanged();
- }
-
- public void removeUpdate(DocumentEvent e) {
- textChanged();
- }
-
- private void textChanged() {
- loggerClassName = loggerClassNameTextField.getText();
- }
- };
- final Document factoryDocument =
- loggerFactoryMethodNameTextField.getDocument();
- factoryDocument.addDocumentListener(factoryListener);
- }
-
- public JComponent getContentPanel() {
- return contentPanel;
+ @Override
+ public void readSettings(Element element) throws InvalidDataException {
+ super.readSettings(element);
+ parseString(loggerClassName, loggerFactoryClassNames);
+ parseString(loggerFactoryMethodName, loggerFactoryMethodNames);
+ if (loggerFactoryClassNames.size() != loggerFactoryMethodNames.size()) {
+ parseString(DEFAULT_LOGGER_CLASS_NAMES, loggerFactoryClassNames);
+ parseString(DEFAULT_FACTORY_METHOD_NAMES, loggerFactoryMethodNames);
}
}
-}
+
+ @Override
+ public void writeSettings(Element element) throws WriteExternalException {
+ loggerClassName = formatString(loggerFactoryClassNames);
+ loggerFactoryMethodName = formatString(loggerFactoryMethodNames);
+ super.writeSettings(element);
+ }}
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/LoggerInitializedWithForeignClass.html b/plugins/InspectionGadgets/src/inspectionDescriptions/LoggerInitializedWithForeignClass.html
index c3571ad76388..86cacf6d8abc 100644
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/LoggerInitializedWithForeignClass.html
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/LoggerInitializedWithForeignClass.html
@@ -1,8 +1,10 @@
-This inspection reports any Loggers which are
-initialized with a class literal from a different class than the Logger
+This inspection reports any Loggers which are initialized with a class literal from a different class than the Logger
is contained in.
+
+
+Use the table below to specify the logger factory classes and logger factory methods recognized by this inspection.
New in 8, Powered by InspectionGadgets