replace Logger.getInstance(#fqn) with Logger.getInstance(klass.class) to reduce constant pool and code size and make code more refactorable

GitOrigin-RevId: 4ef94813858973e44449a20cf8b09174c8df5fce
2026-09-27 10:03:11 +07:00 · 2019-11-07 17:02:46 +00:00
parent c62079c40c
commit 850cf546dc
1334 changed files with 1348 additions and 1349 deletions
@@ -1033,6 +1033,10 @@
        <constraint name="__context__" script="&quot;import com.intellij.psi.*&#10;import com.intellij.psi.search.GlobalSearchScope&#10;import com.intellij.psi.util.PsiUtil&#10;&#10;def project = __context__.getProject();&#10;def fqn = c.getValue().substring(1);&#10;if (fqn.indexOf('.') == -1) return false;&#10;def shortName = com.intellij.openapi.util.text.StringUtil.getShortName(fqn);&#10;if (!shortName.equals(com.intellij.openapi.util.text.StringUtil.capitalize(shortName))) return false;&#10;&#10;def cClass = JavaPsiFacade.getInstance(project).findClass(fqn, GlobalSearchScope.allScope(project));&#10; cClass == null&#10;&quot;" target="true" within="" contains="" />
        <constraint name="c" within="" contains="" />
      </searchConfiguration>
+      <replaceConfiguration name="can simplify Logger.getInstance" text="Logger.getInstance(&quot;#$c$&quot;)" recursive="false" caseInsensitive="true" type="JAVA" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="true" replacement="Logger.getInstance($c$.class)">
+        <constraint name="__context__" script="&quot;import com.intellij.psi.*&#10;import com.intellij.psi.search.GlobalSearchScope&#10;import com.intellij.psi.util.PsiUtil&#10;&#10;def project = __context__.getProject();&#10;def cClass = JavaPsiFacade.getInstance(project).findClass(c.getValue().substring(1), GlobalSearchScope.allScope(project));&#10;def cVirtualFile = c==null?null:PsiUtil.getVirtualFile(cClass);&#10;&#10;cVirtualFile != null &amp;&amp;  &#10;__context__.getContainingFile().getResolveScope().contains(cVirtualFile)&#10;&quot;" target="true" within="" contains="" />
+        <constraint name="c" within="" contains="" />
+      </replaceConfiguration>
    </inspection_tool>
    <inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="SeamAnnotationIncorrectSignatureInspection" enabled="false" level="ERROR" enabled_by_default="false" />
@@ -67,7 +67,7 @@ import static org.jetbrains.jps.model.serialization.java.compiler.JpsJavaCompile

@State(name = "CompilerConfiguration", storages = @Storage("compiler.xml"))
 public class CompilerConfigurationImpl extends CompilerConfiguration implements PersistentStateComponent<Element>, ProjectComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerConfiguration");
+  private static final Logger LOG = Logger.getInstance(CompilerConfiguration.class);

  public static final String TESTS_EXTERNAL_COMPILER_HOME_PROPERTY_NAME = "tests.external.compiler.home";
  public static final int DEFAULT_BUILD_PROCESS_HEAP_SIZE = 700;
@@ -55,7 +55,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;

 public class CompilerManagerImpl extends CompilerManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerManagerImpl");
+  private static final Logger LOG = Logger.getInstance(CompilerManagerImpl.class);

  private final Project myProject;

@@ -24,7 +24,7 @@ import com.intellij.task.ProjectTaskManager;
 import org.jetbrains.annotations.NotNull;

 public class MakeModuleAction extends CompileActionBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.actions.MakeModuleAction");
+  private static final Logger LOG = Logger.getInstance(MakeModuleAction.class);

  @Override
  protected void doAction(DataContext dataContext, Project project) {
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.UUID;

 public class CompileContextImpl extends UserDataHolderBase implements CompileContextEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileContextImpl");
+  private static final Logger LOG = Logger.getInstance(CompileContextImpl.class);
  private final Project myProject;
  private final CompilerTask myBuildSession;
  private final MessagesContainer myMessages;
@@ -62,7 +62,7 @@ import java.util.concurrent.TimeUnit;
 import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;

 public class CompileDriver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver");
+  private static final Logger LOG = Logger.getInstance(CompileDriver.class);

  private static final Key<Boolean> COMPILATION_STARTED_AUTOMATICALLY = Key.create("compilation_started_automatically");
  private static final Key<ExitStatus> COMPILE_SERVER_BUILD_STATUS = Key.create("COMPILE_SERVER_BUILD_STATUS");
@@ -36,7 +36,7 @@ import java.util.Map;
 * @author Eugene Zhuravlev
 */
 public class CompilerCacheManager implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompilerCacheManager");
+  private static final Logger LOG = Logger.getInstance(CompilerCacheManager.class);
  private final Map<Compiler, Object> myCompilerToCacheMap = new HashMap<>();
  private final List<Disposable> myCacheDisposables = new ArrayList<>();
  private final File myCachesRoot;
@@ -22,7 +22,7 @@ import java.util.HashSet;
 * @author Jeka
 */
 public class CompilerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompilerUtil");
+  private static final Logger LOG = Logger.getInstance(CompilerUtil.class);

  public static String quotePath(String path) {
    if (path != null && path.indexOf(' ') != -1) {
@@ -22,7 +22,7 @@ import java.util.List;
 * @author Eugene Zhuravlev
 */
 public class FileProcessingCompilerAdapterTask implements CompileTask {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.FileProcessingCompilerAdapterTask");
+  private static final Logger LOG = Logger.getInstance(FileProcessingCompilerAdapterTask.class);

  private final FileProcessingCompiler myCompiler;

@@ -29,7 +29,7 @@ import java.io.*;
 import java.util.Collection;

 public class FileProcessingCompilerStateCache {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.FileProcessingCompilerStateCache");
+  private static final Logger LOG = Logger.getInstance(FileProcessingCompilerStateCache.class);
  private final StateCache<MyState> myCache;

  public FileProcessingCompilerStateCache(File storeDirectory, final ValidityStateFactory stateFactory) throws IOException {
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;

 public class OneProjectItemCompileScope extends ExportableUserDataHolderBase implements CompileScope{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.OneProjectItemCompileScope");
+  private static final Logger LOG = Logger.getInstance(OneProjectItemCompileScope.class);
  private final Project myProject;
  private final VirtualFile myFile;
  private final String myUrl;
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
 * @author Eugene Zhuravlev
 */
 public class FilePathActionJavac extends JavacParserAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.javaCompiler.javac.FilePathActionJavac");
+  private static final Logger LOG = Logger.getInstance(FilePathActionJavac.class);
  private final Matcher myJdk7FormatMatcher;

  public FilePathActionJavac(final Matcher matcher) {
@@ -37,7 +37,7 @@ import java.util.*;
 import static com.intellij.compiler.options.CompilerOptionsFilter.Setting;

 public class CompilerUIConfigurable implements SearchableConfigurable, Configurable.NoScroll {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerUIConfigurable");
+  private static final Logger LOG = Logger.getInstance(CompilerUIConfigurable.class);

  private static final Set<Setting> EXTERNAL_BUILD_SETTINGS = EnumSet.of(
    Setting.EXTERNAL_BUILD, Setting.AUTO_MAKE, Setting.PARALLEL_COMPILATION, Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE,
@@ -115,7 +115,7 @@ public final class BuildManager implements Disposable {
  private static final Key<CharSequence> STDERR_OUTPUT = Key.create("_process_launch_errors_");
  private static final SimpleDateFormat USAGE_STAMP_DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy");

-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildManager");
+  private static final Logger LOG = Logger.getInstance(BuildManager.class);
  private static final String COMPILER_PROCESS_JDK_PROPERTY = "compiler.process.jdk";
  public static final String SYSTEM_ROOT = "compile-server";
  public static final String TEMP_DIR_NAME = "_temp_";
@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
 */
@ChannelHandler.Sharable
 class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineRemoteProto.Message> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildMessageDispatcher");
+  private static final Logger LOG = Logger.getInstance(BuildMessageDispatcher.class);

  private static final AttributeKey<SessionData> SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData");

@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 * @author Eugene Zhuravlev
 */
 public abstract class DefaultMessageHandler implements BuilderMessageHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.DefaultMessageHandler");
+  private static final Logger LOG = Logger.getInstance(DefaultMessageHandler.class);
  private final Project myProject;
  private final ExecutorService myTaskExecutor = SequentialTaskExecutor.createSequentialApplicationPoolExecutor(
    "DefaultMessageHandler Pool");
@@ -26,7 +26,7 @@ import java.util.jar.JarFile;
 * @author nik
 */
 public class BuildProcessClasspathManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.impl.BuildProcessClasspathManager");
+  private static final Logger LOG = Logger.getInstance(BuildProcessClasspathManager.class);

  private List<String> myCompileServerPluginsClasspath;

@@ -41,7 +41,7 @@ import java.util.*;
 */
@State(name = ArtifactManagerImpl.COMPONENT_NAME, storages = @Storage(value = "artifacts", stateSplitter = ArtifactManagerStateSplitter.class))
 public class ArtifactManagerImpl extends ArtifactManager implements PersistentStateComponent<ArtifactManagerState>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.artifacts.ArtifactManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ArtifactManagerImpl.class);
  @NonNls public static final String COMPONENT_NAME = "ArtifactManager";
  @NonNls public static final String PACKAGING_ELEMENT_NAME = "element";
  @NonNls public static final String TYPE_ID_ATTRIBUTE = "id";
@@ -46,7 +46,7 @@ import java.util.*;
 * @author nik
 */
 public class JarFromModulesTemplate extends ArtifactTemplate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.artifacts.JarFromModulesTemplate");
+  private static final Logger LOG = Logger.getInstance(JarFromModulesTemplate.class);

  private final PackagingElementResolvingContext myContext;

@@ -27,7 +27,7 @@ import java.util.List;
 * @author nik
 */
 public class ArtifactPackagingElement extends ComplexPackagingElement<ArtifactPackagingElement.ArtifactPackagingElementState> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.elements.ArtifactPackagingElement");
+  private static final Logger LOG = Logger.getInstance(ArtifactPackagingElement.class);
  private final Project myProject;
  private ArtifactPointer myArtifactPointer;
  @NonNls public static final String ARTIFACT_NAME_ATTRIBUTE = "artifact-name";
@@ -59,7 +59,7 @@ import java.util.jar.Manifest;
 * @author nik
 */
 public class ManifestFileUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorContextImpl");
+  private static final Logger LOG = Logger.getInstance(ManifestFileUtil.class);
  public static final String MANIFEST_PATH = JarFile.MANIFEST_NAME;
  public static final String MANIFEST_FILE_NAME = PathUtil.getFileName(MANIFEST_PATH);
  public static final String MANIFEST_DIR_NAME = PathUtil.getParentPath(MANIFEST_PATH);
@@ -34,7 +34,7 @@ import java.util.List;
 * @author nik
 */
 public class PackagingElementFactoryImpl extends PackagingElementFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.elements.PackagingElementFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(PackagingElementFactoryImpl.class);
  public static final PackagingElementType<DirectoryPackagingElement> DIRECTORY_ELEMENT_TYPE = new DirectoryElementType();
  public static final PackagingElementType<ArchivePackagingElement> ARCHIVE_ELEMENT_TYPE = new ArchiveElementType();
  public static final PackagingElementType<FileCopyPackagingElement> FILE_COPY_ELEMENT_TYPE = new FileCopyElementType();
@@ -55,7 +55,7 @@ import java.util.List;
 * @author nik
 */
 public class PackageFileWorker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.ui.actions.PackageFileWorker");
+  private static final Logger LOG = Logger.getInstance(PackageFileWorker.class);
  private final File myFile;
  private final String myRelativeOutputPath;
  private final boolean myPackIntoArchives;
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;

@State(name = "CompilerWorkspaceConfiguration", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class CompilerWorkspaceConfiguration implements PersistentStateComponent<CompilerWorkspaceConfiguration> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerWorkspaceConfiguration");
+  private static final Logger LOG = Logger.getInstance(CompilerWorkspaceConfiguration.class);

  static {
    LOG.info("Available processors: " + Runtime.getRuntime().availableProcessors());
@@ -25,7 +25,7 @@ import java.util.*;
 * @author dsl
 */
 public final class ModuleCompilerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.ModuleCompilerUtil");
+  private static final Logger LOG = Logger.getInstance(ModuleCompilerUtil.class);
  private ModuleCompilerUtil() { }

  @NotNull
@@ -28,7 +28,7 @@ import java.util.regex.Matcher;
 */
@SuppressWarnings({"HardCodedStringLiteral"})
 public class JavacOutputParserTest extends TestCase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.JavacOutputParserTest");
+  private static final Logger LOG = Logger.getInstance(JavacOutputParserTest.class);
  private static final ResourceBundle ourBundle;

  static {
@@ -56,7 +56,7 @@ import static com.intellij.openapi.actionSystem.PlatformDataKeys.CONTEXT_COMPONE
 * @author Jeka
 */
 public class JavaMarkObjectActionHandler extends MarkObjectActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.JavaMarkObjectActionHandler");
+  private static final Logger LOG = Logger.getInstance(JavaMarkObjectActionHandler.class);
  public static final long AUTO_MARKUP_REFERRING_OBJECTS_LIMIT = 100L; // todo: some reasonable limit

  @Override
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 public class JumpToObjectAction extends DebuggerAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.JumpToObjectAction");
+  private static final Logger LOG = Logger.getInstance(JumpToObjectAction.class);
  @Override
  public void actionPerformed(@NotNull AnActionEvent e) {
    DebuggerTreeNodeImpl selectedNode = getSelectedNode(e.getDataContext());
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;

 public class ViewAsGroup extends ActionGroup implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.ViewAsGroup");
+  private static final Logger LOG = Logger.getInstance(ViewAsGroup.class);

  private volatile AnAction[] myChildren = AnAction.EMPTY_ARRAY;

@@ -19,6 +19,7 @@ import com.intellij.debugger.SourcePosition;
 import com.intellij.debugger.engine.evaluation.DefaultCodeFragmentFactory;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.jdi.StackFrameProxy;
+import com.intellij.debugger.impl.PositionUtil;
 import com.intellij.debugger.jdi.LocalVariableProxyImpl;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
 import com.intellij.openapi.application.ReadAction;
@@ -34,7 +35,7 @@ import java.util.List;

 public class ContextUtil {
  public static final Key<Boolean> IS_JSP_IMPLICIT = new Key<>("JspImplicit");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.PositionUtil");
+  private static final Logger LOG = Logger.getInstance(PositionUtil.class);

  @Nullable
  public static SourcePosition getSourcePosition(@Nullable final StackFrameContext context) {
@@ -88,7 +88,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;

 public abstract class DebugProcessImpl extends UserDataHolderBase implements DebugProcess {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.DebugProcessImpl");
+  private static final Logger LOG = Logger.getInstance(DebugProcessImpl.class);

  @NonNls private static final String SOCKET_ATTACHING_CONNECTOR_NAME = "com.sun.jdi.SocketAttach";
  @NonNls private static final String SHMEM_ATTACHING_CONNECTOR_NAME = "com.sun.jdi.SharedMemoryAttach";
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;

 public class JVMNameUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.JVMNameUtil");
+  private static final Logger LOG = Logger.getInstance(JVMNameUtil.class);

  public static final String CONSTRUCTOR_NAME = "<init>";

@@ -43,7 +43,7 @@ import java.util.function.Consumer;
 * @author lex
 */
 public class PositionManagerImpl implements PositionManager, MultiRequestPositionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.PositionManagerImpl");
+  private static final Logger LOG = Logger.getInstance(PositionManagerImpl.class);

  private final DebugProcessImpl myDebugProcess;

@@ -27,7 +27,7 @@ public class RequestHint {
  public static final int STOP = 0;
  public static final int RESUME = -100;

-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.RequestHint");
+  private static final Logger LOG = Logger.getInstance(RequestHint.class);
  @MagicConstant (intValues = {StepRequest.STEP_MIN, StepRequest.STEP_LINE})
  private final int mySize;
  @MagicConstant (intValues = {StepRequest.STEP_INTO, StepRequest.STEP_OVER, StepRequest.STEP_OUT})
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 * @author lex
 */
 public abstract class SuspendContextImpl extends XSuspendContext implements SuspendContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendContextImpl");
+  private static final Logger LOG = Logger.getInstance(SuspendContextImpl.class);

  private final DebugProcessImpl myDebugProcess;
  private final int mySuspendPolicy;
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 * @author lex
 */
 public class SuspendManagerImpl implements SuspendManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendManager");
+  private static final Logger LOG = Logger.getInstance(SuspendManager.class);

  private final Deque<SuspendContextImpl> myEventContexts = new ConcurrentLinkedDeque<>();
  /**
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.stream.Collectors;

 public class SuspendManagerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendManagerUtil");
+  private static final Logger LOG = Logger.getInstance(SuspendManagerUtil.class);

  public static boolean isEvaluating(SuspendManager suspendManager, ThreadReferenceProxyImpl thread) {
    for (SuspendContextImpl suspendContext : suspendManager.getEventContexts()) {
@@ -20,7 +20,7 @@ import com.sun.jdi.*;
 import org.jetbrains.annotations.NotNull;

 class BinaryExpressionEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.BinaryExpressionEvaluator");
+  private static final Logger LOG = Logger.getInstance(BinaryExpressionEvaluator.class);
  private final Evaluator myLeftOperand;
  private final Evaluator myRightOperand;
  private final IElementType myOpType;
@@ -16,7 +16,7 @@ import java.util.Map;
 * @author lex
 */
 public class CodeFragmentEvaluator extends BlockStatementEvaluator{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.CodeFragmentEvaluator");
+  private static final Logger LOG = Logger.getInstance(CodeFragmentEvaluator.class);

  private final CodeFragmentEvaluator myParentFragmentEvaluator;
  private final Map<String, Object> mySyntheticLocals = new HashMap<>();
@@ -74,7 +74,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
  }

  private static class Builder extends JavaElementVisitor {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilderImpl");
+    private static final Logger LOG = Logger.getInstance(EvaluatorBuilderImpl.class);
    private Evaluator myResult = null;
    private PsiClass myContextPsiClass;
    private CodeFragmentEvaluator myCurrentFragmentEvaluator;
@@ -24,7 +24,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.sun.jdi.Value;

 public class ExpressionEvaluatorImpl implements ExpressionEvaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.ExpressionEvaluator");
+  private static final Logger LOG = Logger.getInstance(ExpressionEvaluator.class);
  private final Evaluator myEvaluator;

  public ExpressionEvaluatorImpl(Evaluator evaluator) {
@@ -16,7 +16,7 @@ import com.sun.jdi.ObjectReference;
 import com.sun.jdi.Value;

 class InstanceofEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.InstanceofEvaluator");
+  private static final Logger LOG = Logger.getInstance(InstanceofEvaluator.class);
  private final Evaluator myOperandEvaluator;
  private final TypeEvaluator myTypeEvaluator;

@@ -44,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Map;

 class LocalVariableEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.LocalVariableEvaluator");
+  private static final Logger LOG = Logger.getInstance(LocalVariableEvaluator.class);

  private final String myLocalVariableName;
  private EvaluationContextImpl myContext;
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import java.util.List;

 public class MethodEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.MethodEvaluator");
+  private static final Logger LOG = Logger.getInstance(MethodEvaluator.class);
  private final JVMName myClassName;
  private final JVMName myMethodSignature;
  private final String myMethodName;
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.Arrays;

 class NewArrayInstanceEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.NewArrayInstanceEvaluator");
+  private static final Logger LOG = Logger.getInstance(NewArrayInstanceEvaluator.class);
  private final Evaluator myArrayTypeEvaluator;
  private final Evaluator myDimensionEvaluator;
  private final Evaluator myInitializerEvaluator;
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
 * @author lex
 */
 public class SyntheticVariableEvaluator implements Evaluator{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.SyntheticVariableEvaluator");
+  private static final Logger LOG = Logger.getInstance(SyntheticVariableEvaluator.class);

  private final CodeFragmentEvaluator myCodeFragmentEvaluator;
  private final String myLocalName;
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 * @author Eugene Zhuravlev
 */
 public class MethodReturnValueWatcher implements OverheadProducer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.requests.MethodReturnValueWatcher");
+  private static final Logger LOG = Logger.getInstance(MethodReturnValueWatcher.class);
  private @Nullable Method myLastExecutedMethod;
  private @Nullable Value myLastMethodReturnValue;

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;


 public final class DebuggerContextImpl implements DebuggerContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerContextImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerContextImpl.class);

  public static final DebuggerContextImpl EMPTY_CONTEXT = createDebuggerContext(null, null, null, null);

@@ -41,7 +41,7 @@ import java.util.*;

@State(name = "DebuggerManager", storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)})
 public class DebuggerManagerImpl extends DebuggerManagerEx implements PersistentStateComponent<Element> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerManagerImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerManagerImpl.class);
  public static final String LOCALHOST_ADDRESS_FALLBACK = "127.0.0.1";

  private final Project myProject;
@@ -60,7 +60,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;

 public class DebuggerSession implements AbstractDebuggerSession {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerSession");
+  private static final Logger LOG = Logger.getInstance(DebuggerSession.class);
  // flags
  private final MyDebuggerStateManager myContextManager;

@@ -69,7 +69,7 @@ import java.util.function.Function;
 import java.util.regex.PatternSyntaxException;

 public abstract class DebuggerUtilsEx extends DebuggerUtils {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsEx");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtilsEx.class);

  /**
   * @param context
@@ -49,7 +49,7 @@ import java.util.stream.Stream;

 public class DebuggerUtilsImpl extends DebuggerUtilsEx{
  public static final Key<PsiType> PSI_TYPE_KEY = Key.create("PSI_TYPE_KEY");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtilsImpl.class);

  @Override
  public PsiExpression substituteThis(PsiExpression expressionWithThis, PsiExpression howToEvaluateThis, Value howToEvaluateThisValue, StackFrameContext context)
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;


 public class EventQueue<E> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.EventQueue");
+  private static final Logger LOG = Logger.getInstance(EventQueue.class);

  private final LinkedList[] myEvents;
  private final ReentrantLock myLock;
@@ -20,7 +20,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

 public class GenericDebuggerParametersRunnerConfigurable extends SettingsEditor<GenericDebuggerRunnerSettings> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.GenericDebuggerParametersRunnerConfigurable");
+  private static final Logger LOG = Logger.getInstance(GenericDebuggerParametersRunnerConfigurable.class);
  private JPanel myPanel;
  private JTextField myAddressField;
  private JPanel myShMemPanel;
@@ -17,7 +17,7 @@ import java.util.concurrent.*;
 * @author lex
 */
 public abstract class InvokeThread<E extends PrioritizedTask> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.InvokeThread");
+  private static final Logger LOG = Logger.getInstance(InvokeThread.class);

  private static final ThreadLocal<WorkerThreadRequest> ourWorkerRequest = new ThreadLocal<>();

@@ -38,7 +38,7 @@ import java.util.stream.IntStream;
 * @author lex
 */
 class ReloadClassesWorker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.ReloadClassesWorker");
+  private static final Logger LOG = Logger.getInstance(ReloadClassesWorker.class);
  private final DebuggerSession  myDebuggerSession;
  private final HotSwapProgress  myProgress;

@@ -43,7 +43,7 @@ import java.util.List;
 * @author egor
 */
 public class SourceCodeChecker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.SourceCodeChecker");
+  private static final Logger LOG = Logger.getInstance(SourceCodeChecker.class);

  private SourceCodeChecker() {
  }
@@ -22,7 +22,7 @@ import com.sun.jdi.ArrayReference;
 import org.jetbrains.annotations.NotNull;

 public final class ArrayItemData extends DescriptorData<ArrayElementDescriptorImpl>{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.descriptors.data.ArrayItemData");
+  private static final Logger LOG = Logger.getInstance(ArrayItemData.class);

  private final ArrayReference myArray;
  private final int myIndex;
@@ -79,7 +79,7 @@ import java.util.*;
      return map;
 */
 public class LocalVariablesUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.LocalVariablesUtil");
+  private static final Logger LOG = Logger.getInstance(LocalVariablesUtil.class);

  private static final boolean ourInitializationOk;
  private static Class<?> ourSlotInfoClass;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;

 public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.StackFrameProxyImpl");
+  private static final Logger LOG = Logger.getInstance(StackFrameProxyImpl.class);
  private static final int FRAMES_BATCH_MAX = 10;
  private final ThreadReferenceProxyImpl myThreadProxy;
  private final int myFrameFromBottomIndex; // 1-based
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NonNls;
 import java.util.List;

 public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl implements ThreadGroupReferenceProxy{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.ThreadGroupReferenceProxyImpl");
+  private static final Logger LOG = Logger.getInstance(ThreadGroupReferenceProxyImpl.class);
  //caches
  private ThreadGroupReferenceProxyImpl myParentThreadGroupProxy;
  private boolean myIsParentGroupCached = false;
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;

 public final class ThreadReferenceProxyImpl extends ObjectReferenceProxyImpl implements ThreadReferenceProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.ThreadReferenceProxyImpl");
+  private static final Logger LOG = Logger.getInstance(ThreadReferenceProxyImpl.class);
  // cached data
  private String myName;
  private int                       myFrameCount = -1;
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

 public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.VirtualMachineProxyImpl");
+  private static final Logger LOG = Logger.getInstance(VirtualMachineProxyImpl.class);
  private final DebugProcessImpl myDebugProcess;
  private final VirtualMachine myVirtualMachine;
  private int myTimeStamp = 0;
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;

 public class RendererConfiguration implements Cloneable, JDOMExternalizable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.settings.NodeRendererSettings");
+  private static final Logger LOG = Logger.getInstance(NodeRendererSettings.class);

  private static final int VERSION = 8;

@@ -67,7 +67,7 @@ import java.util.Map;
 import java.util.function.Consumer;

 public class BreakpointManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.BreakpointManager");
+  private static final Logger LOG = Logger.getInstance(BreakpointManager.class);

  @NonNls private static final String MASTER_BREAKPOINT_TAG_NAME = "master_breakpoint";
  @NonNls private static final String SLAVE_BREAKPOINT_TAG_NAME = "slave_breakpoint";
@@ -37,7 +37,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaBreakpointProperti
 import javax.swing.*;

 public abstract class BreakpointWithHighlighter<P extends JavaBreakpointProperties> extends Breakpoint<P> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.BreakpointWithHighlighter");
+  private static final Logger LOG = Logger.getInstance(BreakpointWithHighlighter.class);

  @Nullable
  private SourcePosition mySourcePosition;
@@ -40,7 +40,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaExceptionBreakpoin
 import javax.swing.*;

 public class ExceptionBreakpoint extends Breakpoint<JavaExceptionBreakpointProperties> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint");
+  private static final Logger LOG = Logger.getInstance(ExceptionBreakpoint.class);

  protected final static String READ_NO_CLASS_NAME = DebuggerBundle.message("error.absent.exception.breakpoint.class.name");
  public static final @NonNls Key<ExceptionBreakpoint> CATEGORY = BreakpointCategory.lookup("exception_breakpoints");
@@ -43,7 +43,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaFieldBreakpointPro
 import javax.swing.*;

 public class FieldBreakpoint extends BreakpointWithHighlighter<JavaFieldBreakpointProperties> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.FieldBreakpoint");
+  private static final Logger LOG = Logger.getInstance(FieldBreakpoint.class);
  private boolean myIsStatic;

  @NonNls public static final Key<FieldBreakpoint> CATEGORY = BreakpointCategory.lookup("field_breakpoints");
@@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;

 public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakpointProperties> implements MethodBreakpointBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.MethodBreakpoint");
+  private static final Logger LOG = Logger.getInstance(MethodBreakpoint.class);
  @Nullable private JVMName mySignature;
  private boolean myIsStatic;

@@ -21,7 +21,7 @@ import java.util.List;
 * @author Eugene Zhuravlev
 */
 public class StepIntoBreakpoint extends RunToCursorBreakpoint {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.StepIntoBreakpoint");
+  private static final Logger LOG = Logger.getInstance(StepIntoBreakpoint.class);
  @NotNull private final BreakpointStepMethodFilter myFilter;
  @Nullable private RequestHint myHint;

@@ -53,7 +53,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;

 public class WildcardMethodBreakpoint extends Breakpoint<JavaMethodBreakpointProperties> implements MethodBreakpointBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint");
+  private static final Logger LOG = Logger.getInstance(ExceptionBreakpoint.class);

  public WildcardMethodBreakpoint(Project project, XBreakpoint<JavaMethodBreakpointProperties> breakpoint) {
    super(project, breakpoint);
@@ -30,7 +30,7 @@ import java.util.Enumeration;
 import java.util.List;

 public class ThreadsDebuggerTree extends DebuggerTree {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.ThreadsDebuggerTree");
+  private static final Logger LOG = Logger.getInstance(ThreadsDebuggerTree.class);

  public ThreadsDebuggerTree(Project project) {
    super(project);
@@ -25,7 +25,7 @@ import com.intellij.openapi.diagnostic.Logger;


 public final class DefaultNodeDescriptor extends NodeDescriptorImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.DefaultNodeDescriptor");
+  private static final Logger LOG = Logger.getInstance(DefaultNodeDescriptor.class);
  public boolean equals(Object obj) {
    return obj instanceof DefaultNodeDescriptor;
  }
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.HashMap;

 public class NodeDescriptorFactoryImpl implements NodeDescriptorFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.NodeDescriptorFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(NodeDescriptorFactoryImpl.class);
  private DescriptorTree myCurrentHistoryTree = new DescriptorTree(true);

  private DescriptorTreeSearcher myDescriptorSearcher;
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;

 public abstract class NodeDescriptorImpl implements NodeDescriptor {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl");
+  protected static final Logger LOG = Logger.getInstance(NodeDescriptorImpl.class);

  public static final String UNKNOWN_VALUE_MESSAGE = "";
  public boolean myIsExpanded = false;
@@ -55,7 +55,7 @@ import java.awt.event.MouseEvent;
 import java.util.Collections;

 public class ArrayRenderer extends NodeRendererImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ArrayRenderer");
+  private static final Logger LOG = Logger.getInstance(ArrayRenderer.class);

  public static final @NonNls String UNIQUE_ID = "ArrayRenderer";

@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 public final class BasicRendererProperties implements Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.BasicRendererProperties");
+  private static final Logger LOG = Logger.getInstance(BasicRendererProperties.class);

  private static final @NonNls String NAME_OPTION = "NAME";
  private String myName;
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;

 public class BatchEvaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.BatchEvaluator");
+  private static final Logger LOG = Logger.getInstance(BatchEvaluator.class);

  private final DebugProcess myDebugProcess;
  private boolean myBatchEvaluatorChecked;
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.Set;

 public class ClassRenderer extends NodeRendererImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ClassRenderer");
+  private static final Logger LOG = Logger.getInstance(ClassRenderer.class);

  public static final @NonNls String UNIQUE_ID = "ClassRenderer";

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;

 public class CompoundTypeRenderer extends CompoundNodeRenderer {
  public static final @NonNls String UNIQUE_ID = "CompoundTypeRenderer";
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.CompoundReferenceRenderer");
+  protected static final Logger LOG = Logger.getInstance(CompoundReferenceRenderer.class);
  private static final AutoToStringRenderer AUTO_TO_STRING_RENDERER = new AutoToStringRenderer();

  public CompoundTypeRenderer(NodeRendererSettings rendererSettings,
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;

 public class HexRenderer extends NodeRendererImpl {
  public static final @NonNls String UNIQUE_ID = "HexRenderer";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.HexRenderer");
+  private static final Logger LOG = Logger.getInstance(HexRenderer.class);

  public HexRenderer() {
    super(DEFAULT_NAME, false);
@@ -11,7 +11,7 @@ import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;

 public abstract class TypeRenderer implements Renderer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ReferenceRenderer");
+  private static final Logger LOG = Logger.getInstance(ReferenceRenderer.class);
  protected BasicRendererProperties myProperties = new BasicRendererProperties(false);

  protected TypeRenderer() {
@@ -24,7 +24,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;

 public abstract class SourcePosition implements Navigatable{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.SourcePosition");
+  private static final Logger LOG = Logger.getInstance(SourcePosition.class);
  @NotNull
  public abstract PsiFile getFile();

@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;

 public abstract class DebuggerUtils {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.DebuggerUtils");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtils.class);
  private static final Key<Method> TO_STRING_METHOD_KEY = new Key<>("CachedToStringMethod");
  public static final Set<String> ourPrimitiveTypeNames = ContainerUtil.set(
    "byte", "short", "int", "long", "float", "double", "boolean", "char"
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
 * @author Eugene Zhuravlev
 */
 public abstract class JSR45PositionManager<Scope> implements PositionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.JSR45PositionManager");
+  private static final Logger LOG = Logger.getInstance(JSR45PositionManager.class);
  protected final DebugProcess      myDebugProcess;
  protected final Scope myScope;
  private final String myStratumId;
@@ -21,7 +21,7 @@ import com.sun.jdi.ObjectReference;
 import org.jetbrains.annotations.Nullable;

 public class EvaluateException extends Exception {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.EvaluateException");
+  private static final Logger LOG = Logger.getInstance(EvaluateException.class);
  private ObjectReference myTargetException;

  public EvaluateException(final String message) {
@@ -37,7 +37,7 @@ import javax.swing.*;
 * @author spleaner
 */
 public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBeforeRun.MakeBeforeRunTask> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompileStepBeforeRun");
+  private static final Logger LOG = Logger.getInstance(CompileStepBeforeRun.class);
  public static final Key<MakeBeforeRunTask> ID = Key.create("Make");
  /**
   * @deprecated to be removed in IDEA 2020.1
@@ -35,7 +35,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 public class YourkitFilter implements Filter{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.filters.YourkitFilter");
+  private static final Logger LOG = Logger.getInstance(YourkitFilter.class);

  private final Project myProject;

@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 * @author Eugene Zhuravlev
 */
 class DropJShellStateAction extends AnAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.jshell.ExecuteJShellAction");
+  private static final Logger LOG = Logger.getInstance(ExecuteJShellAction.class);
  private static final AnAction ourInstance = new DropJShellStateAction();

  private DropJShellStateAction() {
@@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicReference;
 * @author Eugene Zhuravlev
 */
 public class JShellHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.jshell.JShellHandler");
+  private static final Logger LOG = Logger.getInstance(JShellHandler.class);
  private static final int DEBUG_PORT = -1;
  public static final Key<JShellHandler> MARKER_KEY = Key.create("JShell console key");
  private static final Charset ourCharset = StandardCharsets.UTF_8;
@@ -31,7 +31,7 @@ import java.util.Iterator;
 // Author: dyoma

 public class MethodLocation extends Location<PsiMethod> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.junit2.info.MethodLocation");
+  private static final Logger LOG = Logger.getInstance(MethodLocation.class);
  private final Project myProject;
  @NotNull private final PsiMethod myMethod;
  private final Location<? extends PsiClass> myClassLocation;
@@ -33,7 +33,7 @@ import java.util.HashSet;
 import java.util.Set;

 public class ResetConfigurationModuleAdapter extends HyperlinkAdapter {
-  private static final Logger LOG = Logger.getInstance("#" + ResetConfigurationModuleAdapter.class);
+  private static final Logger LOG = Logger.getInstance(ResetConfigurationModuleAdapter.class);
  private final Project myProject;
  private final boolean myIsDebug;
  private final ToolWindowManager myToolWindowManager;
@@ -43,7 +43,7 @@ import java.util.*;
 * @author nik
 */
 public class ProjectFacetsConfigurator implements FacetsProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ProjectFacetsConfigurator");
+  private static final Logger LOG = Logger.getInstance(ProjectFacetsConfigurator.class);
  private final Map<Module, ModifiableFacetModel> myModifiableModels = new HashMap<>();
  private final Map<Facet, FacetEditorImpl> myEditors = new LinkedHashMap<>();
  private final Map<Module, FacetTreeModel> myTreeModels = new HashMap<>();
@@ -33,7 +33,7 @@ import java.util.List;
 * @author nik
 */
 public class FacetTreeModel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.FacetTreeModel");
+  private static final Logger LOG = Logger.getInstance(FacetTreeModel.class);
  private static final FacetInfo ROOT = new FacetInfo(null, "", null, null);
  private final List<FacetInfo> myFacetInfos = new ArrayList<>();
  private final BidirectionalMap<FacetInfo, FacetInfo> myParents = new BidirectionalMap<>();
@@ -26,7 +26,7 @@ import java.util.TreeMap;
 * @author nik
 */
 public class AddFacetToModuleAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.actions.AddFacetToModuleAction");
+  private static final Logger LOG = Logger.getInstance(AddFacetToModuleAction.class);
  private final FacetEditorFacade myEditor;
  private final Project myProject;
  private final FacetType myType;
@@ -49,7 +49,7 @@ import java.util.List;
 * @author Dmitry Avdeev
 */
 public class DownloadingOptionsDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.libraries.DownloadingOptionsDialog");
+  private static final Logger LOG = Logger.getInstance(DownloadingOptionsDialog.class);

  private enum AdditionalDownloadType {SOURCES, DOCUMENTATION}

@@ -57,7 +57,7 @@ import java.util.List;
 * @author Dmitry Avdeev
 */
 public class LibraryOptionsPanel implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.libraries.LibraryOptionsPanel");
+  private static final Logger LOG = Logger.getInstance(LibraryOptionsPanel.class);

  private JBLabel myMessageLabel;
  private JPanel myPanel;
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
 * @author nik
 */
 public class AddFrameworkSupportInProjectStructureAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.addSupport.impl.AddFrameworkSupportInProjectStructureAction");
+  private static final Logger LOG = Logger.getInstance(AddFrameworkSupportInProjectStructureAction.class);
  private final FrameworkTypeEx myFrameworkType;
  private final FrameworkSupportInModuleProvider myProvider;
  @NotNull private final ModuleStructureConfigurable myModuleStructureConfigurable;
@@ -39,7 +39,7 @@ import java.net.URL;
 * @author nik
 */
 public class DownloadableLibraryServiceImpl extends DownloadableLibraryService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.library.impl.DownloadableLibraryServiceImpl");
+  private static final Logger LOG = Logger.getInstance(DownloadableLibraryServiceImpl.class);

  @NotNull
  @Override
@@ -24,7 +24,7 @@ import java.util.*;
 * @author nik
 */
 public class FrameworkSupportUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.frameworkSupport.FrameworkSupportUtil");
+  private static final Logger LOG = Logger.getInstance(FrameworkSupportUtil.class);

  private FrameworkSupportUtil() {
  }
--- a/Show More
+++ b/Show More