From 6d060606874c385437bfd777913fc1cfd6a6dea9 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Nov 2010 19:49:43 +0300
Subject: [PATCH] LicenseeInfoProvider must not be a service - services are
 initialized later

---
 .../src/com/intellij/ui/LicenseeInfoProvider.java           | 6 ++++--
 platform/platform-impl/src/com/intellij/ui/Splash.java      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/LicenseeInfoProvider.java b/platform/platform-impl/src/com/intellij/ui/LicenseeInfoProvider.java
index e7264babb14f..bee96727ff6d 100644
--- a/platform/platform-impl/src/com/intellij/ui/LicenseeInfoProvider.java
+++ b/platform/platform-impl/src/com/intellij/ui/LicenseeInfoProvider.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.ui;
 
-import com.intellij.openapi.components.ServiceManager;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Date;
@@ -24,8 +23,11 @@ import java.util.Date;
  * @author yole
  */
 public abstract class LicenseeInfoProvider {
+  public static LicenseeInfoProvider ourInstance;
+
+  @Nullable
   public static LicenseeInfoProvider getInstance() {
-    return ServiceManager.getService(LicenseeInfoProvider.class);
+    return ourInstance;
   }
 
   public abstract String getLicensedToMessage();
diff --git a/platform/platform-impl/src/com/intellij/ui/Splash.java b/platform/platform-impl/src/com/intellij/ui/Splash.java
index ea69926b9016..80fd99d0b5d1 100644
--- a/platform/platform-impl/src/com/intellij/ui/Splash.java
+++ b/platform/platform-impl/src/com/intellij/ui/Splash.java
@@ -56,8 +56,10 @@ public class Splash extends JDialog {
       g.setColor(textColor);
       LicenseeInfoProvider provider = LicenseeInfoProvider.getInstance();
       if (provider != null) {
-        g.drawString(provider.getLicensedToMessage(), x + 20, y + height - 52);
-        g.drawString(provider.getLicenseRestrictionsMessage(), x + 20, y + height - 32);
+        final String licensedToMessage = provider.getLicensedToMessage();
+        final String licenseRestrictionsMessage = provider.getLicenseRestrictionsMessage();
+        g.drawString(licensedToMessage, x + 20, y + height - 52);
+        g.drawString(licenseRestrictionsMessage, x + 20, y + height - 32);
       }
       return true;
     }