diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java new file mode 100644 index 00000000000..59a63496408 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2017 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.kotlin.idea.run; + +import com.intellij.execution.CommonJavaRunConfigurationParameters; +import com.intellij.execution.ExternalizablePath; +import com.intellij.execution.configurations.ConfigurationFactory; +import com.intellij.execution.configurations.JavaRunConfigurationModule; +import com.intellij.execution.configurations.ModuleBasedConfiguration; +import com.intellij.execution.configurations.RefactoringListenerProvider; + +/** + * @deprecated Will be dropped in 1.2.20. Use KotlinRunConfiguration instead. + */ +@SuppressWarnings("DeprecatedIsStillUsed") +@Deprecated +public abstract class JetRunConfiguration extends ModuleBasedConfiguration + implements CommonJavaRunConfigurationParameters, RefactoringListenerProvider { + public String MAIN_CLASS_NAME; + public String WORKING_DIRECTORY; + + public JetRunConfiguration(String name, JavaRunConfigurationModule runConfigurationModule, ConfigurationFactory factory) { + super(name, runConfigurationModule, factory); + } + + @Override + public void setWorkingDirectory(String value) { + WORKING_DIRECTORY = ExternalizablePath.urlValue(value); + } + + @Override + public String getWorkingDirectory() { + return ExternalizablePath.localPathValue(WORKING_DIRECTORY); + } +} diff --git a/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java index ee51a0282a6..0381b90bfbc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java @@ -64,19 +64,16 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import java.util.*; -public class KotlinRunConfiguration extends ModuleBasedConfiguration - implements CommonJavaRunConfigurationParameters, RefactoringListenerProvider { - - public String MAIN_CLASS_NAME; +@SuppressWarnings("deprecation") +public class KotlinRunConfiguration extends JetRunConfiguration { public String VM_PARAMETERS; public String PROGRAM_PARAMETERS; - public String WORKING_DIRECTORY; - public boolean ALTERNATIVE_JRE_PATH_ENABLED; public String ALTERNATIVE_JRE_PATH; - private Map myEnvs = new LinkedHashMap(); public boolean PASS_PARENT_ENVS = true; + private Map myEnvs = new LinkedHashMap(); + public KotlinRunConfiguration(String name, JavaRunConfigurationModule runConfigurationModule, ConfigurationFactory factory) { super(name, runConfigurationModule, factory); runConfigurationModule.init(); @@ -146,16 +143,6 @@ public class KotlinRunConfiguration extends ModuleBasedConfiguration