From f2ba3cf1577b47fb860495a86b1af3a8b47a45cc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 18 Jul 2013 15:47:39 +0400 Subject: [PATCH] Rename package in JPS plugin tests Package 'kotlin' is not supported until package views are implemented, because its name clashes with the stdlib Original commit: 2af8dd42988351f519a44f5987eb085c8bdc4ac5 --- .../testData/JKJInheritanceProject/src/java/JSecond.java | 4 ++-- .../testData/JKJInheritanceProject/src/kotlin/KFirst.kt | 4 ++-- .../testData/KJKInheritanceProject/src/java/JFirst.java | 4 ++-- .../testData/KJKInheritanceProject/src/kotlin/KFirst.kt | 4 ++-- .../testData/KJKInheritanceProject/src/kotlin/KSecond.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java index 67a1468df22..8642080e27e 100644 --- a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java @@ -1,7 +1,7 @@ package java; -public class JSecond extends kotlin.KFirst { +public class JSecond extends kt.KFirst { public void bar() { foo(); } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt index 4aad7100d2d..0b2d2794572 100644 --- a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt @@ -1,5 +1,5 @@ -package kotlin +package kt open class KFirst(): java.JFirst() { -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java index 9efa068707f..987a5777332 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java @@ -1,4 +1,4 @@ package java; -public class JFirst extends kotlin.KFirst { -} \ No newline at end of file +public class JFirst extends kt.KFirst { +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt index 9e026a45f77..8a5eaf4c6de 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt @@ -1,6 +1,6 @@ -package kotlin +package kt open class KFirst() { fun foo() { } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt index eec804c1b7b..a36c93094f3 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt @@ -1,7 +1,7 @@ -package kotlin +package kt class KSecond(): java.JFirst() { fun bar() { foo() } -} \ No newline at end of file +}