equal
deleted
inserted
replaced
1572 Env<AttrContext> env = typeEnvs.get(msym); |
1572 Env<AttrContext> env = typeEnvs.get(msym); |
1573 JavaFileObject origSource = env != null ? log.useSource(env.toplevel.sourcefile) |
1573 JavaFileObject origSource = env != null ? log.useSource(env.toplevel.sourcefile) |
1574 : null; |
1574 : null; |
1575 DiagnosticPosition pos = env != null ? env.tree.pos() : null; |
1575 DiagnosticPosition pos = env != null ? env.tree.pos() : null; |
1576 try { |
1576 try { |
1577 log.error(pos, Errors.PackageClashFromRequires(msym, packageName, |
1577 if (msym.isUnnamed()) { |
1578 previousModule, exportsFrom)); |
1578 log.error(pos, Errors.PackageClashFromRequiresInUnnamed(packageName, |
|
1579 previousModule, exportsFrom)); |
|
1580 } else { |
|
1581 log.error(pos, Errors.PackageClashFromRequires(msym, packageName, |
|
1582 previousModule, exportsFrom)); |
|
1583 } |
1579 } finally { |
1584 } finally { |
1580 if (env != null) |
1585 if (env != null) |
1581 log.useSource(origSource); |
1586 log.useSource(origSource); |
1582 } |
1587 } |
1583 continue; |
1588 continue; |