From 404eddadcb5ca9d097c726f28c161daebfb583d8 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 5 Oct 2012 11:14:06 +0400 Subject: [PATCH] fixed drag'n'drop from one IDEA to another: don't move working directory --- .../com/intellij/ide/dnd/FileCopyPasteUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java index 215a90fd41c5..382c9736322e 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java @@ -16,6 +16,9 @@ package com.intellij.ide.dnd; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -94,8 +97,14 @@ public class FileCopyPasteUtil { public static List getFileList(@NotNull final Transferable transferable) { try { if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) { - @SuppressWarnings({"unchecked"}) final List fileList = (List)transferable.getTransferData(DataFlavor.javaFileListFlavor); - return fileList; + @SuppressWarnings({"unchecked"}) + final List fileList = (List)transferable.getTransferData(DataFlavor.javaFileListFlavor); + return ContainerUtil.filter(fileList, new Condition() { + @Override + public boolean value(File file) { + return !StringUtil.isEmptyOrSpaces(file.getPath()); + } + }); } else { return LinuxDragAndDropSupport.getFiles(transferable); @@ -105,4 +114,5 @@ public class FileCopyPasteUtil { return null; } + }