From 49d742a4d649af8cc162bd907ef1ed4c6fe39d96 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 4 Dec 2014 21:13:43 +0100 Subject: [PATCH] Cleanup (typo) --- .../updateSettings/impl/AbstractUpdateDialog.java | 12 +++++++----- .../updateSettings/impl/UpdateInfoDialog.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java index fb3f69fc9c77..6b93324f344f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -38,11 +38,12 @@ import java.awt.*; */ public abstract class AbstractUpdateDialog extends DialogWrapper { private final boolean myEnableLink; + protected String myLicenseInfo = null; protected boolean myPaidUpgrade; - protected boolean mySubscribtionLicense = false; + protected boolean mySubscriptionLicense = false; - public AbstractUpdateDialog(boolean enableLink) { + protected AbstractUpdateDialog(boolean enableLink) { super(true); myEnableLink = enableLink; setTitle(IdeBundle.message("updates.info.dialog.title")); @@ -83,7 +84,7 @@ public abstract class AbstractUpdateDialog extends DialogWrapper { protected void initLicensingInfo(@NotNull UpdateChannel channel, @NotNull BuildInfo build) { LicensingFacade facade = LicensingFacade.getInstance(); if (facade != null) { - mySubscribtionLicense = facade.isSubscriptionLicense(); + mySubscriptionLicense = facade.isSubscriptionLicense(); if (!channel.getLicensing().equals(UpdateChannel.LICENSING_EAP)) { Boolean paidUpgrade = facade.isPaidUpgrade(channel.getMajorVersion(), build.getReleaseDate()); if (paidUpgrade == Boolean.TRUE) { @@ -102,7 +103,8 @@ public abstract class AbstractUpdateDialog extends DialogWrapper { protected void configureMessageArea(@NotNull JEditorPane area) { - configureMessageArea(area, myEnableLink ? IdeBundle.message("updates.configure.label", ShowSettingsUtil.getSettingsMenuName()) : "", null, null); + String messageBody = myEnableLink ? IdeBundle.message("updates.configure.label", ShowSettingsUtil.getSettingsMenuName()) : ""; + configureMessageArea(area, messageBody, null, null); } protected void configureMessageArea(final @NotNull JEditorPane area, diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index cf604d229972..12634dd43634 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -233,7 +233,7 @@ class UpdateInfoDialog extends AbstractUpdateDialog { configureMessageArea(myMessageArea); } - if (mySubscribtionLicense && myLicenseInfo != null) { + if (mySubscriptionLicense && myLicenseInfo != null) { configureMessageArea(myLicenseArea, myLicenseInfo, myPaidUpgrade ? JBColor.RED : null, null); } }