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

vcs: simplify ChangeListWorker

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-03-02 15:19:14 +03:00
committed by Aleksey Pivovarov
parent 747411891a
commit 9104505f3e
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+5 -7
View File
@@ -234,17 +234,15 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
LOG.debug("[addChangeToCorrespondingList] for change " + path + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
assert myDefault != null;
for (LocalChangeListImpl list : myMap.values()) {
if (list.isDefault()) {
LOG.debug("[addChangeToCorrespondingList] skip default list: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
continue;
}
if (list.processChange(change)) {
LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
if (list.hadChangeBeforeUpdate(change)) {
LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName());
list.addChange(change);
myIdx.changeAdded(change, vcsKey);
return;
}
}
myDefault.processChange(change);
LOG.debug("[addChangeToCorrespondingList] added to default list");
myDefault.addChange(change);
myIdx.changeAdded(change, vcsKey);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
+2 -16
View File
@@ -195,22 +195,8 @@ public class LocalChangeListImpl extends LocalChangeList {
});
}
boolean processChange(@NotNull Change change) {
LOG.debug("[process change] for '" + myName + "' isDefault: " + myIsDefault + " change: " +
ChangesUtil.getFilePath(change).getPath());
if (myIsDefault) {
LOG.debug("[process change] adding because default");
addChange(change);
return true;
}
if (myChangesBeforeUpdate.contains(change)) {
LOG.debug("[process change] adding because equal to old: " + ChangesUtil.getFilePath(change).getPath());
addChange(change);
return true;
}
LOG.debug("[process change] not found");
return false;
boolean hadChangeBeforeUpdate(@NotNull Change change) {
return myChangesBeforeUpdate.contains(change);
}
boolean doneProcessingChanges(final List<Change> removedChanges, final List<Change> addedChanges) {