From 21c8e801ecc602c9d876530472c33b5bc1189afd Mon Sep 17 00:00:00 2001 From: "Svetlana.Zemlyanskaya" Date: Fri, 18 Jan 2019 19:33:15 +0100 Subject: [PATCH] FUS: move dictionary service to event log settings service --- .../eventLog/EventLogExternalSettingsService.java | 10 +++++++++- .../statistic/eventLog/EventLogSettingsService.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java index 5a1f10f97c5f..af385ad4e79e 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java @@ -9,6 +9,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.BuildNumber; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.Set; @@ -16,6 +17,7 @@ import java.util.Set; public class EventLogExternalSettingsService extends SettingsConnectionService implements EventLogSettingsService { private static final Logger LOG = Logger.getInstance("com.intellij.internal.statistic.eventLog.EventLogExternalSettingsService"); private static final String APPROVED_GROUPS_SERVICE = "white-list-service"; + private static final String DICTIONARY_SERVICE = "dictionary-service"; private static final String PERCENT_TRAFFIC = "percent-traffic"; public static EventLogExternalSettingsService getInstance() { @@ -29,7 +31,7 @@ public class EventLogExternalSettingsService extends SettingsConnectionService i @NotNull @Override public String[] getAttributeNames() { - return ArrayUtil.mergeArrays(super.getAttributeNames(), PERCENT_TRAFFIC, APPROVED_GROUPS_SERVICE); + return ArrayUtil.mergeArrays(super.getAttributeNames(), PERCENT_TRAFFIC, APPROVED_GROUPS_SERVICE, DICTIONARY_SERVICE); } @Override @@ -46,6 +48,12 @@ public class EventLogExternalSettingsService extends SettingsConnectionService i return 0; } + @Override + @Nullable + public String getDictionaryServiceUrl() { + return getSettingValue(DICTIONARY_SERVICE); + } + @NotNull public Set getApprovedGroups() { return getWhitelistedGroups(); diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java index 43ee3a3dbadf..193a4632fc40 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java @@ -9,6 +9,9 @@ public interface EventLogSettingsService { @Nullable String getServiceUrl(); + @Nullable + String getDictionaryServiceUrl(); + int getPermittedTraffic(); @NotNull