diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form index 1c95bf684dfa..a0f299834ab9 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form +++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form @@ -30,6 +30,7 @@ + diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java index 9140f257eac3..d1d9e916b956 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java @@ -18,6 +18,7 @@ package com.intellij.internal.statistic.persistence; import com.intellij.internal.statistic.configurable.SendPeriod; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; @@ -40,7 +41,7 @@ import java.util.Set; storages = { @Storage( id = "usages", - file = "$APP_CONFIG$/usages.statistics.xml" + file = "$APP_CONFIG$/usage.statistics.xml" )} ) public class UsageStatisticsPersistenceComponent extends BasicSentUsagesPersistenceComponent @@ -65,6 +66,9 @@ public class UsageStatisticsPersistenceComponent extends BasicSentUsagesPersiste } public UsageStatisticsPersistenceComponent() { + if (ApplicationManagerEx.getApplicationEx().isInternal()) { + isShowNotification = false; + } } public void loadState(final Element element) { @@ -93,7 +97,7 @@ public class UsageStatisticsPersistenceComponent extends BasicSentUsagesPersiste final String isShowNotificationValue = element.getAttributeValue(SHOW_NOTIFICATION_ATTR); setShowNotification(StringUtil.isEmptyOrSpaces(isShowNotificationValue) ? true : Boolean.parseBoolean(isShowNotificationValue)); - setPeriod(parsePeriod(element.getAttributeValue(SHOW_NOTIFICATION_ATTR))); + setPeriod(parsePeriod(element.getAttributeValue(PERIOD_ATTR))); } public Element getState() { diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java b/platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java index 94c989a0ed2c..9c623f263505 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java @@ -30,11 +30,8 @@ public class StatisticsNotificationManager { private static String getText() { return - "Please click Agree if you want to help make "+ ApplicationNamesInfo.getInstance().getFullProductName() + - " better or Don't agree otherwise." + - "
" + - "You can customize settings on IDE Settings -> Usage Statistics pane" + - ""; + "Please click I agree if you want to help make "+ ApplicationNamesInfo.getInstance().getFullProductName() + + " better or I don't agree otherwise. more..."; } private static String getTitle() {