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

maven: npe fix in dom

Browse Source
This commit is contained in:
Anton Makeev
2010-09-28 20:10:31 +04:00
parent c221d78fea
commit 5a8ed8b556
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
+7 -4
View File
@@ -46,7 +46,10 @@ public class MavenParentRelativePathConverter extends ResolvingConverter<PsiFile
public PsiFile fromString(@Nullable @NonNls String s, ConvertContext context) {
if (s == null) return null;
VirtualFile f = context.getFile().getVirtualFile().getParent().findFileByRelativePath(s);
VirtualFile contextFile = context.getFile().getVirtualFile();
if (contextFile == null) return null;
VirtualFile f = contextFile.getParent().findFileByRelativePath(s);
if (f == null) return null;
if (f.isDirectory()) f = f.findFileByRelativePath(MavenConstants.POM_XML);
@@ -58,9 +61,9 @@ public class MavenParentRelativePathConverter extends ResolvingConverter<PsiFile
@Override
public String toString(@Nullable PsiFile f, ConvertContext context) {
if (f == null) return null;
PsiFile currentPsiFile = context.getFile().getOriginalFile();
if (currentPsiFile == null) currentPsiFile = context.getFile();
VirtualFile currentFile = currentPsiFile.getVirtualFile();
VirtualFile currentFile = context.getFile().getOriginalFile().getVirtualFile();
if (currentFile == null) return null;
return MavenDomUtil.calcRelativePath(currentFile.getParent(), f.getVirtualFile());
}