projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18aea4c)
Add doc to AbstractCustomizeWizardStep, remove null check for dialogClass in Applicat...
authorSasha Blashenkov <Sasha.Blashenkov@jetbrains.com>
Tue, 15 Sep 2020 12:14:30 +0000 (15:14 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 16 Sep 2020 13:15:07 +0000 (13:15 +0000)
GitOrigin-RevId: 89e6fdf40b9116833898ef8d7fb0f8c1c7cd1948

platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java patch | blob | history
platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java patch | blob | history

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index a62134cf328c503733d61ebc6b3fb251a61e7593..837ccfc147813646ecdcd4ba717916eb9430fa3e 100644 (file)
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -160,7 +160,7 @@ public final class ApplicationInfoImpl extends ApplicationInfoEx {
   private static final @NonNls String CUSTOMIZE_IDE_WIZARD_STEPS = "customize-ide-wizard";
   private static final @NonNls String STEPS_PROVIDER = "provider";
   private static final @NonNls String WIZARD_DIALOG = "dialog";
-  private static final String ELEMENT_EVALUATION = "evaluation";
+  private static final @NonNls String ELEMENT_EVALUATION = "evaluation";
   private static final @NonNls String ATTRIBUTE_EVAL_LICENSE_URL = "license-url";
   private static final @NonNls String ELEMENT_LICENSING = "licensing";
   private static final @NonNls String ATTRIBUTE_KEY_CONVERSION_URL = "key-conversion-url";
@@ -291,10 +291,7 @@ public final class ApplicationInfoImpl extends ApplicationInfoEx {
     if (wizardSteps != null) {
       myCustomizeIDEWizardStepsProvider = wizardSteps.getAttributeValue(STEPS_PROVIDER);
 
-      String dialogClass = getAttributeValue(wizardSteps, WIZARD_DIALOG);
-      if (dialogClass != null) {
-        myCustomizeIDEWizardDialog = dialogClass;
-      }
+      myCustomizeIDEWizardDialog = getAttributeValue(wizardSteps, WIZARD_DIALOG);
     }
 
     Element helpElement = getChild(element, HELP_ELEMENT_NAME);
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java b/platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java
index fa2832089691d8ffa106466a2c2220d89ff6aad0..21a4d85631fe9e11615a9bfc0448c8a330601b28 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java
@@ -24,9 +24,19 @@ public abstract class AbstractCustomizeWizardStep extends JPanel {
   @Nls(capitalization = Nls.Capitalization.Title)
   public abstract String getTitle();
 
+  /**
+   * Content for title under top navigation.
+   *
+   * @return either a HTML string prefixed with <html>, or a text string not prefixed with <html>, which will be processed with StringUtil.escapeXmlEntities
+   */
   @Nls
   public abstract String getHTMLHeader();
 
+  /**
+   * Content for footer above buttons.
+   *
+   * @return either a HTML string prefixed with <html>, or a text string not prefixed with <html>, which will be processed with StringUtil.escapeXmlEntities
+   */
   @Nullable
   @Nls
   public String getHTMLFooter() {
IntelliJ IDEA Community Edition and IntelliJ Platform.