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

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
index 463e7ea..4f1cc9b 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
@@ -22,12 +22,15 @@ import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 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.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
 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.Path;
@@ -354,7 +357,7 @@ public class ClasspathEntry implements IClasspathEntry {
                                        false);
 
                default:
-                       throw new Assert.AssertionFailedException(Util.bind(
+                       throw new /*Assert.*/AssertionFailedException(Util.bind(
                                        "classpath.unknownKind", kindAttr)); //$NON-NLS-1$
                }
        }
@@ -1263,7 +1266,7 @@ public class ClasspathEntry implements IClasspathEntry {
                        if (path != null && path.segmentCount() >= 1) {
                                try {
                                        entry = JavaCore.getResolvedClasspathEntry(entry);
-                               } catch (Assert.AssertionFailedException e) {
+                               } catch (/*Assert.*/AssertionFailedException e) {
                                        // Catch the assertion failure and throw java model
                                        // exception instead
                                        // see bug