mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
rename to JvmMainMethodRunConfigurationOptions
This commit is contained in:
+5
-5
@@ -61,16 +61,16 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
|
||||
// backward compatibility (if 3rd-party plugin extends ApplicationConfigurationType but uses own factory without options class)
|
||||
@Override
|
||||
@NotNull
|
||||
protected final Class<? extends ApplicationConfigurationOptions> getDefaultOptionsClass() {
|
||||
return ApplicationConfigurationOptions.class;
|
||||
protected final Class<? extends JvmMainMethodRunConfigurationOptions> getDefaultOptionsClass() {
|
||||
return JvmMainMethodRunConfigurationOptions.class;
|
||||
}
|
||||
|
||||
/**
|
||||
* Because we have to keep backward compatibility, never use `getOptions()` to get or set values - use only designated getters/setters.
|
||||
*/
|
||||
@Override
|
||||
protected ApplicationConfigurationOptions getOptions() {
|
||||
return (ApplicationConfigurationOptions)super.getOptions();
|
||||
protected JvmMainMethodRunConfigurationOptions getOptions() {
|
||||
return (JvmMainMethodRunConfigurationOptions)super.getOptions();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -281,7 +281,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
|
||||
public void readExternal(@NotNull final Element element) {
|
||||
super.readExternal(element);
|
||||
|
||||
ApplicationConfigurationOptions options = getOptions();
|
||||
JvmMainMethodRunConfigurationOptions options = getOptions();
|
||||
|
||||
String workingDirectory = options.getWorkingDirectory();
|
||||
if (workingDirectory == null) {
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ public class ApplicationConfigurationType implements ConfigurationType {
|
||||
myFactory = new ConfigurationFactory(this) {
|
||||
@Override
|
||||
public Class<? extends BaseState> getOptionsClass() {
|
||||
return ApplicationConfigurationOptions.class;
|
||||
return JvmMainMethodRunConfigurationOptions.class;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import com.intellij.util.xmlb.annotations.OptionTag
|
||||
import com.intellij.util.xmlb.annotations.XMap
|
||||
import java.util.*
|
||||
|
||||
open class ApplicationConfigurationOptions : JvmConfigurationOptions() {
|
||||
open class JvmMainMethodRunConfigurationOptions : JvmConfigurationOptions() {
|
||||
@get:OptionTag("PROGRAM_PARAMETERS")
|
||||
open var programParameters: String? by string()
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package com.intellij.execution.scratch;
|
||||
|
||||
import com.intellij.execution.application.ApplicationConfigurationOptions
|
||||
import com.intellij.execution.application.JvmMainMethodRunConfigurationOptions
|
||||
import com.intellij.util.xmlb.annotations.OptionTag
|
||||
|
||||
open class JavaScratchConfigurationOptions: ApplicationConfigurationOptions() {
|
||||
open class JavaScratchConfigurationOptions: JvmMainMethodRunConfigurationOptions() {
|
||||
@get:OptionTag("SCRATCH_FILE_URL")
|
||||
open var scratchFileUrl: String? by string()
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.intellij.configurationScript
|
||||
|
||||
import com.google.gson.Gson
|
||||
import com.intellij.execution.application.ApplicationConfigurationOptions
|
||||
import com.intellij.execution.application.JvmMainMethodRunConfigurationOptions
|
||||
import com.intellij.execution.configurations.ConfigurationTypeBase
|
||||
import com.intellij.testFramework.ProjectRule
|
||||
import com.intellij.testFramework.assertions.Assertions.assertThat
|
||||
@@ -79,7 +79,7 @@ class ConfigurationFileTest {
|
||||
jvmMainMethod:
|
||||
isAlternativeJrePathEnabled: true
|
||||
""")
|
||||
val options = ApplicationConfigurationOptions()
|
||||
val options = JvmMainMethodRunConfigurationOptions()
|
||||
options.isAlternativeJrePathEnabled = true
|
||||
assertThat(result).containsExactly(options)
|
||||
}
|
||||
@@ -91,7 +91,7 @@ class ConfigurationFileTest {
|
||||
jvmMainMethod:
|
||||
- isAlternativeJrePathEnabled: true
|
||||
""")
|
||||
val options = ApplicationConfigurationOptions()
|
||||
val options = JvmMainMethodRunConfigurationOptions()
|
||||
options.isAlternativeJrePathEnabled = true
|
||||
assertThat(result).containsExactly(options)
|
||||
}
|
||||
@@ -104,7 +104,7 @@ class ConfigurationFileTest {
|
||||
jvmMainMethod:
|
||||
- isAlternativeJrePathEnabled: true
|
||||
""", isTemplatesOnly = true)
|
||||
val options = ApplicationConfigurationOptions()
|
||||
val options = JvmMainMethodRunConfigurationOptions()
|
||||
options.isAlternativeJrePathEnabled = true
|
||||
assertThat(result).containsExactly(options)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user