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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
index 64872e2..5dd77a1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
@@ -9,7 +9,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import net.sourceforge.phpdt.internal.core.BatchOperation;
+import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.core.BufferManager;
 import net.sourceforge.phpdt.internal.core.ClasspathEntry;
 import net.sourceforge.phpdt.internal.core.JavaModel;
@@ -25,25 +25,15 @@ import org.eclipse.core.resources.IMarkerDelta;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ISavedState;
-import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import net.sourceforge.phpdt.internal.core.util.Util;
-import org.osgi.framework.BundleContext;
 
 public class JavaCore {
 
@@ -295,14 +285,13 @@ public class JavaCore {
 	 * 
 	 * @see #getDefaultOptions
 	 */
-	public static final String COMPILER_PB_PHP_VAR_DEPRECATED = PLUGIN_ID
-			+ ".compiler.problem.phpVarDeprecatedWarning"; //$NON-NLS-1$
+	public static final String COMPILER_PB_PHP_VAR_DEPRECATED = CompilerOptions.OPTION_PHPVarDeprecatedWarning; //$NON-NLS-1$
 	
-	public static final String COMPILER_PB_PHP_KEYWORD = PLUGIN_ID
-	        + ".compiler.problem.phpBadStyleKeywordWarning"; //$NON-NLS-1$
+	public static final String COMPILER_PB_PHP_KEYWORD = CompilerOptions.OPTION_PHPBadStyleKeywordWarning; //$NON-NLS-1$
 	
-	public static final String COMPILER_PB_PHP_UPPERCASE_IDENTIFIER = PLUGIN_ID
-	        + ".compiler.problem.phpBadStyleUppercaseIdentifierWarning"; //$NON-NLS-1$
+	public static final String COMPILER_PB_PHP_UPPERCASE_IDENTIFIER = CompilerOptions.OPTION_PHPBadStyleUppercaseIdentifierWarning; //$NON-NLS-1$
+	
+	public static final String COMPILER_PB_PHP_FILE_NOT_EXIST = CompilerOptions.OPTION_PHPIncludeNotExistWarning; //$NON-NLS-1$
 	
 	/**
 	 * Possible configurable option ID.
@@ -1899,7 +1888,7 @@ public class JavaCore {
 	// causing some grief
 	//				Platform.run(new ISafeRunnable() {
 	//					public void handleException(Throwable exception) {
-	//						Util.log(exception, "Exception occurred in classpath container
+	//						ProjectPrefUtil.log(exception, "Exception occurred in classpath container
 	// initializer: "+initializer); //$NON-NLS-1$
 	//					}
 	//					public void run() throws Exception {
@@ -2048,7 +2037,7 @@ public class JavaCore {
 		// be causing some grief
 		//			Platform.run(new ISafeRunnable() {
 		//				public void handleException(Throwable exception) {
-		//					Util.log(exception, "Exception occurred in classpath variable
+		//					ProjectPrefUtil.log(exception, "Exception occurred in classpath variable
 		// initializer: "+initializer+" while initializing variable:
 		// "+variableName); //$NON-NLS-1$ //$NON-NLS-2$
 		//				}
@@ -2778,7 +2767,7 @@ public class JavaCore {
 							.isExported());
 
 				case IResource.FILE:
-					//					if (Util.isArchiveFileName(resolvedResource.getName())) {
+					//					if (ProjectPrefUtil.isArchiveFileName(resolvedResource.getName())) {
 					//						// internal binary archive
 					//						return JavaCore.newLibraryEntry(
 					//								resolvedPath,
@@ -2914,6 +2903,8 @@ public class JavaCore {
 		optionNames.add(COMPILER_PB_PHP_KEYWORD);
 		preferences.setDefault(COMPILER_PB_PHP_UPPERCASE_IDENTIFIER, IGNORE);
 		optionNames.add(COMPILER_PB_PHP_UPPERCASE_IDENTIFIER);
+		preferences.setDefault(COMPILER_PB_PHP_FILE_NOT_EXIST, WARNING);
+		optionNames.add(COMPILER_PB_PHP_FILE_NOT_EXIST);
  
 		preferences.setDefault(COMPILER_PB_UNREACHABLE_CODE, ERROR);
 		optionNames.add(COMPILER_PB_UNREACHABLE_CODE);
@@ -3971,14 +3962,14 @@ public class JavaCore {
   //	if (JavaModelManager.CP_RESOLVE_VERBOSE){
   //		System.out.println("CPContainer SET - setting container:
   // ["+containerPath+"] for projects: {" //$NON-NLS-1$ //$NON-NLS-2$
-  //			+ (Util.toString(affectedProjects,
-  //					new Util.Displayable(){
+  //			+ (ProjectPrefUtil.toString(affectedProjects,
+  //					new ProjectPrefUtil.Displayable(){
   //						public String displayString(Object o) { return ((IJavaProject)
   // o).getElementName(); }
   //					}))
   //			+ "} with values: " //$NON-NLS-1$
-  //			+ (Util.toString(respectiveContainers,
-  //					new Util.Displayable(){
+  //			+ (ProjectPrefUtil.toString(respectiveContainers,
+  //					new ProjectPrefUtil.Displayable(){
   //						public String displayString(Object o) { return ((IClasspathContainer)
   // o).getDescription(); }
   //					}))
@@ -4331,8 +4322,8 @@ public class JavaCore {
   //		
   //	if (JavaModelManager.CP_RESOLVE_VERBOSE){
   //		System.out.println("CPVariable SET - setting variables: {" +
-  // Util.toString(variableNames) //$NON-NLS-1$
-  //			+ "} with values: " + Util.toString(variablePaths)); //$NON-NLS-1$
+  // ProjectPrefUtil.toString(variableNames) //$NON-NLS-1$
+  //			+ "} with values: " + ProjectPrefUtil.toString(variablePaths)); //$NON-NLS-1$
   //	}
   //
   //	int varLength = variableNames.length;
@@ -4445,7 +4436,7 @@ public class JavaCore {
   //							if (JavaModelManager.CP_RESOLVE_VERBOSE){
   //								System.out.println("CPVariable SET - updating affected project:
   // ["+project.getElementName()+"] due to setting variables: "+
-  // Util.toString(dbgVariableNames)); //$NON-NLS-1$ //$NON-NLS-2$
+  // ProjectPrefUtil.toString(dbgVariableNames)); //$NON-NLS-1$ //$NON-NLS-2$
   //							}
   //								
   //							project
@@ -4465,7 +4456,7 @@ public class JavaCore {
   //		} catch (CoreException e) {
   //			if (JavaModelManager.CP_RESOLVE_VERBOSE){
   //				System.out.println("CPVariable SET - FAILED DUE TO EXCEPTION:
-  // "+Util.toString(dbgVariableNames)); //$NON-NLS-1$
+  // "+ProjectPrefUtil.toString(dbgVariableNames)); //$NON-NLS-1$
   //				e.printStackTrace();
   //			}
   //			if (e instanceof JavaModelException) {
@@ -4514,7 +4505,7 @@ public class JavaCore {
   //		// process deltas since last activated in indexer thread so that indexes
   // are up-to-date.
   //		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38658
-  //		Job processSavedState = new Job(Util.bind("savedState.jobName")) {
+  //		Job processSavedState = new Job(ProjectPrefUtil.bind("savedState.jobName")) {
   // //$NON-NLS-1$
   //			protected IStatus run(IProgressMonitor monitor) {
   //				try {