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

[Java. Logging] Fix JvmLoggingConfigurable id inconsistency and move loggers to the more appropriate folder

Browse Source 
IDEA-331693

GitOrigin-RevId: e0a14e8a37e04db91633ea25411093285eb62a4b
This commit is contained in:
Georgii Ustinov
2024-02-07 13:30:04 +00:00
committed by intellij-monorepo-bot
parent cc5c92a5b8
commit 7019bbd5df
19 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/META-INF/JavaPlugin.xml
+7 -7
View File
@@ -285,7 +285,7 @@
interface="com.intellij.jarRepository.JarRepositoryAuthenticationDataProvider" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.jpsServerAuthExtension" interface="com.intellij.compiler.cache.client.JpsServerAuthExtension" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.execution.applicationRunLineMarkerHider" interface="com.intellij.execution.ApplicationRunLineMarkerHider" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.logging.JvmLogger" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.lang.logging.JvmLogger" dynamic="true"/>
</extensionPoints>
<extensions defaultExtensionNs="com.intellij">
@@ -790,7 +790,7 @@
<projectConfigurable parentId="project.propDebugger" instance="com.intellij.debugger.settings.CaptureConfigurable"
key="async.stacktraces.configurable.display.name" bundle="messages.JavaDebuggerBundle"/>
<projectConfigurable id="jvm.logging" parentId="language" instance="com.intellij.settings.JvmLoggingConfigurable"
<projectConfigurable id="jvm.logging" parentId="language" instance="com.intellij.ui.logging.JvmLoggingConfigurable"
bundle="messages.JavaBundle" key="jvm.logging.configurable.display.name"/>
<xdebugger.attachDebuggerProvider implementation="com.intellij.debugger.impl.attach.JavaAttachDebuggerProvider"/>
@@ -918,11 +918,11 @@
<programRunner id="defaultDebugRunner" implementation="com.intellij.debugger.impl.GenericDebuggerRunner" order="last"/>
<jvm.logging implementation="com.intellij.logging.ApacheCommonsLogger"/>
<jvm.logging implementation="com.intellij.logging.Log4j2Logger"/>
<jvm.logging implementation="com.intellij.logging.Log4jLogger"/>
<jvm.logging implementation="com.intellij.logging.Slf4jLogger"/>
<jvm.logging implementation="com.intellij.logging.UnspecifiedLogger"/>
<jvm.logging implementation="com.intellij.lang.logging.ApacheCommonsLogger"/>
<jvm.logging implementation="com.intellij.lang.logging.Log4j2Logger"/>
<jvm.logging implementation="com.intellij.lang.logging.Log4jLogger"/>
<jvm.logging implementation="com.intellij.lang.logging.Slf4jLogger"/>
<jvm.logging implementation="com.intellij.lang.logging.UnspecifiedLogger"/>
<javaModuleSystem implementation="com.intellij.psi.impl.JavaPlatformModuleSystem"/>
<java.error.fix errorCode="lambda.variable.must.be.final" implementationClass="com.intellij.codeInspection.streamMigration.SimplifyForEachInspection$ForEachNonFinalFix"/>
java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt
+3 -3
View File
@@ -4,8 +4,8 @@ package com.intellij.codeInsight.generation
import com.intellij.codeInsight.CodeInsightActionHandler
import com.intellij.codeInsight.generation.ui.ChooseLoggerDialogWrapper
import com.intellij.java.JavaBundle
import com.intellij.logging.JvmLogger
import com.intellij.logging.UnspecifiedLogger
import com.intellij.lang.logging.JvmLogger
import com.intellij.lang.logging.UnspecifiedLogger
import com.intellij.openapi.application.WriteAction
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.components.service
@@ -21,7 +21,7 @@ import com.intellij.psi.util.parentsOfType
import com.intellij.refactoring.IntroduceTargetChooser
import com.intellij.refactoring.introduce.PsiIntroduceTarget
import com.intellij.refactoring.suggested.endOffset
import com.intellij.settings.JavaSettingsStorage
import com.intellij.ui.logging.JavaSettingsStorage
import org.jetbrains.java.generate.GenerationUtil
class GenerateLoggerHandler : CodeInsightActionHandler {
java/java-impl/src/com/intellij/codeInsight/generation/ui/ChooseLoggerDialogWrapper.kt
+3 -3
View File
@@ -7,9 +7,9 @@ import com.intellij.openapi.options.ShowSettingsUtil
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.ComboBox
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.settings.JavaLoggerModel
import com.intellij.settings.JavaSettingsStorage
import com.intellij.settings.JvmLoggingConfigurable
import com.intellij.ui.logging.JavaLoggerModel
import com.intellij.ui.logging.JavaSettingsStorage
import com.intellij.ui.logging.JvmLoggingConfigurable
import com.intellij.ui.dsl.builder.Cell
import com.intellij.ui.dsl.builder.panel
import org.jetbrains.annotations.Nls
java/java-impl/src/com/intellij/logging/ApacheCommonsLogger.kt → java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.siyeh.ig.psiutils.JavaLoggingUtils
java/java-impl/src/com/intellij/logging/JvmLogger.kt → java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt
+2 -2
View File
@@ -1,7 +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.logging
package com.intellij.lang.logging
import com.intellij.logging.UnspecifiedLogger.Companion.UNSPECIFIED_LOGGER_NAME
import com.intellij.lang.logging.UnspecifiedLogger.Companion.UNSPECIFIED_LOGGER_NAME
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
java/java-impl/src/com/intellij/logging/JvmLoggerFieldDelegate.kt → java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.intellij.java.library.JavaLibraryUtil
import com.intellij.openapi.module.Module
java/java-impl/src/com/intellij/logging/Log4j2Logger.kt → java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.siyeh.ig.psiutils.JavaLoggingUtils
java/java-impl/src/com/intellij/logging/Log4jLogger.kt → java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.siyeh.ig.psiutils.JavaLoggingUtils
java/java-impl/src/com/intellij/logging/Slf4jLogger.kt → java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.siyeh.ig.psiutils.JavaLoggingUtils
java/java-impl/src/com/intellij/logging/UnspecifiedLogger.kt → java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.logging
package com.intellij.lang.logging
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
java/java-impl/src/com/intellij/settings/JavaLoggerModel.kt → java/java-impl/src/com/intellij/ui/logging/JavaLoggerModel.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// 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.settings
package com.intellij.ui.logging
import javax.swing.AbstractListModel
import javax.swing.ComboBoxModel
java/java-impl/src/com/intellij/settings/JavaSettingsManager.kt → java/java-impl/src/com/intellij/ui/logging/JavaSettingsManager.kt
+2 -2
View File
@@ -1,7 +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.settings
package com.intellij.ui.logging
import com.intellij.logging.UnspecifiedLogger
import com.intellij.lang.logging.UnspecifiedLogger
import com.intellij.openapi.components.*
@Service(Service.Level.PROJECT)
java/java-impl/src/com/intellij/settings/JvmLoggingConfigurable.kt → java/java-impl/src/com/intellij/ui/logging/JvmLoggingConfigurable.kt
+4 -4
View File
@@ -1,10 +1,10 @@
// 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.settings
package com.intellij.ui.logging
import com.intellij.icons.AllIcons
import com.intellij.java.JavaBundle
import com.intellij.logging.JvmLogger
import com.intellij.logging.UnspecifiedLogger
import com.intellij.lang.logging.JvmLogger
import com.intellij.lang.logging.UnspecifiedLogger
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.application.ReadAction
import com.intellij.openapi.components.service
@@ -25,7 +25,7 @@ class JvmLoggingConfigurable(private val project: Project) : SearchableConfigura
override fun getDisplayName(): String = JavaBundle.message("jvm.logging.configurable.display.name")
override fun getId(): String = JavaBundle.message("jvm.logging.configurable.display.name")
override fun getId(): String = JavaBundle.message("jvm.logging.configurable.id")
override fun createComponent(): JComponent {
val isOnlyOnStartup = JvmLogger.getAllLoggersNames(settings.loggerName == UnspecifiedLogger.UNSPECIFIED_LOGGER_NAME)
java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateLoggerTest.kt
+2 -2
View File
@@ -3,18 +3,18 @@ package com.intellij.java.codeInsight
import com.intellij.JavaTestUtil
import com.intellij.codeInsight.generation.GenerateLoggerHandler
import com.intellij.logging.UnspecifiedLogger
import com.intellij.lang.logging.UnspecifiedLogger
import com.intellij.openapi.components.service
import com.intellij.openapi.ui.popup.JBPopup
import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiClass
import com.intellij.refactoring.introduce.PsiIntroduceTarget
import com.intellij.settings.JavaSettingsStorage
import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
import com.intellij.ui.UiInterceptors
import com.intellij.ui.UiInterceptors.UiInterceptor
import com.intellij.ui.components.JBList
import com.intellij.ui.logging.JavaSettingsStorage
import com.intellij.util.ui.UIUtil
import junit.framework.TestCase
import javax.swing.ListModel
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package de.plushnikov.intellij.plugin.logging
import com.intellij.java.library.JavaLibraryUtil
import com.intellij.logging.JvmLogger
import com.intellij.lang.logging.JvmLogger
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
import com.intellij.psi.JavaPsiFacade
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package de.plushnikov.intellij.plugin.logging
import com.intellij.logging.JvmLogger
import com.intellij.lang.logging.JvmLogger
import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokApacheCommonsLogger : JvmLogger by JvmLoggerAnnotationDelegate(
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package de.plushnikov.intellij.plugin.logging
import com.intellij.logging.JvmLogger
import com.intellij.lang.logging.JvmLogger
import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokLog4j2Logger : JvmLogger by JvmLoggerAnnotationDelegate(
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package de.plushnikov.intellij.plugin.logging
import com.intellij.logging.JvmLogger
import com.intellij.lang.logging.JvmLogger
import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokLog4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package de.plushnikov.intellij.plugin.logging
import com.intellij.logging.JvmLogger
import com.intellij.lang.logging.JvmLogger
import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokSlf4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(