From df421b0b253cc0cd87e0d20f51c5e81ed9b535d2 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 22 Jan 2019 17:28:20 +0100 Subject: [PATCH] IG: add log4j 2 logger default (IDEA-196735) --- .../logging/ClassWithMultipleLoggersInspection.java | 13 ++++++------- .../ig/logging/ClassWithoutLoggerInspection.java | 3 ++- .../ig/logging/NonStaticFinalLoggerInspection.java | 3 ++- .../PublicMethodWithoutLoggingInspection.java | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithMultipleLoggersInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithMultipleLoggersInspection.java index 34b3e709aee3..da771bd41cc1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithMultipleLoggersInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithMultipleLoggersInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2019 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,6 @@ */ package com.siyeh.ig.logging; -import com.intellij.codeInspection.ui.ListTable; -import com.intellij.codeInspection.ui.ListWrappingTableModel; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.*; @@ -42,16 +40,17 @@ public class ClassWithMultipleLoggersInspection extends BaseInspection { public String loggerNamesString = "java.util.logging.Logger" + ',' + "org.slf4j.Logger" + ',' + "org.apache.commons.logging.Log" + ',' + - "org.apache.log4j.Logger"; + "org.apache.log4j.Logger" + ',' + + "org.apache.logging.log4j.Logger"; public ClassWithMultipleLoggersInspection() { - parseString(this.loggerNamesString, this.loggerNames); + parseString(loggerNamesString, loggerNames); } @Override public JComponent createOptionsPanel() { - final ListTable table = new ListTable(new ListWrappingTableModel(loggerNames, InspectionGadgetsBundle.message("logger.class.name"))); - return UiUtils.createAddRemoveTreeClassChooserPanel(table, InspectionGadgetsBundle.message("choose.logger.class")); + return UiUtils.createTreeClassChooserList(loggerNames, InspectionGadgetsBundle.message("logger.class.name"), + InspectionGadgetsBundle.message("choose.logger.class")); } @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithoutLoggerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithoutLoggerInspection.java index 3a1e9dfdab76..877560ebf394 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithoutLoggerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/ClassWithoutLoggerInspection.java @@ -50,7 +50,8 @@ public class ClassWithoutLoggerInspection extends BaseInspection { public String loggerNamesString = "java.util.logging.Logger" + ',' + "org.slf4j.Logger" + ',' + "org.apache.commons.logging.Log" + ',' + - "org.apache.log4j.Logger"; + "org.apache.log4j.Logger" + ',' + + "org.apache.logging.log4j.Logger"; /** * @noinspection PublicField */ diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/NonStaticFinalLoggerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/NonStaticFinalLoggerInspection.java index 7375160d496c..9b6e137143cb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/NonStaticFinalLoggerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/NonStaticFinalLoggerInspection.java @@ -38,7 +38,8 @@ public class NonStaticFinalLoggerInspection extends BaseInspection { public String loggerClassName = "java.util.logging.Logger" + ',' + "org.slf4j.Logger" + ',' + "org.apache.commons.logging.Log" + ',' + - "org.apache.log4j.Logger"; + "org.apache.log4j.Logger" + ',' + + "org.apache.logging.log4j.Logger"; public NonStaticFinalLoggerInspection() { parseString(loggerClassName, loggerClassNames); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/PublicMethodWithoutLoggingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/PublicMethodWithoutLoggingInspection.java index 9872c05688e0..d3d050a97941 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/PublicMethodWithoutLoggingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/PublicMethodWithoutLoggingInspection.java @@ -37,7 +37,8 @@ public class PublicMethodWithoutLoggingInspection extends BaseInspection { public String loggerClassName = "java.util.logging.Logger" + ',' + "org.slf4j.Logger" + ',' + "org.apache.commons.logging.Log" + ',' + - "org.apache.log4j.Logger"; + "org.apache.log4j.Logger" + ',' + + "org.apache.logging.log4j.Logger"; public PublicMethodWithoutLoggingInspection() { parseString(loggerClassName, loggerClassNames);