From ed2ad8e8e3579150567df139f860debed03cf134 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 21 Dec 2015 20:41:45 +0300
Subject: [PATCH] Minor, fix warnings related to OperatorNameConventions

---
 .../kotlin/util/OperatorNameConventions.kt    | 75 ++++++++++---------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt b/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
index e13bff7b92d..f9df2e1283f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
@@ -17,55 +17,58 @@
 package org.jetbrains.kotlin.util
 
 import org.jetbrains.kotlin.name.Name
-import kotlin.text.Regex
 
 object OperatorNameConventions {
+    @JvmField val GET_VALUE = Name.identifier("getValue")
+    @JvmField val SET_VALUE = Name.identifier("setValue")
 
-    val GET_VALUE = Name.identifier("getValue")
-    val SET_VALUE = Name.identifier("setValue")
+    @JvmField val EQUALS = Name.identifier("equals")
+    @JvmField val IDENTITY_EQUALS = Name.identifier("identityEquals")
+    @JvmField val COMPARE_TO = Name.identifier("compareTo")
+    @JvmField val CONTAINS = Name.identifier("contains")
+    @JvmField val INVOKE = Name.identifier("invoke")
+    @JvmField val ITERATOR = Name.identifier("iterator")
+    @JvmField val GET = Name.identifier("get")
+    @JvmField val SET = Name.identifier("set")
+    @JvmField val NEXT = Name.identifier("next")
+    @JvmField val HAS_NEXT = Name.identifier("hasNext")
 
-    val EQUALS = Name.identifier("equals")
-    val IDENTITY_EQUALS = Name.identifier("identityEquals");
-    val COMPARE_TO = Name.identifier("compareTo")
-    val CONTAINS = Name.identifier("contains")
-    val INVOKE = Name.identifier("invoke")
-    val ITERATOR = Name.identifier("iterator")
-    val GET = Name.identifier("get")
-    val SET = Name.identifier("set")
-    val NEXT = Name.identifier("next")
-    val HAS_NEXT = Name.identifier("hasNext")
+    @JvmField val COMPONENT_REGEX = Regex("component\\d+")
 
-    val COMPONENT_REGEX = Regex("component\\d+")
+    @JvmField val AND = Name.identifier("and")
+    @JvmField val OR = Name.identifier("or")
 
-    val AND = Name.identifier("and")
-    val OR = Name.identifier("or")
+    @JvmField val INC = Name.identifier("inc")
+    @JvmField val DEC = Name.identifier("dec")
+    @JvmField val PLUS = Name.identifier("plus")
+    @JvmField val MINUS = Name.identifier("minus")
+    @JvmField val NOT = Name.identifier("not")
 
-    val INC = Name.identifier("inc")
-    val DEC = Name.identifier("dec")
-    val PLUS = Name.identifier("plus")
-    val MINUS = Name.identifier("minus")
-    val NOT = Name.identifier("not")
+    @JvmField val UNARY_MINUS = Name.identifier("unaryMinus")
+    @JvmField val UNARY_PLUS = Name.identifier("unaryPlus")
 
-    val UNARY_MINUS = Name.identifier("unaryMinus")
-    val UNARY_PLUS = Name.identifier("unaryPlus")
+    @JvmField val TIMES = Name.identifier("times")
+    @JvmField val DIV = Name.identifier("div")
+    @JvmField val MOD = Name.identifier("mod")
+    @JvmField val RANGE_TO = Name.identifier("rangeTo")
 
-    val TIMES = Name.identifier("times")
-    val DIV = Name.identifier("div")
-    val MOD = Name.identifier("mod")
-    val RANGE_TO = Name.identifier("rangeTo")
-
-    val TIMES_ASSIGN = Name.identifier("timesAssign")
-    val DIV_ASSIGN = Name.identifier("divAssign")
-    val MOD_ASSIGN = Name.identifier("modAssign")
-    val PLUS_ASSIGN = Name.identifier("plusAssign")
-    val MINUS_ASSIGN = Name.identifier("minusAssign")
+    @JvmField val TIMES_ASSIGN = Name.identifier("timesAssign")
+    @JvmField val DIV_ASSIGN = Name.identifier("divAssign")
+    @JvmField val MOD_ASSIGN = Name.identifier("modAssign")
+    @JvmField val PLUS_ASSIGN = Name.identifier("plusAssign")
+    @JvmField val MINUS_ASSIGN = Name.identifier("minusAssign")
 
     // If you add new unary, binary or assignment operators, add it to OperatorConventions as well
 
     @JvmField
     internal val UNARY_OPERATION_NAMES = setOf(INC, DEC, UNARY_PLUS, UNARY_MINUS, NOT)
-    internal val SIMPLE_UNARY_OPERATION_NAMES = setOf(UNARY_PLUS, UNARY_MINUS, NOT)
-    internal val BINARY_OPERATION_NAMES = setOf(TIMES, PLUS, MINUS, DIV, MOD, RANGE_TO)
-    internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN)
 
+    @JvmField
+    internal val SIMPLE_UNARY_OPERATION_NAMES = setOf(UNARY_PLUS, UNARY_MINUS, NOT)
+
+    @JvmField
+    internal val BINARY_OPERATION_NAMES = setOf(TIMES, PLUS, MINUS, DIV, MOD, RANGE_TO)
+
+    @JvmField
+    internal val ASSIGNMENT_OPERATIONS = setOf(TIMES_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN)
 }