From bc3b96dea567919e68326feae7fec3b95f2eaf50 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Tue, 29 Mar 2016 14:24:17 +0200
Subject: [PATCH] json schema, rename to cross definitions

---
 ...JsonSchemaMappingsProjectConfiguration.java |  2 +-
 .../jsonSchema/ide/JsonSchemaService.java      |  4 ++--
 .../impl/JsonSchemaCrossDefinitions.java       |  2 +-
 .../jsonSchema/impl/JsonSchemaServiceImpl.java | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
index d0c76756aec7..6b46c33e0c25 100644
--- a/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
+++ b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
@@ -79,7 +79,7 @@ public class JsonSchemaMappingsProjectConfiguration extends JsonSchemaMappingsCo
       if (schemaFile != null) mySchemaFiles.put(schemaFile, info);
     }
     if (refreshStaticProviders) {
-      ServiceManager.getService(myProject, JsonSchemaService.class).refreshStaticProviders();
+      ServiceManager.getService(myProject, JsonSchemaService.class).refreshCrossDefinitions();
     }
   }
 
diff --git a/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java
index 7b41307106eb..238603bd6eb3 100644
--- a/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java
+++ b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java
@@ -15,9 +15,9 @@ import java.util.List;
 
 public interface JsonSchemaService {
 
-  void refreshStaticProviders();
+  void refreshCrossDefinitions();
 
-  void ensureStaticProvidersInitialized();
+  void ensureCrossDefinitionsInitialized();
 
   class Impl {
 
diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCrossDefinitions.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCrossDefinitions.java
index 01dbe8c3179c..bc4d32ef0d1b 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCrossDefinitions.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCrossDefinitions.java
@@ -50,7 +50,7 @@ public class JsonSchemaCrossDefinitions {
   }
 
   public JsonSchemaObject findDefinition(@NotNull final String url, @NotNull final String relativePart, @NotNull final JsonSchemaObject rootObject) {
-    ServiceManager.getService(myProject, JsonSchemaService.class).ensureStaticProvidersInitialized();
+    ServiceManager.getService(myProject, JsonSchemaService.class).ensureCrossDefinitionsInitialized();
     final Map<String, JsonSchemaObject> map = myMap.get(url);
     if (map != null) {
       return JsonSchemaReader.findDefinition(myProject, relativePart, rootObject, map, false);
diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
index 57bd15da555e..cc4e8ba66e1c 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
@@ -40,11 +40,11 @@ public class JsonSchemaServiceImpl implements JsonSchemaService {
   @Nullable
   private final Project myProject;
   private final ConcurrentMap<JsonSchemaFileProvider, JsonSchemaObjectCodeInsightWrapper> myWrappers = ContainerUtil.newConcurrentMap();
-  private final AtomicBoolean myStaticProvidersInitialized;
+  private final AtomicBoolean myCrossDefinitionsInitialized;
 
   public JsonSchemaServiceImpl(@Nullable Project project) {
     myProject = project;
-    myStaticProvidersInitialized = new AtomicBoolean();
+    myCrossDefinitionsInitialized = new AtomicBoolean();
   }
 
   @NotNull
@@ -106,7 +106,7 @@ public class JsonSchemaServiceImpl implements JsonSchemaService {
     return null;
   }
 
-  private void logException(@NotNull JsonSchemaFileProvider provider, Exception e) {
+  private static void logException(@NotNull JsonSchemaFileProvider provider, Exception e) {
     final String message = "Error while processing json schema file: " + e.getMessage();
     if (provider instanceof JsonSchemaImportedProviderMarker) {
       RARE_LOGGER.info(message, e);
@@ -135,14 +135,14 @@ public class JsonSchemaServiceImpl implements JsonSchemaService {
   }
 
   @Override
-  public void refreshStaticProviders() {
-    myStaticProvidersInitialized.getAndSet(false);
-    ensureStaticProvidersInitialized();
+  public void refreshCrossDefinitions() {
+    myCrossDefinitionsInitialized.getAndSet(false);
+    ensureCrossDefinitionsInitialized();
   }
 
   @Override
-  public void ensureStaticProvidersInitialized() {
-    if (myStaticProvidersInitialized.get()) return;
+  public void ensureCrossDefinitionsInitialized() {
+    if (myCrossDefinitionsInitialized.get()) return;
     final JsonSchemaProviderFactory[] factories = getProviderFactories();
     for (JsonSchemaProviderFactory factory : factories) {
       for (JsonSchemaFileProvider provider : factory.getProviders(myProject)) {
@@ -157,7 +157,7 @@ public class JsonSchemaServiceImpl implements JsonSchemaService {
         }
       }
     }
-    myStaticProvidersInitialized.getAndSet(true);
+    myCrossDefinitionsInitialized.getAndSet(true);
   }
 
   @Nullable