/*
 * Copyright 2000-2015 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.idea;

import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.util.Disposer;
import com.intellij.testFramework.PlatformTestCase;
import org.jetbrains.annotations.Nullable;

public class IdeaTestApplication extends CommandLineApplication implements Disposable {
  private DataProvider myDataContext;

  private IdeaTestApplication() {
    super(true, true, true);
  }

  public void setDataProvider(@Nullable DataProvider dataContext) {
    myDataContext = dataContext;
  }

  @Override
  @Nullable
  public Object getData(String dataId) {
    return myDataContext == null ? null : myDataContext.getData(dataId);
  }

  public static IdeaTestApplication getInstance() {
    return getInstance(null);
  }

  public static synchronized IdeaTestApplication getInstance(@Nullable String configPath) {
    if (ourInstance == null) {
      PlatformTestCase.doAutodetectPlatformPrefix();
      new IdeaTestApplication();
      PluginManagerCore.getPlugins();
      ApplicationManagerEx.getApplicationEx().load(configPath);
    }
    return (IdeaTestApplication)ourInstance;
  }

  @Override
  public void dispose() {
    disposeInstance();
  }

  private static void disposeInstance() {
    if (ourInstance == null) return;
    Application applicationEx = ApplicationManager.getApplication();
    if (applicationEx != null) {
      Disposer.dispose(applicationEx);
      //ApplicationManagerEx.setApplication(null); it will set automatically back to null
    }
    ourInstance = null;
  }
}

@@ -877,24 +877,82 @@
 ionManager;%0A
+import com.intellij.openapi.application.ex.ApplicationEx;%0A
 import com.i
@@ -1000,24 +1000,24 @@
 nManagerEx;%0A
-
 import com.i
@@ -1143,16 +1143,91 @@
 lable;%0A%0A
+import javax.swing.*;%0Aimport java.lang.reflect.InvocationTargetException;%0A%0A
 public c
@@ -1820,16 +1820,22 @@
 ullable 
+final 
 String c
@@ -2007,16 +2007,42 @@
 );%0A     
+ final ApplicationEx app =
  Applica
@@ -2077,26 +2077,491 @@
 Ex()
-.load(configPath);
+;%0A      if (app.isDispatchThread()) %7B%0A        app.load(configPath);%0A      %7D%0A      else %7B%0A        try %7B%0A          SwingUtilities.invokeAndWait(new Runnable() %7B%0A            @Override%0A            public void run() %7B%0A              app.load(configPath);%0A            %7D%0A          %7D);%0A        %7D%0A        catch (InterruptedException e) %7B%0A          throw new RuntimeException(e);%0A        %7D%0A        catch (InvocationTargetException e) %7B%0A          throw new RuntimeException(e);%0A        %7D%0A      %7D
 %0A   

fix appcode tests