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

fix Android test running under linux

Browse Source
This commit is contained in:
Eugene Kudelevsky
2010-11-13 20:07:09 +03:00
parent c07833f610
commit 12cba6310e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java
+8 -7
View File
@@ -74,17 +74,18 @@ public class AndroidRootUtil {
@Nullable
public static VirtualFile getFileByRelativeModulePath(Module module, String relativePath, boolean lookInContentRoot) {
String moduleDirPath = new File(module.getModuleFilePath()).getParent();
if (moduleDirPath == null) return null;
String absPath = FileUtil.toSystemIndependentName(moduleDirPath + relativePath);
VirtualFile file = LocalFileSystem.getInstance().findFileByPath(absPath);
if (file != null) {
return file;
if (moduleDirPath != null) {
String absPath = FileUtil.toSystemIndependentName(moduleDirPath + relativePath);
VirtualFile file = LocalFileSystem.getInstance().findFileByPath(absPath);
if (file != null) {
return file;
}
}
if (lookInContentRoot) {
for (VirtualFile contentRoot : ModuleRootManager.getInstance(module).getContentRoots()) {
absPath = FileUtil.toSystemIndependentName(contentRoot.getPath() + relativePath);
file = LocalFileSystem.getInstance().findFileByPath(absPath);
String absPath = FileUtil.toSystemIndependentName(contentRoot.getPath() + relativePath);
VirtualFile file = LocalFileSystem.getInstance().findFileByPath(absPath);
if (file != null) {
return file;
}