From c70555edd9cfbf1d03e5e43836960a07e10813f0 Mon Sep 17 00:00:00 2001
From: Jan Koehnlein <jan.koehnlein@typefox.io>
Date: Wed, 20 Jul 2016 13:44:07 +0200
Subject: [PATCH] [ls] make ResourceServiceProviderServiceLoader non-static

---
 .../ResourceServiceProviderServiceLoader.xtend       |  8 ++++----
 .../ResourceServiceProviderServiceLoader.java        | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend
index 1542e3e62..278259310 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.xtend
@@ -22,9 +22,11 @@ import com.google.inject.Singleton
 @Singleton
 class ResourceServiceProviderServiceLoader implements Provider<IResourceServiceProvider.Registry> {
 
-    private static ServiceLoader<ISetup> setupLoader = ServiceLoader.load(ISetup)
+    private ServiceLoader<ISetup> setupLoader = ServiceLoader.load(ISetup)
 
-    private def static IResourceServiceProvider.Registry loadRegistry() {
+    private IResourceServiceProvider.Registry registry = loadRegistry
+    
+    private def IResourceServiceProvider.Registry loadRegistry() {
         val registry = new ResourceServiceProviderRegistryImpl()
         for (ISetup cp : setupLoader) {
             val injector = cp.createInjectorAndDoEMFRegistration();
@@ -43,8 +45,6 @@ class ResourceServiceProviderServiceLoader implements Provider<IResourceServiceP
         return registry;
     }
 
-    private static IResourceServiceProvider.Registry registry = loadRegistry
-    
     override get() {
         return registry
     }
diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.java
index 5e66c9dbd..d4434f446 100644
--- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.java
+++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/ResourceServiceProviderServiceLoader.java
@@ -26,11 +26,13 @@ import org.eclipse.xtext.resource.impl.ResourceServiceProviderRegistryImpl;
 @Singleton
 @SuppressWarnings("all")
 public class ResourceServiceProviderServiceLoader implements Provider<IResourceServiceProvider.Registry> {
-  private static ServiceLoader<ISetup> setupLoader = ServiceLoader.<ISetup>load(ISetup.class);
+  private ServiceLoader<ISetup> setupLoader = ServiceLoader.<ISetup>load(ISetup.class);
   
-  private static IResourceServiceProvider.Registry loadRegistry() {
+  private IResourceServiceProvider.Registry registry = this.loadRegistry();
+  
+  private IResourceServiceProvider.Registry loadRegistry() {
     final ResourceServiceProviderRegistryImpl registry = new ResourceServiceProviderRegistryImpl();
-    for (final ISetup cp : ResourceServiceProviderServiceLoader.setupLoader) {
+    for (final ISetup cp : this.setupLoader) {
       {
         final Injector injector = cp.createInjectorAndDoEMFRegistration();
         final IResourceServiceProvider resourceServiceProvider = injector.<IResourceServiceProvider>getInstance(IResourceServiceProvider.class);
@@ -56,10 +58,8 @@ public class ResourceServiceProviderServiceLoader implements Provider<IResourceS
     return registry;
   }
   
-  private static IResourceServiceProvider.Registry registry = ResourceServiceProviderServiceLoader.loadRegistry();
-  
   @Override
   public IResourceServiceProvider.Registry get() {
-    return ResourceServiceProviderServiceLoader.registry;
+    return this.registry;
   }
 }