From 9005510f196bb95d74ff930299c54959c4fe6f4a Mon Sep 17 00:00:00 2001 From: "kirill.safonov" Date: Thu, 12 Jan 2012 12:23:42 +0400 Subject: [PATCH] diagnostics for keys assertions (e.g. EA-32982) --- .../statistic/beans/ConvertUsagesUtil.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java index 2cfeae08456d..b28161e0e1b3 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java @@ -165,12 +165,12 @@ public class ConvertUsagesUtil { public static void assertDescriptorName(String key) { assert key != null; - assert containsChar(key, ConvertUsagesUtil.GROUP_SEPARATOR) == false; - assert containsChar(key, ConvertUsagesUtil.GROUPS_SEPARATOR) == false; - assert containsChar(key, ConvertUsagesUtil.GROUP_VALUE_SEPARATOR) == false; - assert key.contains("=") == false; - assert key.contains("'") == false; - assert key.contains("\"") == false; + assert key.indexOf(GROUP_SEPARATOR) == -1 : key + " contains invalid chars"; + assert key.indexOf(GROUPS_SEPARATOR) == -1 : key + " contains invalid chars"; + assert key.indexOf(GROUP_VALUE_SEPARATOR) == -1 : key + " contains invalid chars"; + assert !key.contains("=") : key + " contains invalid chars"; + assert !key.contains("'") : key + " contains invalid chars"; + assert !key.contains("\"") : key + " contains invalid chars"; } @NotNull @@ -188,14 +188,10 @@ public class ConvertUsagesUtil { escaped.append(' '); break; default: - escaped.append(ch); + escaped.append(ch); break; } } return escaped.toString(); } - - public static boolean containsChar(final String value, final char ch) { - return value.indexOf(ch) >= 0; - } }