From e227a3d79303d33b197fee841f250f62ad8a7f35 Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <oleg.sukhodolsky@jetbrains.com>
Date: Sat, 9 Feb 2013 12:38:34 +0400
Subject: [PATCH] RUBY-13071: (refactoring) RegExpPropertyImpl.PROPERTY_NAMES
 made private

---
 .../intellij/lang/regexp/RegExpCompletionContributor.java | 6 +++---
 .../intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java | 8 +++++++-
 RegExpSupport/test/test/RegExpCompletionTest.java         | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java
index 15832dd473d9..921da8d42eb3 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java
@@ -91,7 +91,7 @@ public class RegExpCompletionContributor extends CompletionContributor {
     public void addCompletions(@NotNull final CompletionParameters parameters,
                                final ProcessingContext context,
                                @NotNull final CompletionResultSet result) {
-      for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
+      for (String[] stringArray : RegExpPropertyImpl.getAllKnownProperties()) {
         result.addElement(
           TailTypeDecorator.withTail(createLookupElement(stringArray[0], null, emptyIcon), TailType.createSimpleTailType('}')));
       }
@@ -103,7 +103,7 @@ public class RegExpCompletionContributor extends CompletionContributor {
     public void addCompletions(@NotNull final CompletionParameters parameters,
                                final ProcessingContext context,
                                @NotNull final CompletionResultSet result) {
-      for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
+      for (String[] stringArray : RegExpPropertyImpl.getAllKnownProperties()) {
         addLookupElement(result, "{" + stringArray[0] + "}", stringArray.length > 1 ? stringArray[1]:null, PlatformIcons.PROPERTY_ICON);
       }
     }
@@ -126,7 +126,7 @@ public class RegExpCompletionContributor extends CompletionContributor {
         addLookupElement(result, completions[i], completionsTypes[i], emptyIcon);
       }
 
-      for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
+      for (String[] stringArray : RegExpPropertyImpl.getAllKnownProperties()) {
         addLookupElement(result, "p{" + stringArray[0] + "}", stringArray.length > 1? stringArray[1]:null, PlatformIcons.PROPERTY_ICON);
       }
     }
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
index e52d58333939..e0e5fe6b5809 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
@@ -94,6 +94,12 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope
       }
       return null;
     }
+
+    @NotNull
+    public static String[][] getAllKnownProperties() {
+      return RegExpPropertyImpl.PROPERTY_NAMES;
+    }
+
     private class MyPsiReference implements PsiReference {
         public PsiElement getElement() {
             return RegExpPropertyImpl.this;
@@ -205,7 +211,7 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope
         }
       UNICODE_BLOCKS = ArrayUtil.toStringArray(unicodeBlocks);
     }
-    public static final String[][] PROPERTY_NAMES = {
+    private static final String[][] PROPERTY_NAMES = {
             { "Cn", "UNASSIGNED" },
             { "Lu", "UPPERCASE_LETTER" },
             { "Ll", "LOWERCASE_LETTER" },
diff --git a/RegExpSupport/test/test/RegExpCompletionTest.java b/RegExpSupport/test/test/RegExpCompletionTest.java
index c58c1ab94282..095dea5bce6b 100644
--- a/RegExpSupport/test/test/RegExpCompletionTest.java
+++ b/RegExpSupport/test/test/RegExpCompletionTest.java
@@ -52,7 +52,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
     private void doBackSlashVariantsTest() throws Throwable {
         java.util.List<String> nameList = new ArrayList<String>(Arrays.asList("d", "D", "s", "S", "w", "W", "b", "B", "A", "G", "Z", "z", "Q", "E",
                 "t", "n", "r", "f", "a", "e"));
-        for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
+        for (String[] stringArray : RegExpPropertyImpl.getAllKnownProperties()) {
             nameList.add("p{" + stringArray[0] + "}");
         }
         myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList));
@@ -60,7 +60,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
 
   public void testPropertyVariants() throws Throwable {
         java.util.List<String> nameList = new ArrayList<String>();
-        for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
+        for (String[] stringArray : RegExpPropertyImpl.getAllKnownProperties()) {
             nameList.add("{" + stringArray[0] + "}");
         }
         myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList));