improved PHP parser

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
index e023b59..ffdbaf0 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
@@ -87,19 +87,20 @@ public class NameEnvironment implements INameEnvironment {
        JavaProject javaProject,
        SimpleLookupTable binaryLocationsPerProject) throws CoreException {
   
+    /* Update cycle marker */
+       IMarker cycleMarker = javaProject.getCycleMarker();
+       if (cycleMarker != null) {
+               int severity = JavaCore.ERROR.equals(javaProject.getOption(JavaCore.CORE_CIRCULAR_CLASSPATH, true))
+                       ? IMarker.SEVERITY_ERROR
+                       : IMarker.SEVERITY_WARNING;
+               if (severity != ((Integer) cycleMarker.getAttribute(IMarker.SEVERITY)).intValue())
+                       cycleMarker.setAttribute(IMarker.SEVERITY, severity);
+       }
+       
        /* Update incomplete classpath marker */
-       IClasspathEntry[] classpathEntries = javaProject.getExpandedClasspath(true, true);
-  
-       /* Update cycle marker */
-       IMarker cycleMarker = javaProject.getCycleMarker();
-       if (cycleMarker != null) {
-               int severity = JavaCore.ERROR.equals(javaProject.getOption(JavaCore.CORE_CIRCULAR_CLASSPATH, true))
-                       ? IMarker.SEVERITY_ERROR
-                       : IMarker.SEVERITY_WARNING;
-               if (severity != ((Integer) cycleMarker.getAttribute(IMarker.SEVERITY)).intValue())
-                       cycleMarker.setAttribute(IMarker.SEVERITY, severity);
-       }
-  
+//     IClasspathEntry[] classpathEntries = javaProject.getExpandedClasspath(true, true);
+       IClasspathEntry[] classpathEntries = javaProject.getExpandedClasspath(true/*ignore unresolved variable*/, false/*don't create markers*/, null/*preferred cp*/, null/*preferred output*/);
+       
        ArrayList sLocations = new ArrayList(classpathEntries.length);
        ArrayList bLocations = new ArrayList(classpathEntries.length);
        nextEntry : for (int i = 0, l = classpathEntries.length; i < l; i++) {
@@ -170,7 +171,7 @@ public class NameEnvironment implements INameEnvironment {
 //                                     IResource resource = (IResource) target;
 //                                     ClasspathLocation bLocation = null;
 //                                     if (resource instanceof IFile) {
-//                                             if (!(Util.isArchiveFileName(path.lastSegment())))
+//                                             if (!(ProjectPrefUtil.isArchiveFileName(path.lastSegment())))
 //                                                     continue nextEntry;
 //                                             bLocation = ClasspathLocation.forLibrary((IFile) resource);
 //                                     } else if (resource instanceof IContainer) {
@@ -190,7 +191,7 @@ public class NameEnvironment implements INameEnvironment {
 //                                             binaryLocationsPerProject.put(p, existingLocations);
 //                                     }
 //                             } else if (target instanceof File) {
-//                                     if (!(Util.isArchiveFileName(path.lastSegment())))
+//                                     if (!(ProjectPrefUtil.isArchiveFileName(path.lastSegment())))
 //                                             continue nextEntry;
 //                                     bLocations.add(ClasspathLocation.forLibrary(path.toString()));
 //                             }