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

use utility method

Browse Source
This commit is contained in:
Dmitry Batkovich
2018-10-15 18:49:45 +03:00
parent 7212a00b15
commit 2bc422c2be
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceBundleKeyReference.java
+2 -11
View File
@@ -6,11 +6,8 @@ import com.intellij.lang.properties.PropertiesUtilBase;
import com.intellij.lang.properties.ResourceBundleManager;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiPlainTextFile;
import com.intellij.util.IncorrectOperationException;
@@ -29,13 +26,7 @@ public final class ResourceBundleKeyReference extends ReferenceInForm {
@Override
public PsiElement resolve() {
final Project project = myFile.getProject();
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
final VirtualFile formVirtualFile = myFile.getVirtualFile();
if (formVirtualFile == null) {
return null;
}
final Module module = fileIndex.getModuleForFile(formVirtualFile);
final Module module = ModuleUtilCore.findModuleForFile(myFile);
if (module == null) {
return null;
}
plugins/ui-designer/src/com/intellij/uiDesigner/binding/ResourceFileReference.java
+3 -12
View File
@@ -3,15 +3,12 @@
package com.intellij.uiDesigner.binding;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.module.ResourceFileUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiPlainTextFile;
import com.intellij.uiDesigner.FormEditingUtil;
import com.intellij.util.IncorrectOperationException;
@@ -29,13 +26,7 @@ public class ResourceFileReference extends ReferenceInForm {
@Override
@Nullable
public PsiElement resolve() {
final Project project = myFile.getProject();
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
final VirtualFile formVirtualFile = myFile.getVirtualFile();
if (formVirtualFile == null) {
return null;
}
final Module module = fileIndex.getModuleForFile(formVirtualFile);
final Module module = ModuleUtilCore.findModuleForFile(myFile);
if (module == null) {
return null;
}
@@ -43,7 +34,7 @@ public class ResourceFileReference extends ReferenceInForm {
if (formFile == null) {
return null;
}
return PsiManager.getInstance(project).findFile(formFile);
return myFile.getManager().findFile(formFile);
}
@Override