From df0dddedc260d79a982537a1fa3f94adda631333 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 12 Oct 2016 11:52:54 +0300
Subject: [PATCH] Fixes for test(@JvmStatic -> const), fix for prototype assign

---
 j2k/src/org/jetbrains/kotlin/j2k/Converter.kt    | 2 +-
 j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt | 2 +-
 j2k/testData/fileOrElement/issues/kt-837.kt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
index ca8de8899cb..5bcb5c7689f 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
@@ -311,7 +311,7 @@ class Converter private constructor(
         //TODO: annotations from getter/setter?
         val annotations = field?.let { convertAnnotations(it) } ?: Annotations.Empty
 
-        val modifiers = propertyInfo.modifiers + (field?.let{ specialModifiersCase(field) } ?: Modifiers.Empty)
+        val modifiers = (propertyInfo.modifiers + (field?.let{ specialModifiersCase(field) } ?: Modifiers.Empty))
 
         val name = propertyInfo.identifier
         if (field is PsiEnumConstant) {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
index 84bcfcaaebd..35a5c102a18 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
@@ -68,7 +68,7 @@ class Modifiers(modifiers: Collection<Modifier>) : Element() {
     fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS }
 
     operator fun plus(other: Modifiers): Modifiers {
-        return Modifiers(this.modifiers + other.modifiers).assignNoPrototype()
+        return Modifiers(this.modifiers + other.modifiers).assignPrototypesFrom(this)
     }
 
     companion object {
diff --git a/j2k/testData/fileOrElement/issues/kt-837.kt b/j2k/testData/fileOrElement/issues/kt-837.kt
index 1ffd30794ea..fb1b0a220f4 100644
--- a/j2k/testData/fileOrElement/issues/kt-837.kt
+++ b/j2k/testData/fileOrElement/issues/kt-837.kt
@@ -11,6 +11,6 @@ class Language(protected var code: String) : Serializable {
     companion object {
         var ENGLISH = Language("en")
         var SWEDISH = Language("sv")
-        @JvmStatic private val serialVersionUID = -2442762969929206780L
+        private const val serialVersionUID = -2442762969929206780L
     }
 }
\ No newline at end of file