From 76e93bcd259fdb0a0c35eceecbbe2f9cd5fc8449 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Mon, 1 Apr 2019 14:32:53 +0300
Subject: [PATCH] Remove deprecations

---
 .../psi/codeStyle/JavaCodeStyleSettings.java  | 20 -----
 .../psi/codeStyle/CodeStyleSettings.java      | 89 +------------------
 2 files changed, 1 insertion(+), 108 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
index c9fbeaa96982..9b48edd9528a 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
@@ -345,28 +345,8 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
     STATIC_FIELD_TYPE_TO_NAME.copyFrom(rootSettings.STATIC_FIELD_TYPE_TO_NAME);
 
     ENABLE_JAVADOC_FORMATTING = rootSettings.ENABLE_JAVADOC_FORMATTING;
-    JD_ALIGN_PARAM_COMMENTS = rootSettings.JD_ALIGN_PARAM_COMMENTS;
-    JD_ALIGN_EXCEPTION_COMMENTS = rootSettings.JD_ALIGN_EXCEPTION_COMMENTS;
-    JD_ADD_BLANK_AFTER_PARM_COMMENTS = rootSettings.JD_ADD_BLANK_AFTER_PARM_COMMENTS;
-    JD_ADD_BLANK_AFTER_RETURN = rootSettings.JD_ADD_BLANK_AFTER_RETURN;
-    JD_ADD_BLANK_AFTER_DESCRIPTION = rootSettings.JD_ADD_BLANK_AFTER_DESCRIPTION;
-    JD_P_AT_EMPTY_LINES = rootSettings.JD_P_AT_EMPTY_LINES;
-
-    JD_KEEP_INVALID_TAGS = rootSettings.JD_KEEP_INVALID_TAGS;
-    JD_KEEP_EMPTY_LINES = rootSettings.JD_KEEP_EMPTY_LINES;
-    JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = rootSettings.JD_DO_NOT_WRAP_ONE_LINE_COMMENTS;
-
-    JD_USE_THROWS_NOT_EXCEPTION = rootSettings.JD_USE_THROWS_NOT_EXCEPTION;
-    JD_KEEP_EMPTY_PARAMETER = rootSettings.JD_KEEP_EMPTY_PARAMETER;
-    JD_KEEP_EMPTY_EXCEPTION = rootSettings.JD_KEEP_EMPTY_EXCEPTION;
-    JD_KEEP_EMPTY_RETURN = rootSettings.JD_KEEP_EMPTY_RETURN;
-
 
     JD_LEADING_ASTERISKS_ARE_ENABLED = rootSettings.JD_LEADING_ASTERISKS_ARE_ENABLED;
-    JD_PRESERVE_LINE_FEEDS = rootSettings.JD_PRESERVE_LINE_FEEDS;
-    JD_PARAM_DESCRIPTION_ON_NEW_LINE = rootSettings.JD_PARAM_DESCRIPTION_ON_NEW_LINE;
-
-    JD_INDENT_ON_CONTINUATION = rootSettings.JD_INDENT_ON_CONTINUATION;
 
     if (rootSettings.WRAP_COMMENTS) {
       rootSettings.getCommonSettings(JavaLanguage.INSTANCE).WRAP_COMMENTS = rootSettings.WRAP_COMMENTS;
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
index 75bdd4abb525..e0ee70d20ec2 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
@@ -487,99 +487,12 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea
   @Deprecated
   public boolean ENABLE_JAVADOC_FORMATTING = true;
 
-  /**
-   * Align parameter comments to longest parameter name.JD_ALIGN_PARAM_COMMENTS
-   * @deprecated Use JavaCodeStyleSettings.JD_ALIGN_PARAM_COMMENTS
-   */
-  @Deprecated
-  public boolean JD_ALIGN_PARAM_COMMENTS = true;
-
-  /**
-   * Align exception comments to longest exception name
-   * @deprecated Use JavaCodeStyleSettings.JD_ALIGN_EXCEPTION_COMMENTS
-   */
-  @Deprecated
-  public boolean JD_ALIGN_EXCEPTION_COMMENTS = true;
-
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_ADD_BLANK_AFTER_PARM_COMMENTS;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_ADD_BLANK_AFTER_RETURN;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_ADD_BLANK_AFTER_DESCRIPTION = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_P_AT_EMPTY_LINES = true;
-
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_KEEP_INVALID_TAGS = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_KEEP_EMPTY_LINES = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_DO_NOT_WRAP_ONE_LINE_COMMENTS;
-
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_USE_THROWS_NOT_EXCEPTION = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_KEEP_EMPTY_PARAMETER = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_KEEP_EMPTY_EXCEPTION = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.
-   */
-  @Deprecated
-  public boolean JD_KEEP_EMPTY_RETURN = true;
-
-
   /**
    * @deprecated Use JavaCodeStyleSettings.JD_LEADING_ASTERISKS_ARE_ENABLED
    */
   @Deprecated
   public boolean JD_LEADING_ASTERISKS_ARE_ENABLED = true;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.JD_PRESERVE_LINE_FEEDS
-   */
-  @Deprecated
-  public boolean JD_PRESERVE_LINE_FEEDS;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.JD_PARAM_DESCRIPTION_ON_NEW_LINE
-   */
-  @Deprecated
-  public boolean JD_PARAM_DESCRIPTION_ON_NEW_LINE;
-  /**
-   * @deprecated Use JavaCodeStyleSettings.JD_INDENT_ON_CONTINUATION
-   */
-  @Deprecated
-  public boolean JD_INDENT_ON_CONTINUATION;
+
 
 // endregion