From b44563aa36d3c412233a8283ae7d12af73b4d2f5 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 16 Sep 2015 15:24:02 +0300
Subject: [PATCH] no need to instantiate Kotlin class via reflection since
 Kotlin plugin in now required for IDEA project

---
 .../java/MockPackageFacadeBuilderService.java | 47 -------------------
 .../java/MockPackageFacadeBuilderService.kt   | 28 +++++++++++
 2 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.java
 create mode 100644 jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.kt

diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.java b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.java
deleted file mode 100644
index 15e95054de45..000000000000
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.jps.builders.java;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.incremental.BuilderService;
-import org.jetbrains.jps.incremental.ModuleLevelBuilder;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author nik
- */
-public class MockPackageFacadeBuilderService extends BuilderService {
-  @NotNull
-  @Override
-  public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() {
-    //todo[nik] this is a temporary solution until all team members have Kotlin plugin installed
-    try {
-      Class<?> aClass = Class.forName("org.jetbrains.jps.builders.java.MockPackageFacadeGenerator");
-      return Collections.singletonList((ModuleLevelBuilder)aClass.newInstance());
-    }
-    catch (ClassNotFoundException e) {
-      return Collections.emptyList();
-    }
-    catch (NoClassDefFoundError e) {
-      return Collections.emptyList();
-    }
-    catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.kt b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.kt
new file mode 100644
index 000000000000..c71aa08de969
--- /dev/null
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilderService.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jps.builders.java
+
+import org.jetbrains.jps.incremental.BuilderService
+import org.jetbrains.jps.incremental.ModuleLevelBuilder
+
+import java.util.Collections
+
+/**
+ * @author nik
+ */
+public class MockPackageFacadeBuilderService : BuilderService() {
+  override fun createModuleLevelBuilders() = listOf(MockPackageFacadeGenerator())
+}