X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java
index 0848af2..45bdc6b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java
@@ -27,151 +27,185 @@ import org.eclipse.core.runtime.IPath;
class PackageFragmentRootInfo extends OpenableElementInfo {
/**
- * The SourceMapper for this JAR (or null if
- * this JAR does not have source attached).
+ * The SourceMapper for this JAR (or null if this JAR does
+ * not have source attached).
*/
-// protected SourceMapper sourceMapper = null;
-
+ // protected SourceMapper sourceMapper = null;
/**
- * The kind of the root associated with this info.
- * Valid kinds are:
+ * The kind of the root associated with this info. Valid kinds are:
+ *
* IPackageFragmentRoot.K_SOURCE
- * IPackageFragmentRoot.K_BINARY
+ * IPackageFragmentRoot.K_BINARY
+ *
*/
- protected int fRootKind= IPackageFragmentRoot.K_SOURCE;
+ protected int fRootKind = IPackageFragmentRoot.K_SOURCE;
/**
* A array with all the non-java resources contained by this PackageFragment
*/
protected Object[] fNonJavaResources;
-/**
- * Create and initialize a new instance of the receiver
- */
-public PackageFragmentRootInfo() {
- fNonJavaResources = null;
-}
-/**
- * Starting at this folder, create non-java resources for this package fragment root
- * and add them to the non-java resources collection.
- *
- * @exception JavaModelException The resource associated with this package fragment does not exist
- */
-static Object[] computeFolderNonJavaResources(JavaProject project, IContainer folder, char[][] exclusionPatterns) throws JavaModelException {
- Object[] nonJavaResources = new IResource[5];
- int nonJavaResourcesCounter = 0;
- try {
- IClasspathEntry[] classpath = project.getResolvedClasspath(true/*ignore unresolved variable*/);
- IResource[] members = folder.members();
- nextResource: for (int i = 0, max = members.length; i < max; i++) {
- IResource member = members[i];
- switch (member.getType()) {
- case IResource.FILE :
+
+ /**
+ * Create and initialize a new instance of the receiver
+ */
+ public PackageFragmentRootInfo() {
+ fNonJavaResources = null;
+ }
+
+ /**
+ * Starting at this folder, create non-java resources for this package
+ * fragment root and add them to the non-java resources collection.
+ *
+ * @exception JavaModelException
+ * The resource associated with this package fragment does
+ * not exist
+ */
+ static Object[] computeFolderNonJavaResources(JavaProject project,
+ IContainer folder, char[][] exclusionPatterns)
+ throws JavaModelException {
+ Object[] nonJavaResources = new IResource[5];
+ int nonJavaResourcesCounter = 0;
+ try {
+ IClasspathEntry[] classpath = project
+ .getResolvedClasspath(true/* ignore unresolved variable */);
+ IResource[] members = folder.members();
+ nextResource: for (int i = 0, max = members.length; i < max; i++) {
+ IResource member = members[i];
+ switch (member.getType()) {
+ case IResource.FILE:
String fileName = member.getName();
-
+
// ignore .java files that are not excluded
- if (Util.isValidCompilationUnitName(fileName) && !Util.isExcluded(member, exclusionPatterns))
+ if (Util.isValidCompilationUnitName(fileName)
+ && !Util.isExcluded(member, exclusionPatterns))
continue nextResource;
// ignore .class files
-// if (ProjectPrefUtil.isValidClassFileName(fileName))
-// continue nextResource;
-// // ignore .zip or .jar file on classpath
-// if (ProjectPrefUtil.isArchiveFileName(fileName) && isClasspathEntry(member.getFullPath(), classpath))
-// continue nextResource;
+ // if (ProjectPrefUtil.isValidClassFileName(fileName))
+ // continue nextResource;
+ // // ignore .zip or .jar file on classpath
+ // if (ProjectPrefUtil.isArchiveFileName(fileName) &&
+ // isClasspathEntry(member.getFullPath(), classpath))
+ // continue nextResource;
break;
- case IResource.FOLDER :
- // ignore valid packages or excluded folders that correspond to a nested pkg fragment root
-// if (ProjectPrefUtil.isValidFolderNameForPackage(member.getName())
-// && (!ProjectPrefUtil.isExcluded(member, exclusionPatterns)
-// || isClasspathEntry(member.getFullPath(), classpath)))
-// continue nextResource;
+ case IResource.FOLDER:
+ // ignore valid packages or excluded folders that correspond
+ // to a nested pkg fragment root
+ // if
+ // (ProjectPrefUtil.isValidFolderNameForPackage(member.getName())
+ // && (!ProjectPrefUtil.isExcluded(member,
+ // exclusionPatterns)
+ // || isClasspathEntry(member.getFullPath(), classpath)))
+ // continue nextResource;
break;
+ }
+ if (nonJavaResources.length == nonJavaResourcesCounter) {
+ // resize
+ System
+ .arraycopy(
+ nonJavaResources,
+ 0,
+ (nonJavaResources = new IResource[nonJavaResourcesCounter * 2]),
+ 0, nonJavaResourcesCounter);
+ }
+ nonJavaResources[nonJavaResourcesCounter++] = member;
+
}
- if (nonJavaResources.length == nonJavaResourcesCounter) {
- // resize
- System.arraycopy(nonJavaResources, 0, (nonJavaResources = new IResource[nonJavaResourcesCounter * 2]), 0, nonJavaResourcesCounter);
+ if (nonJavaResources.length != nonJavaResourcesCounter) {
+ System
+ .arraycopy(
+ nonJavaResources,
+ 0,
+ (nonJavaResources = new IResource[nonJavaResourcesCounter]),
+ 0, nonJavaResourcesCounter);
}
- nonJavaResources[nonJavaResourcesCounter++] = member;
-
+ return nonJavaResources;
+ } catch (CoreException e) {
+ throw new JavaModelException(e);
}
- if (nonJavaResources.length != nonJavaResourcesCounter) {
- System.arraycopy(nonJavaResources, 0, (nonJavaResources = new IResource[nonJavaResourcesCounter]), 0, nonJavaResourcesCounter);
+ }
+
+ /**
+ * Compute the non-package resources of this package fragment root.
+ *
+ * @exception JavaModelException
+ * The resource associated with this package fragment root
+ * does not exist
+ */
+ private Object[] computeNonJavaResources(IJavaProject project,
+ IResource underlyingResource, PackageFragmentRoot handle) {
+ Object[] nonJavaResources = NO_NON_JAVA_RESOURCES;
+ try {
+ // the underlying resource may be a folder or a project (in the case
+ // that the project folder
+ // is actually the package fragment root)
+ if (underlyingResource.getType() == IResource.FOLDER
+ || underlyingResource.getType() == IResource.PROJECT) {
+ nonJavaResources = computeFolderNonJavaResources(
+ (JavaProject) project, (IContainer) underlyingResource,
+ handle.fullExclusionPatternChars());
+ }
+ } catch (JavaModelException e) {
}
return nonJavaResources;
- } catch (CoreException e) {
- throw new JavaModelException(e);
}
-}
-/**
- * Compute the non-package resources of this package fragment root.
- *
- * @exception JavaModelException The resource associated with this package fragment root does not exist
- */
-private Object[] computeNonJavaResources(IJavaProject project, IResource underlyingResource, PackageFragmentRoot handle) {
- Object[] nonJavaResources = NO_NON_JAVA_RESOURCES;
- try {
- // the underlying resource may be a folder or a project (in the case that the project folder
- // is actually the package fragment root)
- if (underlyingResource.getType() == IResource.FOLDER || underlyingResource.getType() == IResource.PROJECT) {
- nonJavaResources =
- computeFolderNonJavaResources(
- (JavaProject)project,
- (IContainer) underlyingResource,
- handle.fullExclusionPatternChars());
+
+ /**
+ * Returns an array of non-java resources contained in the receiver.
+ */
+ synchronized Object[] getNonJavaResources(IJavaProject project,
+ IResource underlyingResource, PackageFragmentRoot handle) {
+ Object[] nonJavaResources = fNonJavaResources;
+ if (nonJavaResources == null) {
+ nonJavaResources = this.computeNonJavaResources(project,
+ underlyingResource, handle);
+ fNonJavaResources = nonJavaResources;
}
- } catch (JavaModelException e) {
+ return nonJavaResources;
}
- return nonJavaResources;
-}
-/**
- * Returns an array of non-java resources contained in the receiver.
- */
-synchronized Object[] getNonJavaResources(IJavaProject project, IResource underlyingResource, PackageFragmentRoot handle) {
- Object[] nonJavaResources = fNonJavaResources;
- if (nonJavaResources == null) {
- nonJavaResources = this.computeNonJavaResources(project, underlyingResource, handle);
- fNonJavaResources = nonJavaResources;
+
+ /**
+ * Returns the kind of this root.
+ */
+ public int getRootKind() {
+ return fRootKind;
}
- return nonJavaResources;
-}
-/**
- * Returns the kind of this root.
- */
-public int getRootKind() {
- return fRootKind;
-}
-/**
- * Retuns the SourceMapper for this root, or null
- * if this root does not have attached source.
- */
-//protected synchronized SourceMapper getSourceMapper() {
-// return this.sourceMapper;
-//}
-private static boolean isClasspathEntry(IPath path, IClasspathEntry[] resolvedClasspath) {
- for (int i = 0, length = resolvedClasspath.length; i < length; i++) {
- IClasspathEntry entry = resolvedClasspath[i];
- if (entry.getPath().equals(path)) {
- return true;
+
+ /**
+ * Retuns the SourceMapper for this root, or null if this
+ * root does not have attached source.
+ */
+ // protected synchronized SourceMapper getSourceMapper() {
+ // return this.sourceMapper;
+ // }
+ private static boolean isClasspathEntry(IPath path,
+ IClasspathEntry[] resolvedClasspath) {
+ for (int i = 0, length = resolvedClasspath.length; i < length; i++) {
+ IClasspathEntry entry = resolvedClasspath[i];
+ if (entry.getPath().equals(path)) {
+ return true;
+ }
}
+ return false;
}
- return false;
-}
-/**
- * Set the fNonJavaResources to res value
- */
-synchronized void setNonJavaResources(Object[] resources) {
- fNonJavaResources = resources;
-}
-/**
- * Sets the kind of this root.
- */
-protected void setRootKind(int newRootKind) {
- fRootKind = newRootKind;
-}
-/**
- * Sets the SourceMapper for this root.
- */
-//protected synchronized void setSourceMapper(SourceMapper mapper) {
-// this.sourceMapper= mapper;
-//}
+
+ /**
+ * Set the fNonJavaResources to res value
+ */
+ synchronized void setNonJavaResources(Object[] resources) {
+ fNonJavaResources = resources;
+ }
+
+ /**
+ * Sets the kind of this root.
+ */
+ protected void setRootKind(int newRootKind) {
+ fRootKind = newRootKind;
+ }
+ /**
+ * Sets the SourceMapper for this root.
+ */
+ // protected synchronized void setSourceMapper(SourceMapper mapper) {
+ // this.sourceMapper= mapper;
+ // }
}