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 53e57d0..3714834 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
@@ -10,15 +10,15 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import net.sourceforge.phpdt.core.IClasspathEntry;
+//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;
+//import net.sourceforge.phpdt.core.JavaModelException;
+//import net.sourceforge.phpdt.internal.core.util.Util;
 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
+//import org.eclipse.core.resources.IContainer;
+//import org.eclipse.core.resources.IResource;
+//import org.eclipse.core.runtime.CoreException;
+//import org.eclipse.core.runtime.IPath;
 
 /**
  * Info for IJavaProject.
@@ -48,125 +48,125 @@ class JavaProjectElementInfo extends OpenableElementInfo {
 	/**
 	 * A array with all the non-java resources contained by this PackageFragment
 	 */
-	private Object[] fNonJavaResources;
+	//private Object[] fNonJavaResources;
 
 	/**
 	 * Create and initialize a new instance of the receiver
 	 */
 	public JavaProjectElementInfo() {
-		fNonJavaResources = null;
+		//fNonJavaResources = null;
 	}
 
 	/**
 	 * Compute the non-java resources contained in this java project.
 	 */
-	private Object[] computeNonJavaResources(JavaProject project) {
-
-		// determine if src == project and/or if bin == project
-		IPath projectPath = project.getProject().getFullPath();
-		boolean srcIsProject = false;
-		//boolean binIsProject = false;
-		char[][] exclusionPatterns = null;
-		IClasspathEntry[] classpath = null;
-		IPath projectOutput = null;
-		try {
-			classpath = project
-					.getResolvedClasspath(true/* ignore unresolved variable */);
-			for (int i = 0; i < classpath.length; i++) {
-				IClasspathEntry entry = classpath[i];
-				if (projectPath.equals(entry.getPath())) {
-					srcIsProject = true;
-					exclusionPatterns = ((ClasspathEntry) entry)
-							.fullExclusionPatternChars();
-					break;
-				}
-			}
-			projectOutput = project.getOutputLocation();
-			//binIsProject = projectPath.equals(projectOutput);
-		} catch (JavaModelException e) {
-			// ignore
-		}
-
-		Object[] nonJavaResources = new IResource[5];
-		int nonJavaResourcesCounter = 0;
-		try {
-			IResource[] members = ((IContainer) project.getResource())
-					.members();
-			for (int i = 0, max = members.length; i < max; i++) {
-				IResource res = members[i];
-				switch (res.getType()) {
-				case IResource.FILE:
-					IPath resFullPath = res.getFullPath();
-					//String resName = res.getName();
-
-					// ignore a jar file on the classpath
-					// if (ProjectPrefUtil.isArchiveFileName(resName) &&
-					// this.isClasspathEntryOrOutputLocation(resFullPath,
-					// classpath, projectOutput)) {
-					// break;
-					// }
-					// ignore .java file if src == project
-					if (srcIsProject
-					// && ProjectPrefUtil.isValidCompilationUnitName(resName)
-							&& !Util.isExcluded(res, exclusionPatterns)) {
-						break;
-					}
-					// ignore .class file if bin == project
-					// if (binIsProject &&
-					// ProjectPrefUtil.isValidClassFileName(resName)) {
-					// break;
-					// }
-					// else add non java resource
-					if (nonJavaResources.length == nonJavaResourcesCounter) {
-						// resize
-						System
-								.arraycopy(
-										nonJavaResources,
-										0,
-										(nonJavaResources = new IResource[nonJavaResourcesCounter * 2]),
-										0, nonJavaResourcesCounter);
-					}
-					nonJavaResources[nonJavaResourcesCounter++] = res;
-					break;
-				case IResource.FOLDER:
-					resFullPath = res.getFullPath();
-
-					// ignore non-excluded folders on the classpath or that
-					// correspond to an output location
-					if ((srcIsProject
-							&& !Util.isExcluded(res, exclusionPatterns) && Util
-							.isValidFolderNameForPackage(res.getName()))
-							|| this.isClasspathEntryOrOutputLocation(
-									resFullPath, classpath, projectOutput)) {
-						break;
-					}
-					// else add non java resource
-					if (nonJavaResources.length == nonJavaResourcesCounter) {
-						// resize
-						System
-								.arraycopy(
-										nonJavaResources,
-										0,
-										(nonJavaResources = new IResource[nonJavaResourcesCounter * 2]),
-										0, nonJavaResourcesCounter);
-					}
-					nonJavaResources[nonJavaResourcesCounter++] = res;
-				}
-			}
-			if (nonJavaResources.length != nonJavaResourcesCounter) {
-				System
-						.arraycopy(
-								nonJavaResources,
-								0,
-								(nonJavaResources = new IResource[nonJavaResourcesCounter]),
-								0, nonJavaResourcesCounter);
-			}
-		} catch (CoreException e) {
-			nonJavaResources = NO_NON_JAVA_RESOURCES;
-			nonJavaResourcesCounter = 0;
-		}
-		return nonJavaResources;
-	}
+//	private Object[] computeNonJavaResources(JavaProject project) {
+//
+//		// determine if src == project and/or if bin == project
+//		IPath projectPath = project.getProject().getFullPath();
+//		boolean srcIsProject = false;
+//		//boolean binIsProject = false;
+//		char[][] exclusionPatterns = null;
+//		IClasspathEntry[] classpath = null;
+//		IPath projectOutput = null;
+//		try {
+//			classpath = project
+//					.getResolvedClasspath(true/* ignore unresolved variable */);
+//			for (int i = 0; i < classpath.length; i++) {
+//				IClasspathEntry entry = classpath[i];
+//				if (projectPath.equals(entry.getPath())) {
+//					srcIsProject = true;
+//					exclusionPatterns = ((ClasspathEntry) entry)
+//							.fullExclusionPatternChars();
+//					break;
+//				}
+//			}
+//			projectOutput = project.getOutputLocation();
+//			//binIsProject = projectPath.equals(projectOutput);
+//		} catch (JavaModelException e) {
+//			// ignore
+//		}
+//
+//		Object[] nonJavaResources = new IResource[5];
+//		int nonJavaResourcesCounter = 0;
+//		try {
+//			IResource[] members = ((IContainer) project.getResource())
+//					.members();
+//			for (int i = 0, max = members.length; i < max; i++) {
+//				IResource res = members[i];
+//				switch (res.getType()) {
+//				case IResource.FILE:
+//					IPath resFullPath = res.getFullPath();
+//					//String resName = res.getName();
+//
+//					// ignore a jar file on the classpath
+//					// if (ProjectPrefUtil.isArchiveFileName(resName) &&
+//					// this.isClasspathEntryOrOutputLocation(resFullPath,
+//					// classpath, projectOutput)) {
+//					// break;
+//					// }
+//					// ignore .java file if src == project
+//					if (srcIsProject
+//					// && ProjectPrefUtil.isValidCompilationUnitName(resName)
+//							&& !Util.isExcluded(res, exclusionPatterns)) {
+//						break;
+//					}
+//					// ignore .class file if bin == project
+//					// if (binIsProject &&
+//					// ProjectPrefUtil.isValidClassFileName(resName)) {
+//					// break;
+//					// }
+//					// else add non java resource
+//					if (nonJavaResources.length == nonJavaResourcesCounter) {
+//						// resize
+//						System
+//								.arraycopy(
+//										nonJavaResources,
+//										0,
+//										(nonJavaResources = new IResource[nonJavaResourcesCounter * 2]),
+//										0, nonJavaResourcesCounter);
+//					}
+//					nonJavaResources[nonJavaResourcesCounter++] = res;
+//					break;
+//				case IResource.FOLDER:
+//					resFullPath = res.getFullPath();
+//
+//					// ignore non-excluded folders on the classpath or that
+//					// correspond to an output location
+//					if ((srcIsProject
+//							&& !Util.isExcluded(res, exclusionPatterns) && Util
+//							.isValidFolderNameForPackage(res.getName()))
+//							|| this.isClasspathEntryOrOutputLocation(
+//									resFullPath, classpath, projectOutput)) {
+//						break;
+//					}
+//					// else add non java resource
+//					if (nonJavaResources.length == nonJavaResourcesCounter) {
+//						// resize
+//						System
+//								.arraycopy(
+//										nonJavaResources,
+//										0,
+//										(nonJavaResources = new IResource[nonJavaResourcesCounter * 2]),
+//										0, nonJavaResourcesCounter);
+//					}
+//					nonJavaResources[nonJavaResourcesCounter++] = res;
+//				}
+//			}
+//			if (nonJavaResources.length != nonJavaResourcesCounter) {
+//				System
+//						.arraycopy(
+//								nonJavaResources,
+//								0,
+//								(nonJavaResources = new IResource[nonJavaResourcesCounter]),
+//								0, nonJavaResourcesCounter);
+//			}
+//		} catch (CoreException e) {
+//			nonJavaResources = NO_NON_JAVA_RESOURCES;
+//			nonJavaResourcesCounter = 0;
+//		}
+//		return nonJavaResources;
+//	}
 
 	/**
 	 * @see IJavaProject
@@ -179,15 +179,15 @@ class JavaProjectElementInfo extends OpenableElementInfo {
 	/**
 	 * Returns an array of non-java resources contained in the receiver.
 	 */
