Remove unused variables
The PatchScript.hasIntralineDifference() method is not used anywhere. Change-Id: Ie41c264a01cb18b7558fcdf1a3d802321780b895
This commit is contained in:
committed by
Han-Wen Nienhuys
parent
e9a019e7b9
commit
1e2d1a63b8
@@ -56,7 +56,6 @@ public class PatchScript {
|
||||
private CommentDetail comments;
|
||||
private List<Patch> history;
|
||||
private boolean hugeFile;
|
||||
private boolean intralineDifference;
|
||||
private boolean intralineFailure;
|
||||
private boolean intralineTimeout;
|
||||
private boolean binary;
|
||||
@@ -83,7 +82,6 @@ public class PatchScript {
|
||||
CommentDetail cd,
|
||||
List<Patch> hist,
|
||||
boolean hf,
|
||||
boolean id,
|
||||
boolean idf,
|
||||
boolean idt,
|
||||
boolean bin,
|
||||
@@ -108,7 +106,6 @@ public class PatchScript {
|
||||
comments = cd;
|
||||
history = hist;
|
||||
hugeFile = hf;
|
||||
intralineDifference = id;
|
||||
intralineFailure = idf;
|
||||
intralineTimeout = idt;
|
||||
binary = bin;
|
||||
@@ -178,10 +175,6 @@ public class PatchScript {
|
||||
return diffPrefs.ignoreWhitespace != Whitespace.IGNORE_NONE;
|
||||
}
|
||||
|
||||
public boolean hasIntralineDifference() {
|
||||
return intralineDifference;
|
||||
}
|
||||
|
||||
public boolean hasIntralineFailure() {
|
||||
return intralineFailure;
|
||||
}
|
||||
|
||||
@@ -121,7 +121,6 @@ class PatchScriptBuilder {
|
||||
|
||||
private PatchScript build(PatchListEntry content, CommentDetail comments, List<Patch> history)
|
||||
throws IOException {
|
||||
boolean intralineDifferenceIsPossible = true;
|
||||
boolean intralineFailure = false;
|
||||
boolean intralineTimeout = false;
|
||||
|
||||
@@ -134,9 +133,7 @@ class PatchScriptBuilder {
|
||||
edits = new ArrayList<>(content.getEdits());
|
||||
ImmutableSet<Edit> editsDueToRebase = content.getEditsDueToRebase();
|
||||
|
||||
if (!isModify(content)) {
|
||||
intralineDifferenceIsPossible = false;
|
||||
} else if (diffPrefs.intralineDifference) {
|
||||
if (isModify(content) && diffPrefs.intralineDifference) {
|
||||
IntraLineDiff d =
|
||||
patchListCache.getIntraLineDiff(
|
||||
IntraLineDiffKey.create(a.id, b.id, diffPrefs.ignoreWhitespace),
|
||||
@@ -149,21 +146,17 @@ class PatchScriptBuilder {
|
||||
break;
|
||||
|
||||
case DISABLED:
|
||||
intralineDifferenceIsPossible = false;
|
||||
break;
|
||||
|
||||
case ERROR:
|
||||
intralineDifferenceIsPossible = false;
|
||||
intralineFailure = true;
|
||||
break;
|
||||
|
||||
case TIMEOUT:
|
||||
intralineDifferenceIsPossible = false;
|
||||
intralineTimeout = true;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
intralineDifferenceIsPossible = false;
|
||||
intralineFailure = true;
|
||||
}
|
||||
}
|
||||
@@ -223,7 +216,6 @@ class PatchScriptBuilder {
|
||||
comments,
|
||||
history,
|
||||
hugeFile,
|
||||
intralineDifferenceIsPossible,
|
||||
intralineFailure,
|
||||
intralineTimeout,
|
||||
content.getPatchType() == Patch.PatchType.BINARY,
|
||||
|
||||
Reference in New Issue
Block a user