Adjust J2K to latest protected visibility fixes

j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.kt

@@ -1,6 +1,5 @@
 open class Base internal constructor(x: Int) {
     var x = 42
-        protected set
 
     init {
         this.x = x

j2k/testData/fileOrElement/protected/inheritorsSamePackage.java

@@ -5,10 +5,14 @@ public class BaseInheritorSamePackage {
 
     }
 
-    protected void foo() {
+    protected BaseInheritorSamePackage(int x) {
 
     }
 
+    protected void foo() {
+        new BaseInheritorSamePackage(1);
+    }
+
     protected int i = 1;
 }
 

j2k/testData/fileOrElement/protected/inheritorsSamePackage.kt

@@ -1,12 +1,19 @@
 package test
 
-open class BaseInheritorSamePackage protected constructor() {
-
-    protected fun foo() {
+open class BaseInheritorSamePackage {
+    constructor() {
 
     }
 
-    protected var i = 1
+    protected constructor(x: Int) {
+
+    }
+
+    fun foo() {
+        BaseInheritorSamePackage(1)
+    }
+
+    var i = 1
 }
 
 internal class DerivedInheritorSamePackage : BaseInheritorSamePackage() {

j2k/testData/multiFile/ProtectedVisibility/InheritorOtherPackage2.java

@@ -3,9 +3,9 @@ package test2;
 import test.*;
 
 public class DerivedOtherPackage extends BaseOtherPackage {
-    public void usage1() {
-        BaseOtherPackage base = new BaseOtherPackage();
-        base.foo();
-        int i = base.i;
+    protected DerivedOtherPackage() {
+        super();
+        foo();
+        int i = this.i;
     }
 }

j2k/testData/multiFile/ProtectedVisibility/InheritorOtherPackage2.kt

@@ -2,10 +2,9 @@ package test2
 
 import test.*
 
-class DerivedOtherPackage : BaseOtherPackage() {
-    fun usage1() {
-        val base = BaseOtherPackage()
-        base.foo()
-        val i = base.i
+class DerivedOtherPackage protected constructor() : BaseOtherPackage() {
+    init {
+        foo()
+        val i = this.i
     }
 }

j2k/testData/multiFile/ProtectedVisibility/external/KotlinFile.kt

@@ -3,9 +3,8 @@ package test3
 import test.*
 
 class DerivedOtherPackageKotlin : BaseOtherPackage() {
-    fun usage1() {
-        val base = BaseOtherPackage()
-        base.foo()
-        val i = base.i
+    init {
+        foo()
+        val i = this.i
     }
 }

j2k/testData/multiFile/ProtectedVisibility/external/KotlinFile.kt.expected

@@ -3,9 +3,8 @@ package test3
 import test.*
 
 class DerivedOtherPackageKotlin : BaseOtherPackage() {
-    fun usage1() {
-        val base = BaseOtherPackage()
-        base.foo()
-        val i = base.i
+    init {
+        foo()
+        val i = this.i
     }
 }