Enum warnings fixed: deprecated delimiters, short super constructors, both in project and in libraries

This commit is contained in:
Mikhail Glukhikh
2015-05-18 13:19:52 +03:00
parent 5c3d8c1616
commit fdf0ea5546
77 changed files with 399 additions and 399 deletions
@@ -357,8 +357,8 @@ trait JavaTypeAttributes {
}
enum class JavaTypeFlexibility {
INFLEXIBLE
FLEXIBLE_UPPER_BOUND
INFLEXIBLE,
FLEXIBLE_UPPER_BOUND,
FLEXIBLE_LOWER_BOUND
}
@@ -44,8 +44,8 @@ public class KotlinClassHeader(
}
public enum class Kind {
CLASS
PACKAGE_FACADE
CLASS,
PACKAGE_FACADE,
SYNTHETIC_CLASS
}
@@ -48,8 +48,8 @@ public fun FqName.tail(prefix: FqName): FqName {
}
private enum class State {
BEGINNING
MIDDLE
BEGINNING,
MIDDLE,
AFTER_DOT
}
@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.resolve.calls.inference.constraintPosition
import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.*
public enum class ConstraintPositionKind {
RECEIVER_POSITION
EXPECTED_TYPE_POSITION
VALUE_PARAMETER_POSITION
TYPE_BOUND_POSITION
COMPOUND_CONSTRAINT_POSITION
FROM_COMPLETER
SPECIAL
RECEIVER_POSITION,
EXPECTED_TYPE_POSITION,
VALUE_PARAMETER_POSITION,
TYPE_BOUND_POSITION,
COMPOUND_CONSTRAINT_POSITION,
FROM_COMPLETER,
SPECIAL;
public fun position(): ConstraintPosition {
assert(this in setOf(RECEIVER_POSITION, EXPECTED_TYPE_POSITION, FROM_COMPLETER, SPECIAL))
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.types.TypeSubstitution
public class ConstraintSystemImpl : ConstraintSystem {
public enum class ConstraintKind {
SUB_TYPE
SUB_TYPE,
EQUAL
}
@@ -35,8 +35,8 @@ public trait TypeBounds {
public fun getValues(): Collection<JetType>
public enum class BoundKind {
LOWER_BOUND
UPPER_BOUND
LOWER_BOUND,
UPPER_BOUND,
EXACT_BOUND
}
@@ -23,8 +23,8 @@ public trait TypeCapability
public trait Specificity : TypeCapability {
public enum class Relation {
LESS_SPECIFIC
MORE_SPECIFIC
LESS_SPECIFIC,
MORE_SPECIFIC,
DONT_KNOW
}
@@ -22,9 +22,9 @@ public enum class Variance(
public val allowsOutPosition: Boolean,
private val superpositionFactor: Int
) {
INVARIANT : Variance("", true, true, 0)
IN_VARIANCE : Variance("in", true, false, -1)
OUT_VARIANCE : Variance("out", false, true, +1)
INVARIANT("", true, true, 0),
IN_VARIANCE("in", true, false, -1),
OUT_VARIANCE("out", false, true, +1);
public fun allowsPosition(position: Variance): Boolean
= when (position) {
@@ -34,7 +34,7 @@ public abstract class DeserializedMemberScope protected(
) : JetScope {
private data class ProtoKey(val name: Name, val kind: Kind, val isExtension: Boolean)
private enum class Kind { FUNCTION PROPERTY }
private enum class Kind { FUNCTION, PROPERTY }
private fun CallableKind.toKind(): Kind {
return when (this) {