-	Object[] getNonJavaResources(JavaProject project) {
-
-		Object[] nonJavaResources = fNonJavaResources;
-		if (nonJavaResources == null) {
-			nonJavaResources = computeNonJavaResources(project);
-			fNonJavaResources = nonJavaResources;
-		}
-		return nonJavaResources;
-	}
+//	Object[] getNonJavaResources(JavaProject project) {
+//
+//		Object[] nonJavaResources = fNonJavaResources;
+//		if (nonJavaResources == null) {
+//			nonJavaResources = computeNonJavaResources(project);
+//			fNonJavaResources = nonJavaResources;
+//		}
+//		return nonJavaResources;
+//	}
 
 	/**
 	 * @see IJavaProject
@@ -200,23 +200,23 @@ class JavaProjectElementInfo extends OpenableElementInfo {
 	 * Returns whether the given path is a classpath entry or an output
 	 * location.
 	 */
-	private boolean isClasspathEntryOrOutputLocation(IPath path,
-			IClasspathEntry[] resolvedClasspath, IPath projectOutput) {
-		if (projectOutput.equals(path))
-			return true;
-		for (int i = 0, length = resolvedClasspath.length; i < length; i++) {
-			IClasspathEntry entry = resolvedClasspath[i];
-			if (entry.getPath().equals(path)) {
-				return true;
-			}
-			IPath output;
-			if ((output = entry.getOutputLocation()) != null
-					&& output.equals(path)) {
-				return true;
-			}
-		}
-		return false;
-	}
+//	private boolean isClasspathEntryOrOutputLocation(IPath path,
+//			IClasspathEntry[] resolvedClasspath, IPath projectOutput) {
+//		if (projectOutput.equals(path))
+//			return true;
+//		for (int i = 0, length = resolvedClasspath.length; i < length; i++) {
+//			IClasspathEntry entry = resolvedClasspath[i];
+//			if (entry.getPath().equals(path)) {
+//				return true;
+//			}
+//			IPath output;
+//			if ((output = entry.getOutputLocation()) != null
+//					&& output.equals(path)) {
+//				return true;
+//			}
+//		}
+//		return false;
+//	}
 
 	protected void setNameLookup(NameLookup newNameLookup) {
 
@@ -232,7 +232,7 @@ class JavaProjectElementInfo extends OpenableElementInfo {
 	 */
 	synchronized void setNonJavaResources(Object[] resources) {
 
-		fNonJavaResources = resources;
+		//fNonJavaResources = resources;
 	}
 
 	// protected void setSearchableEnvironment(SearchableEnvironment