From 2c8483aef47a47eaafd94464af7441addc3a391a Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 18 Dec 2018 15:06:06 +0300
Subject: [PATCH] New J2K: Rearrange conversions & add new ones

---
 .../org/jetbrains/kotlin/j2k/ConversionsRunner.kt    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
index 13e33f3527e..9ea0d6e5107 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
@@ -35,18 +35,21 @@ object ConversionsRunner {
             +AssignmentStatementSimplifyAlsoConversion()
             +OperatorExpressionConversion(context)
             +ThrowStatementConversion()
+            +EnumClassConversion()
             +ArrayInitializerConversion(context)
             +TryStatementConversion(context)
-            +ImplicitInitializerConversion()
+            +ConstructorConversion(context)
+            +ImplicitInitializerConversion(context)
+            +ParameterModificationInMethodCallsConversion(context)
             +PrimitiveTypesInitializersConversion(context)
             +DefaultArgumentsConversion(context)
-            +FieldToPropertyConversion(context)
             +PrintlnConversion(context)
             +BlockToRunConversion(context)
-            +ConstructorConversion(context)
+            +LowerNullabilityInFunctionParametersConversion(context)
             +PrimaryConstructorDetectConversion(context)
             +InsertDefaultPrimaryConstructorConversion(context)
-            +FieldInitializersInPrimaryFromParamsConversion(context)
+            +FieldToPropertyConversion()
+            +JavaStandartMethodsConversion()
             +JavaMethodToKotlinFunctionConversion(context)
             +MainFunctionConversion(context)
             +LiteralConversion()
@@ -58,7 +61,6 @@ object ConversionsRunner {
             +ForInConversion()
             +CollectionOperationsConversion(context)
             +ArrayOperationsConversion(context)
-            +LowerNullabilityInFunctionParametersConversion(context)
             +TypeMappingConversion(context)
 
             //Kotlin --> Kotlin conversions