fix compile after api move

plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java

@@ -28,6 +28,7 @@
 import consulo.application.Application;
 import consulo.application.Result;
 import consulo.application.util.function.Processor;
+import consulo.application.util.logging.LoggerUtil;
 import consulo.codeEditor.Editor;
 import consulo.codeEditor.EditorColors;
 import consulo.codeEditor.LogicalPosition;
@@ -49,9 +50,6 @@
 import consulo.fileChooser.FileChooserDescriptorFactory;
 import consulo.fileChooser.IdeaFileChooser;
 import consulo.fileEditor.FileEditorManager;
-import consulo.ide.impl.idea.diagnostic.LogMessageEx;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
-import consulo.ide.impl.idea.util.ui.OptionsMessageDialog;
 import consulo.language.codeStyle.CodeStyleSettingsManager;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.WriteCommandAction;
@@ -74,6 +72,7 @@
 import consulo.project.localize.ProjectLocalize;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.awt.DialogWrapper;
+import consulo.ui.ex.awt.OptionsMessageDialog;
 import consulo.ui.ex.awt.UIUtil;
 import consulo.ui.ex.popup.BaseListPopupStep;
 import consulo.ui.ex.popup.JBPopupFactory;
@@ -93,6 +92,7 @@
 import consulo.virtualFileSystem.event.VirtualFileCopyEvent;
 import consulo.virtualFileSystem.event.VirtualFileEvent;
 import consulo.virtualFileSystem.event.VirtualFileMoveEvent;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import consulo.xml.ide.highlighter.XmlFileType;
 import consulo.xml.psi.XmlElementFactory;
 import consulo.xml.psi.xml.XmlDocument;
@@ -273,7 +273,7 @@ private static XmlFile findXmlFileInRoot(@Nullable List<XmlFile> xmlFiles, @Nonn
       for (XmlFile xmlFile : xmlFiles) {
         VirtualFile vf = xmlFile.getVirtualFile();
         if (vf != null) {
-          if (VfsUtilCore.isAncestor(root, vf, false)) {
+          if (VirtualFileUtil.isAncestor(root, vf, false)) {
             return xmlFile;
           }
         }
@@ -326,7 +326,7 @@ public Image getIconFor(final VirtualFile aValue) {
   @Nonnull
   private static VirtualFile[] filterByReadOnliness(@Nonnull VirtualFile[] files) {
     List<VirtualFile> result = ContainerUtil.filter(files, VirtualFile::isInLocalFileSystem);
-    return VfsUtilCore.toVirtualFileArray(result);
+    return VirtualFileUtil.toVirtualFileArray(result);
   }
 
   @RequiredWriteAction
@@ -771,7 +771,7 @@ private XmlFile createAnnotationsXml(@Nonnull VirtualFile root, @NonNls @Nonnull
   @RequiredReadAction
   protected void duplicateError(@Nonnull PsiFile file, @Nonnull String externalName, @Nonnull String text) {
     String message = text + "; for signature: '" + externalName + "' in the file " + file.getVirtualFile().getPresentableUrl();
-    LogMessageEx.error(LOG, message, file.getText());
+    LoggerUtil.error(LOG, message, file.getText());
   }
 
   private static class MyExternalPromptDialog extends OptionsMessageDialog {

plugin/src/main/java/com/intellij/java/impl/cyclicDependencies/ui/CyclicDependenciesPanel.java

@@ -30,7 +30,6 @@
 import consulo.ide.impl.idea.packageDependencies.DependenciesToolWindow;
 import consulo.ide.impl.idea.packageDependencies.DependencyUISettings;
 import consulo.ide.impl.idea.packageDependencies.ui.*;
-import consulo.ide.impl.idea.ui.SmartExpander;
 import consulo.java.language.impl.JavaIcons;
 import consulo.language.editor.scope.localize.AnalysisScopeLocalize;
 import consulo.language.psi.PsiElement;
@@ -44,6 +43,7 @@
 import consulo.ui.ex.awt.*;
 import consulo.ui.ex.awt.speedSearch.TreeSpeedSearch;
 import consulo.ui.ex.awt.tree.ColoredTreeCellRenderer;
+import consulo.ui.ex.awt.tree.SmartExpander;
 import consulo.ui.ex.awt.tree.Tree;
 import consulo.ui.ex.awt.tree.TreeUtil;
 import consulo.ui.ex.content.Content;

plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/ui/MigrationPanel.java

@@ -32,7 +32,6 @@
 import consulo.disposer.Disposer;
 import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.ide.impl.idea.ui.DuplicateNodeRenderer;
-import consulo.ide.impl.idea.ui.SmartExpander;
 import consulo.language.editor.WriteCommandAction;
 import consulo.language.editor.refactoring.localize.RefactoringLocalize;
 import consulo.language.psi.PsiBundle;
@@ -48,6 +47,7 @@
 import consulo.ui.ex.awt.*;
 import consulo.ui.ex.awt.speedSearch.TreeSpeedSearch;
 import consulo.ui.ex.awt.tree.ColoredTreeCellRenderer;
+import consulo.ui.ex.awt.tree.SmartExpander;
 import consulo.ui.ex.awt.tree.Tree;
 import consulo.ui.ex.awt.tree.TreeUtil;
 import consulo.ui.ex.content.Content;

plugin/src/main/java/com/intellij/java/impl/slicer/SlicePanel.java

@@ -21,11 +21,11 @@
 import consulo.dataContext.TypeSafeDataProvider;
 import consulo.disposer.Disposable;
 import consulo.disposer.Disposer;
-import consulo.ide.impl.idea.openapi.wm.ex.ToolWindowManagerEx;
 import consulo.ide.localize.IdeLocalize;
 import consulo.navigation.Navigatable;
 import consulo.project.Project;
 import consulo.project.ui.view.tree.AbstractTreeNode;
+import consulo.project.ui.wm.ToolWindowManager;
 import consulo.project.ui.wm.ToolWindowManagerListener;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.action.*;
@@ -97,7 +97,7 @@ public void toolWindowRegistered(@Nonnull String id) {
       }
 
       @Override
-      public void stateChanged() {
+      public void stateChanged(ToolWindowManager toolWindowManager) {
         if (!project.isOpen()) {
           return;
         }
@@ -107,8 +107,7 @@ public void stateChanged() {
         }
       }
     };
-    ToolWindowManagerEx.getInstanceEx(project).addToolWindowManagerListener(listener);
-    Disposer.register(this, () -> ToolWindowManagerEx.getInstanceEx(project).removeToolWindowManagerListener(listener));
+    project.getMessageBus().connect(this).subscribe(ToolWindowManagerListener.class, listener);
 
     project.getApplication().assertIsDispatchThread();
     myProject = project;