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

diff: extract method

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-07-13 16:16:25 +03:00
parent 55a75e0704
commit 014130920f
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java
+24 -12
View File
@@ -153,18 +153,21 @@ public class DTree {
tree.setType(DiffType.SOURCE);
} else {
assert src != null;
DiffType dtype = src.getSize() == trg.getSize() ? DiffType.EQUAL : DiffType.CHANGED;
if (dtype == DiffType.EQUAL) {
switch (settings.compareMode) {
case CONTENT:
dtype = isEqual(src, trg) ? DiffType.EQUAL : DiffType.CHANGED;
break;
case TIMESTAMP:
dtype = Math.abs(src.getTimeStamp() - trg.getTimeStamp()) <= settings.compareTimestampAccuracy ? DiffType.EQUAL : DiffType.CHANGED;
break;
}
boolean equals;
switch (settings.compareMode) {
case CONTENT:
equals = isEqualContents(src, trg);
break;
case SIZE:
equals = isEqualSizes(src, trg);
break;
case TIMESTAMP:
equals = isEqualTimestamps(src, trg, settings);
break;
default:
throw new IllegalStateException(settings.compareMode.name());
}
tree.setType(dtype);
tree.setType(equals ? DiffType.EQUAL : DiffType.CHANGED);
}
tree.update(settings);
}
@@ -234,7 +237,16 @@ public class DTree {
}
}
private static boolean isEqual(DiffElement file1, DiffElement file2) {
private static boolean isEqualSizes(DiffElement<?> file1, DiffElement<?> file2) {
return file1.getSize() == file2.getSize();
}
private static boolean isEqualTimestamps(DiffElement<?> src, DiffElement<?> trg, DirDiffSettings settings) {
if (src.getSize() != trg.getSize()) return false;
return Math.abs(src.getTimeStamp() - trg.getTimeStamp()) <= settings.compareTimestampAccuracy;
}
private static boolean isEqualContents(DiffElement<?> file1, DiffElement<?> file2) {
if (file1.isContainer() || file2.isContainer()) return false;
if (file1.getSize() != file2.getSize()) return false;
try {