From ff6ebbdf11c439352235253b13b4e2657760e273 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 6 Dec 2017 10:41:59 +0100
Subject: [PATCH] =?UTF-8?q?migrate=20AppletConfiguration=20and=20BndRunCon?=
 =?UTF-8?q?figuration=20to=20BaseState=20=E2=80=94=20part=203,=20fix=20tes?=
 =?UTF-8?q?ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/AppletConfigurationOptions.kt      |  7 ++--
 .../ModuleBasedConfiguration.java             | 38 +++++++++++--------
 .../configurations/RunConfiguration.java      | 16 +-------
 .../configurations/RunConfigurationBase.java  |  6 ++-
 .../RunConfigurationModule.java               | 15 +-------
 .../configurations/RunConfigurationOptions.kt | 22 ++++-------
 .../convertModuleGroupsToQualifiedNames.kt    |  4 +-
 7 files changed, 44 insertions(+), 64 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationOptions.kt b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationOptions.kt
index 2f04bf2eb14a..18c30ecca942 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationOptions.kt
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationOptions.kt
@@ -1,11 +1,12 @@
-// Copyright 2000-2017 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.
+/*
+ * Copyright 2000-2017 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.applet
 
-import com.intellij.execution.configurations.JavaRunConfigurationModule
 import com.intellij.execution.configurations.ModuleBasedConfigurationOptions
 import com.intellij.util.xmlb.annotations.OptionTag
 
-class AppletConfigurationOptions : ModuleBasedConfigurationOptions<JavaRunConfigurationModule>() {
+class AppletConfigurationOptions : ModuleBasedConfigurationOptions() {
   @get:OptionTag("MAIN_CLASS_NAME") var mainClassName by string()
   @get:OptionTag("HTML_FILE_NAME") var htmlFileName by string()
   @get:OptionTag("HTML_USED") var htmlUsed by storedProperty(false)
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
index e84ef8463733..a70eebe16efb 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 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.
+/*
+ * Copyright 2000-2017 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.configurations;
 
 import com.intellij.openapi.application.ReadAction;
@@ -25,18 +27,21 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
 
   protected static final String TO_CLONE_ELEMENT_NAME = "toClone";
 
+  private final ConfigurationModule myModule;
+
   public ModuleBasedConfiguration(String name, @NotNull ConfigurationModule configurationModule, @NotNull ConfigurationFactory factory) {
     super(configurationModule.getProject(), factory, name);
 
-    ModuleBasedConfigurationOptions<ConfigurationModule> options = getOptions();
-    options.setModule(configurationModule);
+    myModule = configurationModule;
+    ModuleBasedConfigurationOptions options = getOptions();
+    options.setModule(myModule.getModuleName());
     options.resetModificationCount();
   }
 
   @Override
-  protected ModuleBasedConfigurationOptions<ConfigurationModule> getOptions() {
+  protected ModuleBasedConfigurationOptions getOptions() {
     //noinspection unchecked
-    return (ModuleBasedConfigurationOptions<ConfigurationModule>)super.getOptions();
+    return (ModuleBasedConfigurationOptions)super.getOptions();
   }
 
   @Override
@@ -47,15 +52,16 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
   public ModuleBasedConfiguration(@NotNull ConfigurationModule configurationModule, @NotNull ConfigurationFactory factory) {
     super(configurationModule.getProject(), factory, "");
 
-    ModuleBasedConfigurationOptions<ConfigurationModule> options = getOptions();
-    options.setModule(configurationModule);
+    myModule = configurationModule;
+    ModuleBasedConfigurationOptions options = getOptions();
+    options.setModule(myModule.getModuleName());
     options.resetModificationCount();
   }
 
   public abstract Collection<Module> getValidModules();
 
   public ConfigurationModule getConfigurationModule() {
-    return getOptions().getModule();
+    return myModule;
   }
 
   public void setModule(final Module module) {
@@ -93,15 +99,17 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
   }
 
   @Override
-  public void readExternal(Element element) throws InvalidDataException {
-    ConfigurationModule module = getConfigurationModule();
+  public void readExternal(@NotNull Element element) throws InvalidDataException {
     super.readExternal(element);
 
-    // if null after read, it means that no such field at all in the data, but our clients expect that will be some not null ConfigurationModule wrapper
-    if (getConfigurationModule() == null) {
-      module.setModule(null);
-      getOptions().setModule(module);
-    }
+    myModule.setModuleName(getOptions().getModule());
+  }
+
+  @Override
+  public void writeExternal(@NotNull Element element) throws WriteExternalException {
+    getOptions().setModule(myModule.getModuleName());
+
+    super.writeExternal(element);
   }
 
   @SuppressWarnings("MethodDoesntCallSuperMethod")
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java
index 57299e47b8b6..b0e78b03e21c 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java
@@ -1,17 +1,5 @@
 /*
- * Copyright 2000-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.
+ * Copyright 2000-2017 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.configurations;
 
@@ -135,7 +123,7 @@ public interface RunConfiguration extends RunProfile, Cloneable {
   default void checkConfiguration() throws RuntimeConfigurationException {
   }
 
-  default void readExternal(Element element) {
+  default void readExternal(@NotNull Element element) {
   }
 
   default void writeExternal(Element element) {
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
index 78f92fb72356..a5647e644eb0 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 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.
+/*
+ * Copyright 2000-2017 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.configurations;
 
 import com.intellij.configurationStore.ComponentSerializationUtil;
@@ -195,7 +197,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements
   }
 
   @Override
-  public void readExternal(Element element) throws InvalidDataException {
+  public void readExternal(@NotNull Element element) throws InvalidDataException {
     myLogFiles.clear();
     for (Element o : element.getChildren(LOG_FILE)) {
       LogFileOptions logFileOptions = new LogFileOptions();
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
index 5a1f929ed9f9..c2ca593528d7 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java
@@ -1,19 +1,6 @@
 /*
- * Copyright 2000-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.
+ * Copyright 2000-2017 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.configurations;
 
 import com.intellij.execution.ExecutionBundle;
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationOptions.kt b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationOptions.kt
index 6cefeaaeedf9..b4993c2c7043 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationOptions.kt
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationOptions.kt
@@ -1,9 +1,11 @@
-// Copyright 2000-2017 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.
+/*
+ * Copyright 2000-2017 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.configurations
 
 import com.intellij.openapi.components.BaseState
-import com.intellij.util.xmlb.Accessor
 import com.intellij.util.xmlb.annotations.Attribute
+import com.intellij.util.xmlb.annotations.OptionTag
 import com.intellij.util.xmlb.annotations.Property
 import com.intellij.util.xmlb.annotations.Tag
 
@@ -25,17 +27,7 @@ open class LocatableRunConfigurationOptions : RunConfigurationOptions() {
   @get:Attribute("nameIsGenerated") var isNameGenerated by storedProperty(false)
 }
 
-open class ModuleBasedConfigurationOptions<ConfigurationModule : RunConfigurationModule> : LocatableRunConfigurationOptions() {
-  @get:Property(surroundWithTag = false)
-  var module by storedProperty<ConfigurationModule>()
-
-  override fun accepts(accessor: Accessor, bean: Any): Boolean {
-    if (accessor.name == "module") {
-      val module = module
-      return module != null && module.moduleName.isNotEmpty()
-    }
-    else {
-      return super.accepts(accessor, bean)
-    }
-  }
+open class ModuleBasedConfigurationOptions : LocatableRunConfigurationOptions() {
+  @get:OptionTag(tag = "module", valueAttribute = "name", nameAttribute = "")
+  var module by string()
 }
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt b/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt
index 6c1e947dae33..5ea5a23b57cc 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt
+++ b/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 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.
+/*
+ * Copyright 2000-2017 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.ide.actions.project
 
 import com.intellij.CommonBundle