Rename HTML editor to Smarty editor

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / lookup / LookupEnvironment.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
index d497ee5..54e6de2 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
@@ -11,6 +11,7 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryType;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.env.NameEnvironmentAnswer;
@@ -18,7 +19,6 @@ import net.sourceforge.phpdt.internal.compiler.impl.ITypeRequestor;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfPackage;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 public class LookupEnvironment implements BaseTypes, ProblemReasons, TypeConstants {
 //     public CompilerOptions options;
@@ -199,8 +199,8 @@ public void completeTypeBindings(CompilationUnitDeclaration parsedUnit) {
        } else {
                if (parsedUnit.scope == null) return; // parsing errors were too severe
 
-               if (stepCompleted >= CHECK_AND_SET_IMPORTS)
-                       parsedUnit.scope.checkAndSetImports();
+//             if (stepCompleted >= CHECK_AND_SET_IMPORTS)
+//                     parsedUnit.scope.checkAndSetImports();
 
                if (stepCompleted >= CONNECT_TYPE_HIERARCHY)
                        parsedUnit.scope.connectTypeHierarchy();
@@ -223,6 +223,7 @@ public void completeTypeBindings(CompilationUnitDeclaration parsedUnit, boolean
        if (buildFieldsAndMethods)
                parsedUnit.scope.buildFieldsAndMethods();
 }
+
 private PackageBinding computePackageFrom(char[][] constantPoolName) {
        if (constantPoolName.length == 1)
                return defaultPackage;
@@ -308,35 +309,36 @@ public BinaryTypeBinding createBinaryTypeFrom(IBinaryType binaryType, PackageBin
 */
 
 PackageBinding createPackage(char[][] compoundName) {
-       PackageBinding packageBinding = getPackage0(compoundName[0]);
-       if (packageBinding == null || packageBinding == TheNotFoundPackage) {
-               packageBinding = new PackageBinding(compoundName[0], this);
-               knownPackages.put(compoundName[0], packageBinding);
-       }
-
-       for (int i = 1, length = compoundName.length; i < length; i++) {
-               // check to see if it collides with a known type...
-               // this case can only happen if the package does not exist as a directory in the file system
-               // otherwise when the source type was defined, the correct error would have been reported
-               // unless its an unresolved type which is referenced from an inconsistent class file
-               ReferenceBinding type = packageBinding.getType0(compoundName[i]);
-               if (type != null && type != TheNotFoundType && !(type instanceof UnresolvedReferenceBinding))
-                       return null;
-
-               PackageBinding parent = packageBinding;
-               if ((packageBinding = parent.getPackage0(compoundName[i])) == null || packageBinding == TheNotFoundPackage) {
-                       // if the package is unknown, check to see if a type exists which would collide with the new package
-                       // catches the case of a package statement of: package java.lang.Object;
-                       // since the package can be added after a set of source files have already been compiled, we need
-                       // whenever a package statement is encountered
-                       if (nameEnvironment.findType(compoundName[i], parent.compoundName) != null)
-                               return null;
-
-                       packageBinding = new PackageBinding(CharOperation.subarray(compoundName, 0, i + 1), parent, this);
-                       parent.addPackage(packageBinding);
-               }
-       }
-       return packageBinding;
+    return null;
+//     PackageBinding packageBinding = getPackage0(compoundName[0]);
+//     if (packageBinding == null || packageBinding == TheNotFoundPackage) {
+//             packageBinding = new PackageBinding(compoundName[0], this);
+//             knownPackages.put(compoundName[0], packageBinding);
+//     }
+//
+//     for (int i = 1, length = compoundName.length; i < length; i++) {
+//             // check to see if it collides with a known type...
+//             // this case can only happen if the package does not exist as a directory in the file system
+//             // otherwise when the source type was defined, the correct error would have been reported
+//             // unless its an unresolved type which is referenced from an inconsistent class file
+//             ReferenceBinding type = packageBinding.getType0(compoundName[i]);
+//             if (type != null && type != TheNotFoundType && !(type instanceof UnresolvedReferenceBinding))
+//                     return null;
+//
+//             PackageBinding parent = packageBinding;
+//             if ((packageBinding = parent.getPackage0(compoundName[i])) == null || packageBinding == TheNotFoundPackage) {
+//                     // if the package is unknown, check to see if a type exists which would collide with the new package
+//                     // catches the case of a package statement of: package java.lang.Object;
+//                     // since the package can be added after a set of source files have already been compiled, we need
+//                     // whenever a package statement is encountered
+//                     if (nameEnvironment.findType(compoundName[i], parent.compoundName) != null)
+//                             return null;
+//
+//                     packageBinding = new PackageBinding(CharOperation.subarray(compoundName, 0, i + 1), parent, this);
+//                     parent.addPackage(packageBinding);
+//             }
+//     }
+//     return packageBinding;
 }
 /* Answer the type for the compoundName if it exists in the cache.
 * Answer theNotFoundType if it could not be resolved the first time