From ea9d1fa082883c22c177dfef79d4364c3540f8c0 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 12 Jun 2013 16:36:47 +0200
Subject: [PATCH] fix NPE querying DnDManager before application has been
 initialized

---
 .../src/com/intellij/ide/dnd/DnDManager.java             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ide/dnd/DnDManager.java b/platform/platform-api/src/com/intellij/ide/dnd/DnDManager.java
index 418fd04c034b..b0ca95badc0d 100644
--- a/platform/platform-api/src/com/intellij/ide/dnd/DnDManager.java
+++ b/platform/platform-api/src/com/intellij/ide/dnd/DnDManager.java
@@ -15,14 +15,19 @@
  */
 package com.intellij.ide.dnd;
 
-import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 
 import javax.swing.*;
 import java.awt.*;
 
 public abstract class DnDManager {
   public static DnDManager getInstance() {
-    return ServiceManager.getService(DnDManager.class);
+    Application application = ApplicationManager.getApplication();
+    if (application == null) {
+      return null;
+    }
+    return (DnDManager)application.getPicoContainer().getComponentInstance(DnDManager.class.getName());
   }
 
   public abstract void registerSource(DnDSource source, JComponent component);