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 the code

Browse Source 
Use ContainerUtil.find for cleaner logic.
This commit is contained in:
Kirill Likhodedov
2016-03-22 18:20:17 +03:00
parent 783963b227
commit b6090643f8
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
+11 -7
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vcs.actions.VcsContextFactory;
import com.intellij.openapi.vcs.changes.ChangeListManager;
@@ -275,16 +276,19 @@ public abstract class VcsVFSListener implements Disposable {
myDirtyFiles.add(file); // will be at new path
}
}
final String newPath = newParentPath + "/" + newName;
boolean foundExistingInfo = false;
for (MovedFileInfo info : myMovedFiles) {
if (Comparing.equal(info.myFile, file)) {
info.myNewPath = newPath;
foundExistingInfo = true;
break;
MovedFileInfo existingMovedFile = ContainerUtil.find(myMovedFiles, new Condition<MovedFileInfo>() {
@Override
public boolean value(MovedFileInfo info) {
return Comparing.equal(info.myFile, file);
}
});
if (existingMovedFile != null) {
LOG.debug("Reusing existing moved file " + file);
existingMovedFile.myNewPath = newPath;
}
if (!foundExistingInfo) {
else {
LOG.debug("Registered moved file " + file);
myMovedFiles.add(new MovedFileInfo(file, newPath));
}