X-Git-Url: http://secure.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 ea8125b..d78c6ce 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
@@ -76,7 +76,7 @@ public class Util {
 
 	/* Bundle containing messages */
 	protected static ResourceBundle bundle;
-	private final static String bundleName = "net.sourceforge.phpdt.internal.core.messages"; //$NON-NLS-1$
+	private final static String bundleName = "net.sourceforge.phpdt.internal.core.util.messages"; //$NON-NLS-1$
 
 //	public final static char[] SUFFIX_class = ".class".toCharArray(); //$NON-NLS-1$
 //	public final static char[] SUFFIX_CLASS = ".CLASS".toCharArray(); //$NON-NLS-1$
@@ -682,11 +682,11 @@ public class Util {
 //			case IJavaElement.PACKAGE_FRAGMENT:
 //				PackageFragmentRoot root = (PackageFragmentRoot)element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 //				IResource resource = element.getResource();
-//				return resource != null && Util.isExcluded(resource, root.fullExclusionPatternChars());
+//				return resource != null && ProjectPrefUtil.isExcluded(resource, root.fullExclusionPatternChars());
 			case IJavaElement.COMPILATION_UNIT:
 				root = (PackageFragmentRoot)element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 				resource = element.getResource();
-//				if (resource != null && Util.isExcluded(resource, root.fullExclusionPatternChars()))
+//				if (resource != null && ProjectPrefUtil.isExcluded(resource, root.fullExclusionPatternChars()))
 //					return true;
 				return isExcluded(element.getParent());
 			default:
@@ -824,6 +824,23 @@ public class Util {
 	/*
 	 * Add a log entry
 	 */
+//	public static void log(Throwable e, String message) {
+//		Throwable nestedException;
+//		if (e instanceof JavaModelException 
+//				&& (nestedException = ((JavaModelException)e).getException()) != null) {
+//			e = nestedException;
+//		}
+//		IStatus status= new Status(
+//			IStatus.ERROR, 
+//			JavaCore.getPlugin().getDescriptor().getUniqueIdentifier(), 
+//			IStatus.ERROR, 
+//			message, 
+//			e); 
+//		JavaCore.getPlugin().getLog().log(status);
+//	}	
+	/*
+	 * Add a log entry
+	 */
 	public static void log(Throwable e, String message) {
 		Throwable nestedException;
 		if (e instanceof JavaModelException 
@@ -832,13 +849,12 @@ public class Util {
 		}
 		IStatus status= new Status(
 			IStatus.ERROR, 
-			JavaCore.getPlugin().getDescriptor().getUniqueIdentifier(), 
+			JavaCore.PLUGIN_ID, 
 			IStatus.ERROR, 
 			message, 
 			e); 
 		JavaCore.getPlugin().getLog().log(status);
 	}	
-	
 	/**
 	 * Normalizes the cariage returns in the given text.
 	 * They are all changed  to use the given buffer's line separator.