Refactory: replaced internal copy of Assert class with org.eclipse.core.runtime.Assert

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / JavaProject.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
index ab66e39..8523713 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
@@ -51,7 +51,9 @@ import net.sourceforge.phpdt.internal.codeassist.ISearchableNameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.util.ObjectVector;
 import net.sourceforge.phpdt.internal.core.util.MementoTokenizer;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.corext.Assert;
+//incastrix
+//import net.sourceforge.phpdt.internal.corext.Assert;
+import org.eclipse.core.runtime.Assert;
 import net.sourceforge.phpeclipse.LoadPathEntry;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
@@ -66,6 +68,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.AssertionFailedException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -414,8 +417,8 @@ public class JavaProject extends Openable implements IJavaProject,
                        throw newNotPresentException();
                }
 
-               IWorkspace workspace = ResourcesPlugin.getWorkspace();
-               IWorkspaceRoot wRoot = workspace.getRoot();
+               //IWorkspace workspace = ResourcesPlugin.getWorkspace();
+               //IWorkspaceRoot wRoot = workspace.getRoot();
                // cannot refresh cp markers on opening (emulate cp check on startup)
                // since can create deadlocks (see bug 37274)
                // IClasspathEntry[] resolvedClasspath =
@@ -1007,7 +1010,7 @@ public class JavaProject extends Openable implements IJavaProject,
                                                + "/.classpath, will mark classpath as invalid"); //$NON-NLS-1$
                        }
                        return INVALID_CLASSPATH;
-               } catch (Assert.AssertionFailedException e) {
+               } catch (/*Assert.*/AssertionFailedException e) {
                        // failed creating CP entries from file
                        if (createMarker && this.getProject().isAccessible()) {
                                this
@@ -1188,7 +1191,7 @@ public class JavaProject extends Openable implements IJavaProject,
 
                String extension = path.getFileExtension();
                if (extension == null) {
-                       String packageName = path.toString().replace(IPath.SEPARATOR, '.');
+                       //String packageName = path.toString().replace(IPath.SEPARATOR, '.');
 
                        // IPackageFragment[] pkgFragments =
                        // getNameLookup().findPackageFragments(packageName, false);
@@ -1651,7 +1654,7 @@ public class JavaProject extends Openable implements IJavaProject,
        public NameLookup newNameLookup(ICompilationUnit[] workingCopies)
                        throws JavaModelException {
 
-               JavaProjectElementInfo info = getJavaProjectElementInfo();
+               //JavaProjectElementInfo info = getJavaProjectElementInfo();
                // lock on the project info to avoid race condition while computing the
                // pkg fragment roots and package fragment caches
                // synchronized(info){