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: local history fix

Browse Source
This commit is contained in:
Anton Makeev
2011-05-11 10:29:25 +02:00
parent 6c77a567e0
commit 6b49b6c08e
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/integration/revertion/ChangeRevertingVisitor.java
+4 -2
View File
@@ -26,6 +26,8 @@ import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.HashSet;
import com.intellij.util.io.ReadOnlyAttributeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.util.ArrayList;
@@ -41,10 +43,10 @@ public class ChangeRevertingVisitor extends ChangeVisitor {
private boolean isReverting;
public ChangeRevertingVisitor(IdeaGateway gw, long fromChangeId, long toChangeId) {
public ChangeRevertingVisitor(IdeaGateway gw, @NotNull Long fromChangeId, @Nullable Long toChangeId) {
myGateway = gw;
myFromChangeId = fromChangeId;
myToChangeId = toChangeId;
myToChangeId = toChangeId == null ? -1 : toChangeId;
}
protected boolean shouldRevert(Change c) {
platform/lvcs-impl/src/com/intellij/openapi/command/impl/ChangeRange.java
+9 -7
View File
@@ -21,20 +21,22 @@ import com.intellij.history.core.changes.Change;
import com.intellij.history.integration.IdeaGateway;
import com.intellij.history.integration.revertion.ChangeRevertingVisitor;
import com.intellij.openapi.util.Ref;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
public class ChangeRange {
private final IdeaGateway myGateway;
private final LocalHistoryFacade myVcs;
private final long myFromChangeId;
private final long myToChangeId;
private final Long myFromChangeId;
@Nullable private final Long myToChangeId;
public ChangeRange(IdeaGateway gw, LocalHistoryFacade vcs, long change) {
this(gw, vcs, change, change);
public ChangeRange(IdeaGateway gw, LocalHistoryFacade vcs, @NotNull Long changeId) {
this(gw, vcs, changeId, changeId);
}
public ChangeRange(IdeaGateway gw, LocalHistoryFacade vcs, long fromChangeId, long toChangeId) {
private ChangeRange(IdeaGateway gw, LocalHistoryFacade vcs, @Nullable Long fromChangeId, @Nullable Long toChangeId) {
myGateway = gw;
myVcs = vcs;
myFromChangeId = fromChangeId;
@@ -54,13 +56,13 @@ public class ChangeRange {
try {
myVcs.accept(new ChangeRevertingVisitor(myGateway, myToChangeId, myFromChangeId));
}
catch(ChangeRevertingVisitor.RuntimeIOException e) {
catch (ChangeRevertingVisitor.RuntimeIOException e) {
throw (IOException)e.getCause();
}
finally {
myVcs.removeListener(l);
}
if (reverse != null) {
if (first.isNull()) first.set(reverse.myFromChangeId);
if (last.isNull()) last.set(reverse.myToChangeId);