- added include declarations to Outline view

[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 50456a0..e023b59 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
@@ -111,17 +111,17 @@ public class NameEnvironment implements INameEnvironment {
                switch(entry.getEntryKind()) {
                        case IClasspathEntry.CPE_SOURCE :
                                if (!(target instanceof IContainer)) continue nextEntry;
-                               IPath outputPath = entry.getOutputLocation() != null 
-                                       ? entry.getOutputLocation() 
-                                       : javaProject.getOutputLocation();
-                               IContainer outputFolder;
-                               if (outputPath.segmentCount() == 1) {
-                                       outputFolder = javaProject.getProject();
-                               } else {
-                                       outputFolder = root.getFolder(outputPath);
-                                       if (!outputFolder.exists())
-                                               createFolder(outputFolder);
-                               }
+//                             IPath outputPath = entry.getOutputLocation() != null 
+//                                     ? entry.getOutputLocation() 
+//                                     : javaProject.getOutputLocation();
+                               IContainer outputFolder = null;
+//                             if (outputPath.segmentCount() == 1) {
+//                                     outputFolder = javaProject.getProject();
+//                             } else {
+//                                     outputFolder = root.getFolder(outputPath);
+//                                     if (!outputFolder.exists())
+//                                             createFolder(outputFolder);
+//                             }
                                sLocations.add(
                                        ClasspathLocation.forSourceFolder((IContainer) target, outputFolder, entry.fullExclusionPatternChars()));
                                continue nextEntry;
@@ -207,19 +207,19 @@ public class NameEnvironment implements INameEnvironment {
                // collect the output folders, skipping duplicates
                next : for (int i = 0, l = sourceLocations.length; i < l; i++) {
                        ClasspathMultiDirectory md = sourceLocations[i];
-                       IPath outputPath = md.binaryFolder.getFullPath();
-                       for (int j = 0; j < i; j++) { // compare against previously walked source folders
-                               if (outputPath.equals(sourceLocations[j].binaryFolder.getFullPath())) {
-                                       md.hasIndependentOutputFolder = sourceLocations[j].hasIndependentOutputFolder;
-                                       continue next;
-                               }
-                       }
+//                     IPath outputPath = md.binaryFolder.getFullPath();
+//                     for (int j = 0; j < i; j++) { // compare against previously walked source folders
+//                             if (outputPath.equals(sourceLocations[j].binaryFolder.getFullPath())) {
+//                                     md.hasIndependentOutputFolder = sourceLocations[j].hasIndependentOutputFolder;
+//                                     continue next;
+//                             }
+//                     }
                        outputFolders.add(md);
   
                        // also tag each source folder whose output folder is an independent folder & is not also a source folder
-                       for (int j = 0, m = sourceLocations.length; j < m; j++)
-                               if (outputPath.equals(sourceLocations[j].sourceFolder.getFullPath()))
-                                       continue next;
+//                     for (int j = 0, m = sourceLocations.length; j < m; j++)
+//                             if (outputPath.equals(sourceLocations[j].sourceFolder.getFullPath()))
+//                                     continue next;
                        md.hasIndependentOutputFolder = true;
                }
        }