fixed NPE in Parser ( function catch() )

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / builder / AbstractImageBuilder.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
index 278d7a6..f760a22 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
@@ -14,11 +14,11 @@ import java.util.ArrayList;
 import java.util.Locale;
 
 import net.sourceforge.phpdt.core.IJavaModelMarker;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.IProblem;
-import net.sourceforge.phpdt.internal.compiler.Compiler;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
+import net.sourceforge.phpdt.internal.compiler.Compiler;
 import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
 import net.sourceforge.phpdt.internal.compiler.ICompilerRequestor;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
@@ -280,11 +280,11 @@ protected boolean isExcludedFromProject(IPath childPath) throws JavaModelExcepti
        if (childPath.segmentCount() > 2) return false; // is a subfolder of a package
 
        for (int j = 0, k = sourceLocations.length; j < k; j++) {
-               if (childPath.equals(sourceLocations[j].binaryFolder.getFullPath())) return true;
+//             if (childPath.equals(sourceLocations[j].binaryFolder.getFullPath())) return true;
                if (childPath.equals(sourceLocations[j].sourceFolder.getFullPath())) return true;
        }
        // skip default output folder which may not be used by any source folder
-       return childPath.equals(javaBuilder.javaProject.getOutputLocation());
+       return false; //childPath.equals(javaBuilder.javaProject.getOutputLocation());
 }
 
 /**