X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
index f73c8bd..c8fb6b0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java
@@ -14,11 +14,11 @@ import java.util.ArrayList;
 import java.util.Map;
 
 import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.core.util.Util;
 
@@ -30,13 +30,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.QualifiedName;
-import net.sourceforge.phpdt.core.IClasspathEntry;
-import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
-import net.sourceforge.phpdt.internal.core.Openable;
-import net.sourceforge.phpdt.internal.core.OpenableElementInfo;
-
-import net.sourceforge.phpdt.internal.core.JavaProject;
-import net.sourceforge.phpdt.internal.core.PackageFragmentRootInfo;
 
 
 /**
@@ -199,7 +192,7 @@ public class PackageFragmentRoot extends Openable implements IPackageFragmentRoo
 //	try {
 //		verifyAttachSource(sourcePath);
 //		if (monitor != null) {
-//			monitor.beginTask(Util.bind("element.attachingSource"), 2); //$NON-NLS-1$
+//			monitor.beginTask(ProjectPrefUtil.bind("element.attachingSource"), 2); //$NON-NLS-1$
 //		}
 //		SourceMapper oldMapper= getSourceMapper();
 //		IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -362,8 +355,8 @@ public class PackageFragmentRoot extends Openable implements IPackageFragmentRoo
 //			IResource member = members[i];
 //			String memberName = member.getName();
 //			if (member.getType() == IResource.FOLDER 
-//				&& Util.isValidFolderNameForPackage(memberName)
-//				&& !Util.isExcluded(member, exclusionPatterns)) {
+//				&& ProjectPrefUtil.isValidFolderNameForPackage(memberName)
+//				&& !ProjectPrefUtil.isExcluded(member, exclusionPatterns)) {
 //					
 //				// eliminate binary output only if nested inside direct subfolders
 //				if (javaProject.contains(member)) {
@@ -494,7 +487,7 @@ public boolean equals(Object o) {
 //				Object target = JavaModel.getTarget(workspaceRoot, entry.getSourceAttachmentPath(), true);
 //				if (target instanceof IFile){
 //					IFile file = (IFile) target;
-//					if (Util.isArchiveFileName(file.getName())){
+//					if (ProjectPrefUtil.isArchiveFileName(file.getName())){
 //						return entry;
 //					}
 //				} else if (target instanceof IFolder) {
@@ -503,7 +496,7 @@ public boolean equals(Object o) {
 //				if (target instanceof java.io.File){
 //					java.io.File file = (java.io.File) target;
 //					if (file.isFile()) {
-//						if (Util.isArchiveFileName(file.getName())){
+//						if (ProjectPrefUtil.isArchiveFileName(file.getName())){
 //							return entry;
 //						}
 //					} else {
@@ -527,7 +520,7 @@ public boolean equals(Object o) {
 //					Object target = JavaModel.getTarget(workspaceRoot, entry.getSourceAttachmentPath(), true);
 //					if (target instanceof IFile){
 //						IFile file = (IFile) target;
-//						if (Util.isArchiveFileName(file.getName())){
+//						if (ProjectPrefUtil.isArchiveFileName(file.getName())){
 //							return entry;
 //						}
 //					} else if (target instanceof IFolder) {
@@ -536,7 +529,7 @@ public boolean equals(Object o) {
 //					if (target instanceof java.io.File){
 //						java.io.File file = (java.io.File) target;
 //						if (file.isFile()) {
-//							if (Util.isArchiveFileName(file.getName())){
+//							if (ProjectPrefUtil.isArchiveFileName(file.getName())){
 //								return entry;
 //							}
 //						} else {