From c12cfa652a45e14bd3e3d7f1080b8d18519db959 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 27 Jul 2010 21:06:29 +0400
Subject: [PATCH] javac2 for nested forms fixed

---
 .../javac2/src/com/intellij/ant/Javac2.java   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/java/compiler/javac2/src/com/intellij/ant/Javac2.java b/java/compiler/javac2/src/com/intellij/ant/Javac2.java
index 1eebd0171750..aea6261e8f2f 100644
--- a/java/compiler/javac2/src/com/intellij/ant/Javac2.java
+++ b/java/compiler/javac2/src/com/intellij/ant/Javac2.java
@@ -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) {