From 4cdab48b0d5b3d4a4f1c7df8d3e34d12805cfd7b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 6 Sep 2018 17:08:04 +0200
Subject: [PATCH] cleanup (remove deprecated methods)

---
 .../application/ApplicationConfiguration.java |  1 -
 .../execution/ShortenCommandLine.java         |  1 +
 .../configurations/RunConfigurationBase.java  |  9 +++++++--
 .../openapi/util/JDOMExternalizerUtil.java    | 20 -------------------
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 7e68cc96c331..0a11d681c9b7 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -287,7 +287,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     syncOldStateFields();
 
     JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
-    setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
     myInputRedirectOptions.readExternal(element);
   }
 
diff --git a/platform/lang-api/src/com/intellij/execution/ShortenCommandLine.java b/platform/lang-api/src/com/intellij/execution/ShortenCommandLine.java
index dbc2bcb19587..a15e8db48e20 100644
--- a/platform/lang-api/src/com/intellij/execution/ShortenCommandLine.java
+++ b/platform/lang-api/src/com/intellij/execution/ShortenCommandLine.java
@@ -54,6 +54,7 @@ public enum ShortenCommandLine {
     return CLASSPATH_FILE;
   }
 
+  @Deprecated
   public static ShortenCommandLine readShortenClasspathMethod(@NotNull Element element) {
     Element mode = element.getChild("shortenClasspath");
     if (mode != null) {
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 55065a910c6c..90ce82999d90 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
@@ -12,7 +12,6 @@ import com.intellij.openapi.components.BaseState;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.util.text.StringUtilRt;
@@ -250,7 +249,13 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements
 
   @Override
   public void writeExternal(@NotNull Element element) throws WriteExternalException {
-    JDOMExternalizerUtil.addChildren(element, PREDEFINED_LOG_FILE_ELEMENT, myPredefinedLogFiles);
+    for (PredefinedLogFile child : myPredefinedLogFiles) {
+      if (child != null) {
+        Element element1 = new Element(PREDEFINED_LOG_FILE_ELEMENT);
+        child.writeExternal(element1);
+        element.addContent(element1);
+      }
+    }
     XmlSerializer.serializeObjectInto(myOptions, element);
   }
 
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
index 597eaf2c54c5..2a2ec2a85011 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
@@ -7,7 +7,6 @@ import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -117,26 +116,7 @@ public class JDOMExternalizerUtil {
     }
   }
 
-  @SuppressWarnings("deprecation")
-  public static void addChildren(@NotNull Element parent,
-                                 @NotNull String childElementName,
-                                 @NotNull Collection<? extends JDOMExternalizable> children) throws WriteExternalException {
-    for (JDOMExternalizable child : children) {
-      if (child != null) {
-        Element element = new Element(childElementName);
-        child.writeExternal(element);
-        parent.addContent(element);
-      }
-    }
-  }
-
   //<editor-fold desc="Deprecated stuff.">
-  /** @deprecated use {@link #readOption(Element, String)} (to be removed in IDEA 2019) */
-  @Deprecated
-  public static Element getOption(@NotNull Element parent, @NotNull String fieldName) {
-    return readOption(parent, fieldName);
-  }
-
   /** @deprecated use {@link #writeCustomField(Element, String, String)} (to be removed in IDEA 2019) */
   @Deprecated
   public static Element addElementWithValueAttribute(@NotNull Element parent, @NotNull String childTagName, @Nullable String attrValue) {