MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-62562 IntelliJ IDEA crashes when trying to move a file [r=yole]

Browse Source
This commit is contained in:
Alexey Pegov
2010-12-07 19:00:16 +03:00
parent 34f1169f82
commit 668af9242a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java
+11 -7
View File
@@ -51,6 +51,7 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog {
private static final Callback SHOULD_SHOW_FILENAME_CALLBACK = new Callback() {
public boolean callback(ID self, String selector, ID panel, ID filename) {
if (filename == null || filename.intValue() == 0) return false;
final String fileName = Foundation.toStringViaUTF8(filename);
final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(fileName);
return virtualFile != null && (virtualFile.isDirectory() || getDescriptor().isFileSelectable(virtualFile));
@@ -59,6 +60,7 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog {
private static final Callback IS_VALID_FILENAME_CALLBACK = new Callback() {
public boolean callback(ID self, String selector, ID panel, ID filename) {
if (filename == null || filename.intValue() == 0) return false;
final String fileName = Foundation.toStringViaUTF8(filename);
final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(fileName);
return virtualFile != null && (!virtualFile.isDirectory() || getDescriptor().isFileSelectable(virtualFile));
@@ -115,7 +117,7 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog {
Object directory = null;
Object file = null;
final String toSelectPath = toSelect.intValue() == 0 ? null : Foundation.toStringViaUTF8(toSelect);
final String toSelectPath = toSelect == null || toSelect.intValue() == 0 ? null : Foundation.toStringViaUTF8(toSelect);
final VirtualFile toSelectFile = toSelectPath == null ? null : LocalFileSystem.getInstance().findFileByPath(toSelectPath);
if (toSelectFile != null) {
if (toSelectFile.isDirectory()) {
@@ -148,11 +150,13 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog {
if (0 == window.intValue()) break;
final ID windowTitle = invoke(window, "title");
final String titleString = Foundation.toStringViaUTF8(windowTitle);
if (titleString.equals(activeWindowTitle)) {
if (1 == invoke(window, "isVisible").intValue()) {
focusedWindow = window;
break;
if (windowTitle != null && windowTitle.intValue() != 0) {
final String titleString = Foundation.toStringViaUTF8(windowTitle);
if (titleString.equals(activeWindowTitle)) {
if (1 == invoke(window, "isVisible").intValue()) {
focusedWindow = window;
break;
}
}
}
}
@@ -186,7 +190,7 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog {
while (true) {
final ID filename = invoke(enumerator, "nextObject");
if (0 == filename.intValue()) break;
if (filename == null || 0 == filename.intValue()) break;
String s = Foundation.toStringViaUTF8(filename);
if (s != null) {