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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java
index 96a21b0..0661b89 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java
@@ -31,20 +31,22 @@ import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
-import net.sourceforge.phpdt.internal.core.Assert;
-import net.sourceforge.phpdt.internal.core.PackageFragmentRoot;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+//incastrix
+//import net.sourceforge.phpdt.internal.corext.Assert;
+import org.eclipse.core.runtime.Assert;
+//import net.sourceforge.phpdt.internal.core.PackageFragmentRoot;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
+//import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
+//import org.eclipse.jface.text.BadLocationException;
+//import org.eclipse.text.edits.MalformedTreeException;
+//import org.eclipse.text.edits.TextEdit;
 
 /**
  * Provides convenient utility methods to other types in this package.
@@ -378,21 +380,21 @@ public class Util {
 	 * 
 	 * @return the updated string
 	 */
-	public final static String editedString(String original, TextEdit edit) {
-		if (edit == null) {
-			return original;
-		}
-		SimpleDocument document = new SimpleDocument(original);
-		try {
-			edit.apply(document, TextEdit.NONE);
-			return document.get();
-		} catch (MalformedTreeException e) {
-			e.printStackTrace();
-		} catch (BadLocationException e) {
-			e.printStackTrace();
-		}
-		return original;
-	}
+//	public final static String editedString(String original, TextEdit edit) {
+//		if (edit == null) {
+//			return original;
+//		}
+//		SimpleDocument document = new SimpleDocument(original);
+//		try {
+//			edit.apply(document, TextEdit.NONE);
+//			return document.get();
+//		} catch (MalformedTreeException e) {
+//			e.printStackTrace();
+//		} catch (BadLocationException e) {
+//			e.printStackTrace();
+//		}
+//		return original;
+//	}
 
 	/**
 	 * Returns true iff str.toLowerCase().endsWith(end.toLowerCase())
@@ -592,24 +594,24 @@ public class Util {
 		return sig.substring(i + 1);
 	}
 
-	private static IFile findFirstClassFile(IFolder folder) {
-		try {
-			IResource[] members = folder.members();
-			for (int i = 0, max = members.length; i < max; i++) {
-				IResource member = members[i];
-				if (member.getType() == IResource.FOLDER) {
-					return findFirstClassFile((IFolder) member);
-					// } else if
-					// (net.sourceforge.phpdt.internal.compiler.util.Util.isClassFileName(member.getName()))
-					// {
-					// return (IFile) member;
-				}
-			}
-		} catch (CoreException e) {
-			// ignore
-		}
-		return null;
-	}
+//	private static IFile findFirstClassFile(IFolder folder) {
+//		try {
+//			IResource[] members = folder.members();
+//			for (int i = 0, max = members.length; i < max; i++) {
+//				IResource member = members[i];
+//				if (member.getType() == IResource.FOLDER) {
+//					return findFirstClassFile((IFolder) member);
+//					// } else if
+//					// (net.sourceforge.phpdt.internal.compiler.util.Util.isClassFileName(member.getName()))
+//					// {
+//					// return (IFile) member;
+//				}
+//			}
+//		} catch (CoreException e) {
+//			// ignore
+//		}
+//		return null;
+//	}
 
 	/**
 	 * Finds the first line separator used by the given text.
@@ -996,8 +998,8 @@ public class Util {
 	 */
 	public static final boolean isExcluded(IJavaElement element) {
 		int elementType = element.getElementType();
-		PackageFragmentRoot root = null;
-		IResource resource = null;
+		//PackageFragmentRoot root = null;
+		//IResource resource = null;
 		switch (elementType) {
 		case IJavaElement.JAVA_MODEL:
 		case IJavaElement.JAVA_PROJECT:
@@ -1013,9 +1015,9 @@ public class Util {
 			// root.fullExclusionPatternChars());
 
 		case IJavaElement.COMPILATION_UNIT:
-			root = (PackageFragmentRoot) element
-					.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-			resource = element.getResource();
+//			root = (PackageFragmentRoot) element
+//					.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+			//resource = element.getResource();
 			// if (resource != null && isExcluded(resource,
 			// root.fullInclusionPatternChars(),
 			// root.fullExclusionPatternChars()))