diff --git a/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt b/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt index ddc07e751394..c0a8ecccaddb 100644 --- a/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt @@ -7,8 +7,9 @@ class ApacheCommonsLogger : JvmLogger by JvmLoggerFieldDelegate( JavaLoggingUtils.COMMONS_LOGGING_FACTORY, "getLog", "%s.class", + "Apache Commons Logging", JavaLoggingUtils.COMMONS_LOGGING, 100, ) { - override fun toString(): String = "Apache Commons Logging" + override fun toString(): String = id } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt b/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt index 6a7a8e9347eb..0bbb2272b448 100644 --- a/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt @@ -15,6 +15,10 @@ import org.jetbrains.annotations.ApiStatus */ @ApiStatus.Internal interface JvmLogger { + /** + * This field represents id of the logger which is used to save the logger the settings + */ + val id : String /** * This field represents fully qualified name of the logger's type */ diff --git a/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt b/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt index 7da62c6065dc..c3e5ce31a4be 100644 --- a/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt +++ b/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt @@ -21,6 +21,7 @@ class JvmLoggerFieldDelegate( private val factoryName: String, private val methodName: String, private val classNamePattern: String, + override val id: String, override val loggerTypeName: String, override val priority: Int, ) : JvmLogger { diff --git a/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt b/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt index d5e31db18cfb..2d5d042c4e2d 100644 --- a/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt @@ -7,8 +7,9 @@ class Log4j2Logger : JvmLogger by JvmLoggerFieldDelegate( JavaLoggingUtils.LOG4J2_FACTORY, "getLogger", "%s.class", + "Log4j2", JavaLoggingUtils.LOG4J2, 200, ) { - override fun toString(): String = "Log4j2" + override fun toString(): String = id } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt b/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt index 9b2ff0f6364a..4cb631a8c8ca 100644 --- a/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt @@ -7,8 +7,9 @@ class Log4jLogger : JvmLogger by JvmLoggerFieldDelegate( JavaLoggingUtils.LOG4J_FACTORY, "getLogger", "%s.class", + "Log4j", JavaLoggingUtils.LOG4J, 0, ) { - override fun toString(): String = "Log4j" + override fun toString(): String = id } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt b/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt index 5993e2e54ef0..cda6e90f9405 100644 --- a/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt @@ -7,8 +7,9 @@ class Slf4jLogger : JvmLogger by JvmLoggerFieldDelegate( JavaLoggingUtils.SLF4J_FACTORY, "getLogger", "%s.class", + "Slf4j", JavaLoggingUtils.SLF4J, 300, ) { - override fun toString(): String = "Slf4j" + override fun toString(): String = id } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt b/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt index 28476ea6bc27..fa651c37a5d7 100644 --- a/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt +++ b/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt @@ -1,6 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.lang.logging +import com.intellij.java.JavaBundle import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass @@ -11,6 +12,7 @@ import com.intellij.psi.PsiElement * "unspecified" state, e.g. where there is no preferred logger selected. */ class UnspecifiedLogger : JvmLogger { + override val id: String = UNSPECIFIED_LOGGER_NAME override val loggerTypeName: String = "Unspecified" override val priority: Int = 1000 @@ -27,7 +29,7 @@ class UnspecifiedLogger : JvmLogger { override fun createLogger(project: Project, clazz: PsiClass): PsiElement = throw UnsupportedOperationException() - override fun toString(): String = UNSPECIFIED_LOGGER_NAME + override fun toString(): String = JavaBundle.message("java.configurable.logger.unspecified") companion object { const val UNSPECIFIED_LOGGER_NAME: String = "Unspecified" diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties index b44a48d03ef5..dd3e9166e919 100644 --- a/java/openapi/resources/messages/JavaBundle.properties +++ b/java/openapi/resources/messages/JavaBundle.properties @@ -968,6 +968,7 @@ java.terms.of.interface={0} of interface {1} java.terms.static.initializer=static initializer java.terms.type.parameter=type parameter java.terms.variable.of.method={0} of {1} +java.configurable.logger.unspecified = Unspecified java.configurable.logger.not.found = Logger was not found inside the project javadoc.candidates.not.found=No candidates found for method call {0}. javadoc.constructor.candidates=Candidates for new {0}() are:
{1} diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt index c8543e25d029..b3c85197cfe6 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt @@ -21,6 +21,7 @@ import de.plushnikov.intellij.plugin.util.LombokLibraryUtil */ class JvmLoggerAnnotationDelegate( private val fieldLoggerName: String, + override val id: String, override val loggerTypeName: String, override val priority: Int ) : JvmLogger { diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt index 4ae79a9c7f99..dc8c44913877 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt @@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils class LombokApacheCommonsLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.COMMONS_LOGGING, + "Lombok Apache Commons Logging", LombokLoggingUtils.COMMONS_ANNOTATION, 500 ) { - override fun toString(): String = "Lombok Apache Commons Logging" + override fun toString(): String = id } \ No newline at end of file diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt index f58ceedaa915..e189eb945220 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt @@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils class LombokLog4j2Logger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.LOG4J2, + "Lombok Log4j2", LombokLoggingUtils.LOG4J2_ANNOTATION, 600 ) { - override fun toString(): String = "Lombok Log4j2" + override fun toString(): String = id } \ No newline at end of file diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt index 22f39862fb0e..f435360aa4f0 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt @@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils class LombokLog4jLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.LOG4J, + "Lombok Log4j", LombokLoggingUtils.LOG4J_ANNOTATION, 400 ) { - override fun toString(): String = "Lombok Log4j" + override fun toString(): String = id } \ No newline at end of file diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt index 78f8d058edea..f21ebb5e2228 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt @@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils class LombokSlf4jLogger : JvmLogger by JvmLoggerAnnotationDelegate( JavaLoggingUtils.SLF4J, + "Lombok Slf4j", LombokLoggingUtils.SLF4J_ANNOTATION, 700 ) { - override fun toString(): String = "Lombok SLf4j" + override fun toString(): String = id } \ No newline at end of file