/*
 * Copyright 2000-2009 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.ide.dnd;

import com.intellij.openapi.components.ServiceManager;

import javax.swing.*;
import java.awt.*;

public abstract class DnDManager {
  public static DnDManager getInstance() {
    return ServiceManager.getService(DnDManager.class);
  }

  public abstract void registerSource(DnDSource source, JComponent component);

  public abstract void registerSource(AdvancedDnDSource source);

  public abstract void unregisterSource(DnDSource source, JComponent component);

  public abstract void unregisterSource(AdvancedDnDSource source);

  public abstract void registerTarget(DnDTarget target, JComponent component);

  public abstract void unregisterTarget(DnDTarget target, JComponent component);
  
  public abstract Component getLastDropHandler();
}

@@ -657,26 +657,84 @@
 api.
-components.Service
+application.Application;%0Aimport com.intellij.openapi.application.Application
 Mana
@@ -867,38 +867,199 @@
     
-return ServiceManager.getServi
+Application application = ApplicationManager.getApplication();%0A    if (application == null) %7B%0A      return null;%0A    %7D%0A    return (DnDManager)application.getPicoContainer().getComponentInstan
 ce(D
@@ -1073,16 +1073,26 @@
 er.class
+.getName()
 );%0A  %7D%0A%0A

fix NPE querying DnDManager before application has been initialized