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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index e87fef2..9285302 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -38,13 +38,17 @@ import net.sourceforge.phpdt.core.IJavaModel;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
+import net.sourceforge.phpdt.core.IParent;
+import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.IWorkingCopy;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.WorkingCopyOwner;
+import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 import net.sourceforge.phpdt.internal.core.util.Util;
+import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -59,7 +63,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.IStatus;
@@ -69,24 +72,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.Status;
-import net.sourceforge.phpdt.internal.core.BufferManager;
-
-import net.sourceforge.phpdt.internal.core.DefaultWorkingCopyOwner;
-
-import net.sourceforge.phpdt.internal.core.DeltaProcessingState;
-
-import net.sourceforge.phpdt.internal.core.DeltaProcessor;
-
-import net.sourceforge.phpdt.core.IParent;
-import net.sourceforge.phpdt.internal.core.JavaElementInfo;
-
-import net.sourceforge.phpdt.core.IProblemRequestor;
-import net.sourceforge.phpdt.core.WorkingCopyOwner;
-import net.sourceforge.phpdt.core.compiler.IProblem;
-import net.sourceforge.phpdt.internal.core.CompilationUnit;
-import net.sourceforge.phpdt.internal.core.JavaElement;
-import net.sourceforge.phpdt.internal.core.JavaElementDeltaBuilder;
-import net.sourceforge.phpdt.internal.core.JavaModelManager.PerWorkingCopyInfo;
+import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 
 /**
  * The <code>JavaModelManager</code> manages instances of <code>IJavaModel</code>.
@@ -313,9 +299,9 @@ public class JavaModelManager implements ISaveParticipant {
 			if (PHPFileUtil.isValidPHPUnitName(name))
 			//if (PHPFileUtil.isPHPFile(file))
 				return createCompilationUnitFrom(file, project);
-//			if (Util.isValidClassFileName(name))
+//			if (ProjectPrefUtil.isValidClassFileName(name))
 //				return createClassFileFrom(file, project);
-//			if (Util.isArchiveFileName(name))
+//			if (ProjectPrefUtil.isArchiveFileName(name))
 //				return createJarPackageFragmentRootFrom(file, project);
 		}
 		return null;
@@ -458,7 +444,8 @@ public class JavaModelManager implements ISaveParticipant {
 						pkgPath = pkgPath.removeLastSegments(1);
 						
 						// don't check validity of package name (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=26706)
-						String pkgName = pkgPath.toString().replace('/', '.');
+//						String pkgName = pkgPath.toString().replace('/', '.');
+						String pkgName = pkgPath.toString();
 						return root.getPackageFragment(pkgName);
 					} else {
 						String pkgName = Util.packageName(pkgPath);
@@ -609,7 +596,7 @@ public class JavaModelManager implements ISaveParticipant {
 			return buffer.toString();
 		}
 	}
-	public static boolean VERBOSE = true;
+	public static boolean VERBOSE = false;
 	public static boolean CP_RESOLVE_VERBOSE = false;
 	public static boolean ZIP_ACCESS_VERBOSE = false;
 	
@@ -841,7 +828,7 @@ public class JavaModelManager implements ISaveParticipant {
 			
 		// Refresh internal scopes
 		if (deltaToNotify != null) {
-//		TODO khartlage temp-del
+//		TODO  temp-del
 //			Iterator scopes = this.scopes.keySet().iterator();
 //			while (scopes.hasNext()) {
 //				AbstractSearchScope scope = (AbstractSearchScope)scopes.next();
@@ -1020,7 +1007,7 @@ public class JavaModelManager implements ISaveParticipant {
 			return proj;
 		}
 		int rootEnd= memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT, projectEnd + 1);
-//	TODO khartlage temp-del
+//	TODO  temp-del
 //		if (rootEnd == -1) {
 //			return model.getHandleFromMementoForRoot(memento, proj, projectEnd, memento.length());
 //		}
@@ -1201,10 +1188,10 @@ public class JavaModelManager implements ISaveParticipant {
 	 */
 	private File getSerializationFile(IProject project) {
 		if (!project.exists()) return null;
-		IPluginDescriptor descr= JavaCore.getJavaCore().getDescriptor();
-		IPath workingLocation= project.getPluginWorkingLocation(descr);
+		IPath workingLocation = project.getWorkingLocation(JavaCore.PLUGIN_ID);
 		return workingLocation.append("state.dat").toFile(); //$NON-NLS-1$
 	}
+	
 	/*
 	 * Returns the temporary cache for newly opened elements for the current thread.
 	 * Creates it if not already created.
@@ -1331,8 +1318,8 @@ public class JavaModelManager implements ISaveParticipant {
 //		}
 //		
 //		// load variables and containers from preferences into cache
-//		Preferences preferences = PHPCore.getPlugin().getPluginPreferences();
-//
+//		Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences();
+
 //		// only get variable from preferences not set to their default
 //		String[] propertyNames = preferences.propertyNames();
 //		int variablePrefixLength = CP_VARIABLE_PREFERENCES_PREFIX.length();
@@ -1807,7 +1794,7 @@ public class JavaModelManager implements ISaveParticipant {
 	}
 
 	public void shutdown () {
-//	TODO khartlage temp-del
+//	TODO  temp-del
 //		if (this.deltaProcessor.indexManager != null){ // no more indexing
 //			this.deltaProcessor.indexManager.shutdown();
 //		}