Merge remote-tracking branch 'origin/master'

Author: VISTALL

aop-common/tests/com/intellij/aop/jam/AopModelTest.java

@@ -9,7 +9,7 @@
 import consulo.application.util.function.Processor;
 import consulo.language.editor.WriteCommandAction;
 import consulo.component.extension.Extensions;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
@@ -156,7 +156,7 @@ private PsiJavaFile createFile(final String text) {
       protected void run(Result<VirtualFile> result) throws Throwable {
         final VirtualFile file = myRoot.createChildData(this, "Aspects.java");
 
-        consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(file, text);
+        VirtualFileUtil.saveText(file, text);
         result.setResult(file);
       }
     }.execute().getResultObject();

aop-common/tests/com/intellij/aop/psi/AopInjectionTest.java

@@ -22,7 +22,7 @@
 import consulo.module.Module;
 import consulo.util.lang.ref.Ref;
 import consulo.document.util.TextRange;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.spring.aop.SpringAopInjector;
@@ -274,7 +274,7 @@ public void doneInjecting() {
 
   private XmlFile createXmlFile(final String text) throws IOException {
     final VirtualFile file = myFixture.getTempDirFixture().createFile("a.xml");
-    consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(file, text);
+    VirtualFileUtil.saveText(file, text);
     return (XmlFile)PsiManager.getInstance(getProject()).findFile(file);
   }
 

obsolete/spring-security/src/com/intellij/spring/security/references/SpringSecurityRolePsiReferenceProvider.java

@@ -1,7 +1,7 @@
 package com.intellij.spring.security.references;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLiteralExpression;
@@ -49,7 +49,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNu
   }
 
   public static PsiReference[] getSecurityRolesReferences(@NotNull PsiElement element, @Nullable String value) {
-    Module module = ModuleUtil.findModuleForPsiElement(element);
+    Module module = ModuleUtilCore.findModuleForPsiElement(element);
     if (module != null && !StringUtil.isEmptyOrSpaces(value)) {
         List<PsiReference> references = new ArrayList<PsiReference>();
         for (String token : StringUtil.tokenize(value, ",")) {

obsolete/spring-tests/tests/com/intellij/spring/model/jam/SpringJavaModelTest.java

@@ -4,7 +4,7 @@
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiJavaFile;
@@ -88,7 +88,7 @@ private PsiJavaFile createFile(final String text) {
       protected void run(Result<VirtualFile> result) throws Throwable {
         final VirtualFile file = myRoot.createChildData(this, "FooJavaConfig.java");
 
-        VfsUtil.saveText(file, text);
+        VirtualFileUtil.saveText(file, text);
         result.setResult(file);
       }
     }.execute().getResultObject();

obsolete/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceHandlerTest.java

@@ -16,7 +16,7 @@
 package com.intellij.spring.model.xml.custom;
 
 import consulo.ide.impl.idea.openapi.application.PathManager;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.XmlElementFactory;
@@ -292,7 +292,7 @@ private CustomBeanWrapper getWrapper(final XmlTag tag) {
 
   private XmlTag createTag(final String text) throws IncorrectOperationException {
     final XmlTag tag = XmlElementFactory.getInstance(myProject).createTagFromText(text);
-    tag.getContainingFile().putUserData(ModuleUtil.KEY_MODULE, myModule);
+    tag.getContainingFile().putUserData(ModuleUtilCore.KEY_MODULE, myModule);
     return tag;
   }
 }

obsolete/spring-tests/tests/com/intellij/spring/model/xml/custom/CustomNamespaceMetadataTest.java

@@ -6,7 +6,7 @@
 
 import com.intellij.javaee.ExternalResourceManager;
 import consulo.ide.impl.idea.openapi.application.PathManager;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
+import consulo.language.util.ModuleUtilCore;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.PsiClass;
@@ -160,7 +160,7 @@ private CustomBeanWrapper parse(final XmlTag tag) {
 
   private XmlTag createTag(final String text) throws IncorrectOperationException {
     final XmlTag tag = XmlElementFactory.getInstance(myProject).createTagFromText(text);
-    tag.getContainingFile().putUserData(ModuleUtil.KEY_MODULE, myModule);
+    tag.getContainingFile().putUserData(ModuleUtilCore.KEY_MODULE, myModule);
     return tag;
   }
 }

obsolete/spring-tests/tests/com/intellij/spring/model/xml/highlighting/SpringHighlightingPerformanceTest.java

@@ -9,7 +9,7 @@
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -36,7 +36,7 @@ protected void configureModule(final JavaModuleFixtureBuilder moduleBuilder) thr
 
   public void testLargeProject() throws Throwable {
     myFixture.copyFileToProject("performance.xml");
-    final String fileText = consulo.ide.impl.idea.openapi.vfs.VfsUtil.loadText(myFixture.getTempDirFixture().getFile("performance.xml"));
+    final String fileText = VirtualFileUtil.loadText(myFixture.getTempDirFixture().getFile("performance.xml"));
     final SpringFileSet fileSet = configureFileSet();
     final String path = myFixture.getTempDirFixture().getTempDirPath();
     final List<PsiFile> files = new ArrayList<PsiFile>();
@@ -45,7 +45,7 @@ public void testLargeProject() throws Throwable {
       final File file = new File(path, fileName);
       file.createNewFile();
       final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
-      VfsUtil.saveText(vFile, fileText);
+      VirtualFileUtil.saveText(vFile, fileText);
 
       fileSet.addFile(vFile);
       files.add(PsiManager.getInstance(myProject).findFile(vFile));

obsolete/web/src/com/intellij/spring/model/actions/patterns/dataAccess/JpaEntityManagerBeanGenerateProvider.java

@@ -13,7 +13,6 @@
 import com.intellij.jpa.facet.JpaFacet;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiDocumentManager;
@@ -77,7 +76,7 @@ public LookupElement[] calculateLookupItems(ExpressionContext context) {
         final Project project = context.getProject();
         final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument());
         if(psiFile == null) return LookupElement.EMPTY_ARRAY;
-        final Module module = ModuleUtil.findModuleForPsiElement(psiFile);
+        final Module module = psiFile.getModule();
 
         if(module == null) return LookupElement.EMPTY_ARRAY;
 

obsolete/web/src/com/intellij/spring/web/mvc/SpringMVCModel.java

@@ -8,7 +8,6 @@
 import com.intellij.javaee.web.facet.WebFacet;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import consulo.util.dataholder.Key;
 import consulo.ide.impl.idea.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.util.Pair;
@@ -59,7 +58,7 @@ public Result<SpringMVCModel> compute() {
 
   @Nullable
   public static SpringMVCModel getModel(final PsiElement element) {
-    final Module module = ModuleUtil.findModuleForPsiElement(element);
+    final Module module = element.getModule();
     if (module == null) {
       return null;
     }

obsolete/web/src/com/intellij/spring/web/mvc/SpringMVCVariablesProvider.java

@@ -1,7 +1,6 @@
 package com.intellij.spring.web.mvc;
 
 import com.intellij.openapi.module.Module;
-import consulo.ide.impl.idea.openapi.module.ModuleUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.impl.source.jsp.JspImplicitVariableImpl;
@@ -20,7 +19,7 @@
 public class SpringMVCVariablesProvider extends ElVariablesProvider {
 
   public boolean processImplicitVariables(@NotNull final PsiElement element, @NotNull final ELExpressionHolder containingFile, @NotNull final ELElementProcessor processor) {
-    final Module module = ModuleUtil.findModuleForPsiElement(containingFile);
+    final Module module = containingFile.getModule();
     if (module != null) {
       final Collection<SpringMVCModelAttribute> attributes = SpringMVCJamModel.getModel(module).getModelAttributes();
       for (SpringMVCModelAttribute attribute : attributes) {