From 12f30ce139ae340a9319c038e64915ff175c764d Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 24 Jun 2026 11:15:35 +0300
Subject: [PATCH] Reverting some message logging changes in JavaToolMonitor.

---
 .../impl/javaCompiler/JavaToolMonitor.java    | 58 +++++--------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/java-compiler-impl/src/main/java/consulo/java/compiler/impl/javaCompiler/JavaToolMonitor.java b/java-compiler-impl/src/main/java/consulo/java/compiler/impl/javaCompiler/JavaToolMonitor.java
index 89f060d79..6036b6300 100644
--- a/java-compiler-impl/src/main/java/consulo/java/compiler/impl/javaCompiler/JavaToolMonitor.java
+++ b/java-compiler-impl/src/main/java/consulo/java/compiler/impl/javaCompiler/JavaToolMonitor.java
@@ -5,6 +5,7 @@
 import consulo.application.util.concurrent.AppExecutorUtil;
 import consulo.compiler.CacheCorruptedException;
 import consulo.compiler.CompileContext;
+import consulo.compiler.CompilerMessageCategory;
 import consulo.compiler.localize.CompilerLocalize;
 import consulo.java.rt.common.compiler.JavaCompilerInterface;
 import consulo.localize.LocalizeValue;
@@ -114,26 +115,17 @@ public void dispose() {
 
     @Override
     public void logInfo(String message, String fileUri, long lineNumber, long columnNumber) throws TException {
-        new MessageBuilderWrapper(myCompileContext.newInfo(LocalizeValue.of(message)))
-            .url(fileUri)
-            .position((int) lineNumber, (int) columnNumber)
-            .add();
+        logMessage(CompilerMessageCategory.INFORMATION, message, fileUri, lineNumber, columnNumber);
     }
 
     @Override
     public void logError(String message, String fileUri, long lineNumber, long columnNumber) throws TException {
-        new MessageBuilderWrapper(myCompileContext.newError(LocalizeValue.of(message)))
-            .url(fileUri)
-            .position((int) lineNumber, (int) columnNumber)
-            .add();
+        logMessage(CompilerMessageCategory.ERROR, message, fileUri, lineNumber, columnNumber);
     }
 
     @Override
     public void logWarning(String message, String fileUri, long lineNumber, long columnNumber) throws TException {
-        new MessageBuilderWrapper(myCompileContext.newWarning(LocalizeValue.of(message)))
-            .url(fileUri)
-            .position((int) lineNumber, (int) columnNumber)
-            .add();
+        logMessage(CompilerMessageCategory.WARNING, message, fileUri, lineNumber, columnNumber);
     }
 
     @Override
@@ -176,39 +168,21 @@ public void fileWrote(String filePath) throws TException {
     //		}
     //	}
 
-    private class MessageBuilderWrapper implements CompileContext.MessageBuilder {
-        private final CompileContext.MessageBuilder myDelegate;
-
-        private MessageBuilderWrapper(CompileContext.MessageBuilder delegate) {
-            myDelegate = delegate;
-        }
-
-        @Override
-        public CompileContext.MessageBuilder url(String url) {
-            try {
-                VirtualFile fileByURL = VirtualFileUtil.findFileByURL(new URI(url).toURL());
-                if (fileByURL != null) {
-                    myDelegate.url(fileByURL.getUrl());
-                }
-            }
-            catch (Exception ignored) {
+    private void logMessage(CompilerMessageCategory category, String message, String fileUri, long lineNumber, long columnNumber) {
+        String fileUrl = null;
+        try {
+            URI uri = new URI(fileUri);
+            VirtualFile fileByURL = VirtualFileUtil.findFileByURL(uri.toURL());
+            if (fileByURL != null) {
+                fileUrl = fileByURL.getUrl();
             }
-            return this;
         }
-
-        @Override
-        public CompileContext.MessageBuilder position(int line, int column) {
-            return myDelegate.position(line, column);
+        catch (Exception ignored) {
         }
 
-        @Override
-        public CompileContext.MessageBuilder navigatable(Navigatable navigatable) {
-            return myDelegate.navigatable(navigatable);
-        }
-
-        @Override
-        public void add() {
-            myDelegate.add();
-        }
+        myCompileContext.newMessage(category, LocalizeValue.of(message))
+            .optionalUrl(fileUrl)
+            .position((int) lineNumber, (int) columnNumber)
+            .add();
     }
 }