WI-41555, WI-41328 fix empty scratch folders and db-console guids

This commit is contained in:
Gregory.Shrago
2018-04-10 17:55:04 +03:00
parent c70e2fbf28
commit 4d30fdf28d
@@ -297,6 +297,12 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl
@Override
public Object getData(String dataId) {
Object data =
myTreeStructure instanceof AbstractTreeStructureBase ?
((AbstractTreeStructureBase)myTreeStructure).getDataFromProviders(getSelectedNodes(AbstractTreeNode.class), dataId) : null;
if (data != null) {
return data;
}
if (CommonDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
TreePath[] paths = getSelectionPaths();
if (paths == null) return null;
@@ -318,9 +324,6 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl
return navigatables.toArray(new Navigatable[0]);
}
}
if (myTreeStructure instanceof AbstractTreeStructureBase) {
return ((AbstractTreeStructureBase) myTreeStructure).getDataFromProviders(getSelectedNodes(AbstractTreeNode.class), dataId);
}
return null;
}