diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/AbstractApplicationUsagesCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/AbstractApplicationUsagesCollector.java index f7173bc60d65..97a9340edf99 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/AbstractApplicationUsagesCollector.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/AbstractApplicationUsagesCollector.java @@ -40,7 +40,7 @@ public abstract class AbstractApplicationUsagesCollector extends UsagesCollector public void persistProjectUsages(@NotNull Project project, @NotNull Set usages, @NotNull ApplicationStatisticsPersistence persistence) { - persistence.persistFrameworks(getGroupId(), project, usages); + persistence.persistUsages(getGroupId(), project, usages); } @NotNull @@ -50,20 +50,20 @@ public abstract class AbstractApplicationUsagesCollector extends UsagesCollector @NotNull public Set getApplicationUsages(@NotNull final ApplicationStatisticsPersistence persistence) { - final Map facets = new HashMap(); + final Map result = new HashMap(); - for (Set frameworks : persistence.getApplicationData(getGroupId()).values()) { - for (UsageDescriptor framework : frameworks) { - final String key = framework.getKey(); - final Integer count = facets.get(key); - facets.put(key, count == null ? 1 : count.intValue() + 1); + for (Set usageDescriptors : persistence.getApplicationData(getGroupId()).values()) { + for (UsageDescriptor usageDescriptor : usageDescriptors) { + final String key = usageDescriptor.getKey(); + final Integer count = result.get(key); + result.put(key, count == null ? 1 : count.intValue() + 1); } } - return ContainerUtil.map2Set(facets.entrySet(), new Function, UsageDescriptor>() { + return ContainerUtil.map2Set(result.entrySet(), new Function, UsageDescriptor>() { @Override - public UsageDescriptor fun(Map.Entry facet) { - return new UsageDescriptor(facet.getKey(), facet.getValue()); + public UsageDescriptor fun(Map.Entry entry) { + return new UsageDescriptor(entry.getKey(), entry.getValue()); } }); } diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistence.java b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistence.java index 2b5586ec17c4..f8f6cd18681b 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistence.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistence.java @@ -15,11 +15,11 @@ public abstract class ApplicationStatisticsPersistence { public ApplicationStatisticsPersistence() { } - public void persistFrameworks(@NotNull GroupDescriptor groupDescriptor, @NotNull Project project, @NotNull Set frameworks) { + public void persistUsages(@NotNull GroupDescriptor groupDescriptor, @NotNull Project project, @NotNull Set usageDescriptors) { if (!myApplicationData.containsKey(groupDescriptor)) { myApplicationData.put(groupDescriptor, new HashMap>()); } - myApplicationData.get(groupDescriptor).put(project.getName(), frameworks); + myApplicationData.get(groupDescriptor).put(project.getName(), usageDescriptors); } @NotNull