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

DocumentRunnable.IgnoreDocumentRunnable is not used anymore

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-06-29 09:03:49 +02:00
parent f0882319a1
commit 9be699818b
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
+3 -4
View File
@@ -17,13 +17,12 @@ package com.intellij.openapi.components.impl.stores;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.components.StateSplitter;
import com.intellij.openapi.components.StateStorageException;
import com.intellij.openapi.components.TrackingPathMacroSubstitutor;
import com.intellij.openapi.components.store.ReadOnlyModificationException;
import com.intellij.openapi.editor.DocumentRunnable;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
@@ -153,7 +152,7 @@ public class DirectoryBasedStorage extends StateStorageBase<DirectoryStorageData
return file;
}
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
return parent.createChildData(requestor, fileName);
}
@@ -282,7 +281,7 @@ public class DirectoryBasedStorage extends StateStorageBase<DirectoryStorageData
}
private void deleteFiles(@NotNull VirtualFile dir) throws IOException {
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
for (VirtualFile file : dir.getChildren()) {
if (removedFileNames.contains(file.getName())) {
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
+1 -2
View File
@@ -29,7 +29,6 @@ import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.components.TrackingPathMacroSubstitutor;
import com.intellij.openapi.components.store.ReadOnlyModificationException;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.DocumentRunnable;
import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
@@ -238,7 +237,7 @@ public class StorageUtil {
}
public static void deleteFile(@NotNull Object requestor, @NotNull VirtualFile virtualFile) throws IOException {
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
virtualFile.delete(requestor);
}
platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
+3 -4
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.components.impl.stores.DirectoryStorageData;
import com.intellij.openapi.components.impl.stores.StorageUtil;
import com.intellij.openapi.components.impl.stores.StreamProvider;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.DocumentRunnable;
import com.intellij.openapi.extensions.AbstractExtensionPointBean;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
@@ -589,7 +588,7 @@ public final class SchemesManagerImpl<T extends Scheme, E extends Externalizable
if (renamed) {
file = dir.findChild(externalInfo.fileNameWithoutExtension + externalInfo.fileExtension);
if (file != null) {
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
file.rename(this, fileName);
}
@@ -603,7 +602,7 @@ public final class SchemesManagerImpl<T extends Scheme, E extends Externalizable
file = DirectoryBasedStorage.getFile(fileName, dir, this);
}
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
OutputStream out = file.getOutputStream(this);
try {
@@ -670,7 +669,7 @@ public final class SchemesManagerImpl<T extends Scheme, E extends Externalizable
for (VirtualFile file : dir.getChildren()) {
if (filesToDelete.contains(file.getName())) {
if (token == null) {
token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
token = WriteAction.start();
}
try {
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/ClasspathSaveSession.java
+2 -3
View File
@@ -16,11 +16,10 @@
package org.jetbrains.idea.eclipse.config;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.components.StateStorage;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.impl.stores.StorageUtil;
import com.intellij.openapi.editor.DocumentRunnable;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.impl.ModuleRootManagerImpl;
import com.intellij.openapi.util.JDOMUtil;
@@ -115,7 +114,7 @@ final class ClasspathSaveSession implements StateStorage.ExternalizationSession,
public void save() throws IOException {
CachedXmlDocumentSet fileSet = EclipseClasspathStorageProvider.getFileCache(module);
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
for (String key : modifiedContent.keySet()) {
Element content = modifiedContent.get(key);
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java
+2 -3
View File
@@ -16,9 +16,8 @@
package org.jetbrains.idea.eclipse.config;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.components.PathMacroManager;
import com.intellij.openapi.editor.DocumentRunnable;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.roots.*;
@@ -146,7 +145,7 @@ public class EclipseClasspathStorageProvider implements ClasspathStorageProvider
VirtualFile root = LocalFileSystem.getInstance().findFileByPath(ClasspathStorage.getModuleDir(module));
VirtualFile source = root == null ? null : root.findChild(module.getName() + EclipseXml.IDEA_SETTINGS_POSTFIX);
if (source != null && source.isValid()) {
AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(DocumentRunnable.IgnoreDocumentRunnable.class);
AccessToken token = WriteAction.start();
try {
source.rename(this, newName + EclipseXml.IDEA_SETTINGS_POSTFIX);
}