View | Details | Raw Unified | Return to bug 196354 | Differences between
and this patch

Collapse All | Expand All

(-)dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java (-8 / +15 lines)
Lines 1327-1342 Link Here
1327
				ImportReference importReference = (ImportReference) node;
1327
				ImportReference importReference = (ImportReference) node;
1328
				Binding binding = this.scope.getTypeOrPackage(CharOperation.subarray(importReference.tokens, 0, importReference.tokens.length));
1328
				Binding binding = this.scope.getTypeOrPackage(CharOperation.subarray(importReference.tokens, 0, importReference.tokens.length));
1329
				if ((binding != null) && (binding.isValidBinding())) {
1329
				if ((binding != null) && (binding.isValidBinding())) {
1330
					IPackageBinding packageBinding = this.getPackageBinding((org.eclipse.jdt.internal.compiler.lookup.PackageBinding) binding);
1330
					if (binding instanceof ReferenceBinding) {
1331
					if (packageBinding == null) {
1331
						// this only happens if a type name has the same name as its package
1332
						return null;
1332
						ReferenceBinding referenceBinding = (ReferenceBinding) binding;
1333
						binding = referenceBinding.fPackage;
1333
					}
1334
					}
1334
					this.bindingsToAstNodes.put(packageBinding, pkg);
1335
					if (binding instanceof org.eclipse.jdt.internal.compiler.lookup.PackageBinding) {
1335
					String key = packageBinding.getKey();
1336
						IPackageBinding packageBinding = this.getPackageBinding((org.eclipse.jdt.internal.compiler.lookup.PackageBinding) binding);
1336
					if (key != null) {
1337
						if (packageBinding == null) {
1337
						this.bindingTables.bindingKeysToBindings.put(key, packageBinding);
1338
							return null;
1339
						}
1340
						this.bindingsToAstNodes.put(packageBinding, pkg);
1341
						String key = packageBinding.getKey();
1342
						if (key != null) {
1343
							this.bindingTables.bindingKeysToBindings.put(key, packageBinding);
1344
						}
1345
						return packageBinding;
1338
					}
1346
					}
1339
					return packageBinding;
1340
				}
1347
				}
1341
			}
1348
			}
1342
		} catch (AbortCompilation e) {
1349
		} catch (AbortCompilation e) {

Return to bug 196354