Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/javac/comp/Check.java
src/share/classes/com/sun/tools/javac/comp/Check.java
- changeset 2102
- 6dcf94e32a3a
- parent 2079
- de1c5dbe6c28
- child 2111
- 87b5bfef7edb
equal
deleted
inserted
replaced
| 2101:933ba3f81a87 | 2102:6dcf94e32a3a |
|---|---|
| 3418 if ((isClassDecl || sym != e.sym) && | 3418 if ((isClassDecl || sym != e.sym) && |
| 3419 sym.kind == e.sym.kind && | 3419 sym.kind == e.sym.kind && |
| 3420 sym.name != names.error && | 3420 sym.name != names.error && |
| 3421 (!staticImport || !e.isStaticallyImported())) { | 3421 (!staticImport || !e.isStaticallyImported())) { |
| 3422 if (!e.sym.type.isErroneous()) { | 3422 if (!e.sym.type.isErroneous()) { |
| 3423 String what = e.sym.toString(); | |
| 3424 if (!isClassDecl) { | 3423 if (!isClassDecl) { |
| 3425 if (staticImport) | 3424 if (staticImport) |
| 3426 log.error(pos, "already.defined.static.single.import", what); | 3425 log.error(pos, "already.defined.static.single.import", e.sym); |
| 3427 else | 3426 else |
| 3428 log.error(pos, "already.defined.single.import", what); | 3427 log.error(pos, "already.defined.single.import", e.sym); |
| 3429 } | 3428 } |
| 3430 else if (sym != e.sym) | 3429 else if (sym != e.sym) |
| 3431 log.error(pos, "already.defined.this.unit", what); | 3430 log.error(pos, "already.defined.this.unit", e.sym); |
| 3432 } | 3431 } |
| 3433 return false; | 3432 return false; |
| 3434 } | 3433 } |
| 3435 } | 3434 } |
| 3436 return true; | 3435 return true; |
