Get rid of deprecated annotations and modifiers in project code

This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 02aafe4262
commit 9c4564a5a6
204 changed files with 485 additions and 439 deletions
@@ -47,7 +47,7 @@ public abstract class DeserializedPackageFragment(
protected var components: DeserializationComponents by Delegates.notNull()
// component dependency cycle
Inject
@Inject
public fun setDeserializationComponents(components: DeserializationComponents) {
this.components = components
}
@@ -25,7 +25,7 @@ public class LocalClassResolverImpl : LocalClassResolver {
public var components: DeserializationComponents by Delegates.notNull()
// component dependency cycle
Inject
@Inject
public fun setDeserializationComponents(components: DeserializationComponents) {
this.components = components
}
@@ -204,7 +204,7 @@ public class DeserializedClassDescriptor(
override fun computeNonDeclaredProperties(name: Name, descriptors: MutableCollection<PropertyDescriptor>) {
val fromSupertypes = ArrayList<PropertyDescriptor>()
for (supertype in classDescriptor.getTypeConstructor().supertypes) {
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
fromSupertypes.addAll(supertype.memberScope.getProperties(name, NoLookupLocation.FOR_ALREADY_TRACKED) as Collection<PropertyDescriptor>)
}
generateFakeOverrides(name, fromSupertypes, descriptors)
@@ -216,7 +216,7 @@ public class DeserializedClassDescriptor(
override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
// TODO: report "cannot infer visibility"
OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, null)
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
result.add(fakeOverride as D)
}
@@ -76,7 +76,7 @@ public abstract class DeserializedMemberScope protected constructor(
val memberProtos = membersProtos()[ProtoKey(name, kind, isExtension = false)].orEmpty() +
membersProtos()[ProtoKey(name, kind, isExtension = true)].orEmpty()
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
return memberProtos.mapTo(LinkedHashSet<D>()) { memberProto ->
c.memberDeserializer.loadCallable(memberProto) as D
}