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

javac2 for nested forms fixed

Browse Source
This commit is contained in:
nik
2010-07-27 21:07:10 +04:00
parent 5354b9e3cb
commit c12cfa652a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/javac2/src/com/intellij/ant/Javac2.java
+16 -5
View File
@@ -516,12 +516,23 @@ public class Javac2 extends Javac {
}
}
if (myNestedFormDirs != null) {
for(Iterator it = myNestedFormDirs.iterator(); it.hasNext(); ) {
String path = (String) it.next();
if (path.replace(File.separatorChar, '/').toLowerCase().endsWith(formFileFullName)) {
return loadForm(formFileName, new FileInputStream(path));
}
String[] list = myNestedFormDirs.list();
for (int i = 0, listLength = list.length; i < listLength; i++) {
String formPath = list[i];
if (!formPath.endsWith("/")) {
formPath += "/";
}
if (formFileFullName.startsWith("/")) {
formPath += formFileName.substring(1);
}
else {
formPath += formFileName;
}
File formFile = new File(formPath.replace('/', File.separatorChar));
if (formFile.isFile()) {
return loadForm(formFileName, new FileInputStream(formFile));
}
}
}
InputStream resourceStream = myLoader.getResourceAsStream(formFileName);
if (resourceStream != null) {