equal
deleted
inserted
replaced
315 JavaFileObject prev = log.useSource(env.toplevel.sourcefile); |
315 JavaFileObject prev = log.useSource(env.toplevel.sourcefile); |
316 try { |
316 try { |
317 importFrom(tsym); |
317 importFrom(tsym); |
318 if (!found) { |
318 if (!found) { |
319 log.error(pos, "cant.resolve.location", |
319 log.error(pos, "cant.resolve.location", |
320 JCDiagnostic.fragment("kindname.static"), |
320 KindName.STATIC, |
321 name, "", "", Resolve.typeKindName(tsym.type), |
321 name, List.<Type>nil(), List.<Type>nil(), |
|
322 typeKindName(tsym.type), |
322 tsym.type); |
323 tsym.type); |
323 } |
324 } |
324 } finally { |
325 } finally { |
325 log.useSource(prev); |
326 log.useSource(prev); |
326 } |
327 } |
717 if (s.attributes_field != null && |
718 if (s.attributes_field != null && |
718 s.attributes_field.nonEmpty() && |
719 s.attributes_field.nonEmpty() && |
719 annotations.nonEmpty()) |
720 annotations.nonEmpty()) |
720 log.error(annotations.head.pos, |
721 log.error(annotations.head.pos, |
721 "already.annotated", |
722 "already.annotated", |
722 Resolve.kindName(s), s); |
723 kindName(s), s); |
723 enterAnnotations(annotations, localEnv, s); |
724 enterAnnotations(annotations, localEnv, s); |
724 } finally { |
725 } finally { |
725 log.useSource(prev); |
726 log.useSource(prev); |
726 } |
727 } |
727 } |
728 } |