X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java index 07fbf2f..7da81a6 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java @@ -11,6 +11,7 @@ package net.sourceforge.phpdt.internal.core; import net.sourceforge.phpdt.core.IClasspathEntry; +import net.sourceforge.phpdt.core.IJavaProject; import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.internal.core.util.Util; @@ -41,7 +42,7 @@ class JavaProjectElementInfo extends OpenableElementInfo { * The searchable builder environment facility used * with this project (doubles as the builder environment). */ - protected SearchableEnvironment fSearchableEnvironment = null; +// protected SearchableEnvironment fSearchableEnvironment = null; /** * A array with all the non-java resources contained by this PackageFragment @@ -95,17 +96,17 @@ class JavaProjectElementInfo extends OpenableElementInfo { String resName = res.getName(); // ignore a jar file on the classpath -// if (Util.isArchiveFileName(resName) && this.isClasspathEntryOrOutputLocation(resFullPath, classpath, projectOutput)) { +// if (ProjectPrefUtil.isArchiveFileName(resName) && this.isClasspathEntryOrOutputLocation(resFullPath, classpath, projectOutput)) { // break; // } // ignore .java file if src == project if (srcIsProject -// && Util.isValidCompilationUnitName(resName) +// && ProjectPrefUtil.isValidCompilationUnitName(resName) && !Util.isExcluded(res, exclusionPatterns)) { break; } // ignore .class file if bin == project -// if (binIsProject && Util.isValidClassFileName(resName)) { +// if (binIsProject && ProjectPrefUtil.isValidClassFileName(resName)) { // break; // } // else add non java resource @@ -180,10 +181,10 @@ class JavaProjectElementInfo extends OpenableElementInfo { /** * @see IJavaProject */ - protected SearchableEnvironment getSearchableEnvironment() { - - return fSearchableEnvironment; - } +// protected SearchableEnvironment getSearchableEnvironment() { +// +// return fSearchableEnvironment; +// } /* * Returns whether the given path is a classpath entry or an output location. */ @@ -208,7 +209,7 @@ class JavaProjectElementInfo extends OpenableElementInfo { // Reinitialize the searchable name environment since it caches // the name lookup. - fSearchableEnvironment = null; +// fSearchableEnvironment = null; } /** @@ -219,8 +220,8 @@ class JavaProjectElementInfo extends OpenableElementInfo { fNonJavaResources = resources; } - protected void setSearchableEnvironment(SearchableEnvironment newSearchableEnvironment) { - - fSearchableEnvironment = newSearchableEnvironment; - } +// protected void setSearchableEnvironment(SearchableEnvironment newSearchableEnvironment) { +// +// fSearchableEnvironment = newSearchableEnvironment; +// } }