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

introduce field in setUp fixed

Browse Source
This commit is contained in:
Anton Makeev
2010-06-23 15:40:46 +04:00
parent 889521212b
commit a248a7d859
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-api/src/com/intellij/history/LocalHistory.java
+2
View File
@@ -22,6 +22,8 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
public abstract class LocalHistory {
public static final Object VFS_EVENT_REQUESTOR = new Object();
public static LocalHistory getInstance() {
return ApplicationManager.getApplication().getComponent(LocalHistory.class);
}
platform/lvcs-impl/src/com/intellij/history/integration/revertion/ChangeRevertingVisitor.java
+6 -5
View File
@@ -16,6 +16,7 @@
package com.intellij.history.integration.revertion;
import com.intellij.history.LocalHistory;
import com.intellij.history.core.Paths;
import com.intellij.history.core.changes.*;
import com.intellij.history.core.storage.Content;
@@ -64,7 +65,7 @@ public class ChangeRevertingVisitor extends ChangeVisitor {
if (f != null) {
unregisterDelayedApplies(f);
try {
f.delete(this);
f.delete(LocalHistory.VFS_EVENT_REQUESTOR);
}
catch (IOException e) {
throw new RuntimeIOException(e);
@@ -96,9 +97,9 @@ public class ChangeRevertingVisitor extends ChangeVisitor {
VirtualFile existing = f.getParent().findChild(c.getOldName());
try {
if (existing != null && existing != f) {
existing.delete(this);
existing.delete(LocalHistory.VFS_EVENT_REQUESTOR);
}
f.rename(this, c.getOldName());
f.rename(LocalHistory.VFS_EVENT_REQUESTOR, c.getOldName());
}
catch (IOException e) {
throw new RuntimeIOException(e);
@@ -127,8 +128,8 @@ public class ChangeRevertingVisitor extends ChangeVisitor {
try {
VirtualFile parent = myGateway.findOrCreateFileSafely(c.getOldParent(), true);
VirtualFile existing = parent.findChild(f.getName());
if (existing != null) existing.delete(this);
f.move(this, parent);
if (existing != null) existing.delete(LocalHistory.VFS_EVENT_REQUESTOR);
f.move(LocalHistory.VFS_EVENT_REQUESTOR, parent);
}
catch (IOException e) {
throw new RuntimeIOException(e);