Merge remote-tracking branch 'origin/master'

.idea/libraries/Netty.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Netty">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.Alpha1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

lib/required_for_dist.txt

@@ -33,7 +33,7 @@ microba.jar
 miglayout-swing.jar
 nanoxml-2.2.3.jar
 nekohtml-1.9.14.jar
-netty-all.jar
+netty-all-4.1.0.Alpha1.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar

platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java

@@ -154,7 +154,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
       public void run() {
         installEditorFactoryListener();
       }
-    });
+    }, myProject.getDisposed());
 
     if (initComponents) {
       initComponents();
@@ -674,9 +674,6 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
         }
       }
     };
-    if (myProject.isDisposed()) {
-      return;
-    }
     myProject.getMessageBus().connect(this).subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, fileEditorListener);
     FileEditorManager editorManager = FileEditorManager.getInstance(getProject());
     if (editorManager.isFileOpen(myVirtualFile)) {

plugins/ui-designer-core/src/com/intellij/designer/componentTree/TreeTransfer.java

@@ -28,11 +28,11 @@ import java.io.IOException;
  * @author Alexander Lobas
  */
 public final class TreeTransfer extends TransferHandler implements Transferable {
-  private static final DataFlavor DATA_FLAVOR = FileCopyPasteUtil.createDataFlavor(DataFlavor.javaJVMLocalObjectMimeType);
+  private static final DataFlavor DATA_FLAVOR = FileCopyPasteUtil.createDataFlavor(DataFlavor.javaJVMLocalObjectMimeType, Class.class);
 
   private Object myData;
 
-  public TreeTransfer(Object data) {
+  public TreeTransfer(Class data) {
     myData = data;
   }