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

moved to core

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-08-20 12:24:08 +04:00
parent b308b41268
commit e47e0e9681
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/application/WriteAction.java → platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+13 -3
View File
@@ -16,10 +16,11 @@
package com.intellij.openapi.application;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.ui.GuiUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public abstract class WriteAction<T> extends BaseActionRunnable<T> {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.WriteAction");
@NotNull
@@ -37,7 +38,7 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
if (!application.isDispatchThread() && application.isReadAccessAllowed()) {
LOG.error("Must not start write action from within read action in the other thread - deadlock is coming");
}
GuiUtils.runOrInvokeAndWait(new Runnable() {
Runnable runnable = new Runnable() {
@Override
public void run() {
application.runWriteAction(new Runnable() {
@@ -47,7 +48,16 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
}
});
}
});
};
if (application.isDispatchThread()) {
runnable.run();
}
else if (application.isReadAccessAllowed()) {
LOG.error("Calling write action from read-action leads to deadlock.");
}
else {
SwingUtilities.invokeAndWait(runnable);
}
}
catch (Exception e) {
if (isSilentExecution()) {
platform/lang-api/src/com/intellij/openapi/command/WriteCommandAction.java → platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+9 -25
View File
@@ -15,23 +15,19 @@
*/
package com.intellij.openapi.command;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.openapi.application.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.ui.GuiUtils;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.command.WriteCommandAction");
@@ -84,11 +80,14 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
}
};
Application application = ApplicationManager.getApplication();
if (application.isWriteAccessAllowed() || application.isDispatchThread()) {
if (application.isDispatchThread()) {
runnable.run();
}
else if (application.isReadAccessAllowed()) {
LOG.error("Calling write command from read-action leads to deadlock.");
}
else {
GuiUtils.invokeAndWait(runnable);
SwingUtilities.invokeAndWait(runnable);
}
}
catch (InvocationTargetException e) {
@@ -99,26 +98,11 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
}
public static boolean ensureFilesWritable(@NotNull final Project project, @NotNull final Collection<PsiFile> psiFiles) {
if (!psiFiles.isEmpty()) {
List<VirtualFile> list = new SmartList<VirtualFile>();
for (final PsiFile psiFile : psiFiles) {
if (psiFile == null) continue;
final VirtualFile virtualFile = psiFile.getVirtualFile();
if (virtualFile != null) {
list.add(virtualFile);
}
}
if (!list.isEmpty()) {
if (ReadonlyStatusHandler.getInstance(project).ensureFilesWritable(VfsUtilCore.toVirtualFileArray(list)).hasReadonlyFiles()) {
return false;
}
}
}
return true;
return FileModificationService.getInstance().preparePsiElementsForWrite(psiFiles);
}
private void performWriteCommandAction(final RunResult<T> result) {
if (myProject != null && !ensureFilesWritable(myProject, Arrays.asList(myPsiFiles))) return;
if (!FileModificationService.getInstance().preparePsiElementsForWrite(Arrays.asList(myPsiFiles))) return;
//this is needed to prevent memory leak, since command
// is put into undo queue