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

Collapse All | Expand All

(-)ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditor.java (-25 / +6 lines)
Lines 2321-2355 Link Here
2321
						length= range.getLength();
2321
						length= range.getLength();
2322
					}
2322
					}
2323
				} else if (reference instanceof IImportDeclaration) {
2323
				} else if (reference instanceof IImportDeclaration) {
2324
					String content= reference.getSource();
2324
					range= ((IImportDeclaration)reference).getNameRange();
2325
					if (content != null) {
2325
					if (range != null) {
2326
						int start= content.indexOf("import") + 6; //$NON-NLS-1$
2327
						while (start < content.length() && content.charAt(start) == ' ')
2328
							start++;
2329
2330
						int end= content.indexOf(';');
2331
						do {
2332
							end--;
2333
						} while (end >= 0 && content.charAt(end) == ' ');
2334
2335
						offset= range.getOffset() + start;
2336
						length= end - start + 1;
2337
					} else {
2338
						// fallback
2339
						offset= range.getOffset();
2326
						offset= range.getOffset();
2340
						length= range.getLength();
2327
						length= range.getLength();
2341
					}
2328
					}
2342
				} else if (reference instanceof IPackageDeclaration) {
2329
				} else if (reference instanceof IPackageDeclaration) {
2343
					String name= ((IPackageDeclaration) reference).getElementName();
2330
					range= ((IPackageDeclaration)reference).getNameRange();
2344
					if (name != null && name.length() > 0) {
2331
					if (range != null) {
2345
						String content= reference.getSource();
2332
						offset= range.getOffset();
2346
						if (content != null) {
2333
						length= range.getLength();
2347
							int packageKeyWordIndex = content.lastIndexOf("package"); //$NON-NLS-1$
2348
							if (packageKeyWordIndex != -1) {
2349
								offset= range.getOffset() + content.indexOf(name, packageKeyWordIndex + 7);
2350
								length= name.length();
2351
							}
2352
						}
2353
					}
2334
					}
2354
				}
2335
				}
2355
2336

Return to bug 150980