Remove unused variables

The PatchScript.hasIntralineDifference() method is not used anywhere.

Change-Id: Ie41c264a01cb18b7558fcdf1a3d802321780b895
This commit is contained in:
Dmitrii Filippov
2019-10-02 11:23:51 +02:00
committed by Han-Wen Nienhuys
parent e9a019e7b9
commit 1e2d1a63b8
2 changed files with 1 additions and 16 deletions

View File

@@ -56,7 +56,6 @@ public class PatchScript {
private CommentDetail comments; private CommentDetail comments;
private List<Patch> history; private List<Patch> history;
private boolean hugeFile; private boolean hugeFile;
private boolean intralineDifference;
private boolean intralineFailure; private boolean intralineFailure;
private boolean intralineTimeout; private boolean intralineTimeout;
private boolean binary; private boolean binary;
@@ -83,7 +82,6 @@ public class PatchScript {
CommentDetail cd, CommentDetail cd,
List<Patch> hist, List<Patch> hist,
boolean hf, boolean hf,
boolean id,
boolean idf, boolean idf,
boolean idt, boolean idt,
boolean bin, boolean bin,
@@ -108,7 +106,6 @@ public class PatchScript {
comments = cd; comments = cd;
history = hist; history = hist;
hugeFile = hf; hugeFile = hf;
intralineDifference = id;
intralineFailure = idf; intralineFailure = idf;
intralineTimeout = idt; intralineTimeout = idt;
binary = bin; binary = bin;
@@ -178,10 +175,6 @@ public class PatchScript {
return diffPrefs.ignoreWhitespace != Whitespace.IGNORE_NONE; return diffPrefs.ignoreWhitespace != Whitespace.IGNORE_NONE;
} }
public boolean hasIntralineDifference() {
return intralineDifference;
}
public boolean hasIntralineFailure() { public boolean hasIntralineFailure() {
return intralineFailure; return intralineFailure;
} }

View File

@@ -121,7 +121,6 @@ class PatchScriptBuilder {
private PatchScript build(PatchListEntry content, CommentDetail comments, List<Patch> history) private PatchScript build(PatchListEntry content, CommentDetail comments, List<Patch> history)
throws IOException { throws IOException {
boolean intralineDifferenceIsPossible = true;
boolean intralineFailure = false; boolean intralineFailure = false;
boolean intralineTimeout = false; boolean intralineTimeout = false;
@@ -134,9 +133,7 @@ class PatchScriptBuilder {
edits = new ArrayList<>(content.getEdits()); edits = new ArrayList<>(content.getEdits());
ImmutableSet<Edit> editsDueToRebase = content.getEditsDueToRebase(); ImmutableSet<Edit> editsDueToRebase = content.getEditsDueToRebase();
if (!isModify(content)) { if (isModify(content) && diffPrefs.intralineDifference) {
intralineDifferenceIsPossible = false;
} else if (diffPrefs.intralineDifference) {
IntraLineDiff d = IntraLineDiff d =
patchListCache.getIntraLineDiff( patchListCache.getIntraLineDiff(
IntraLineDiffKey.create(a.id, b.id, diffPrefs.ignoreWhitespace), IntraLineDiffKey.create(a.id, b.id, diffPrefs.ignoreWhitespace),
@@ -149,21 +146,17 @@ class PatchScriptBuilder {
break; break;
case DISABLED: case DISABLED:
intralineDifferenceIsPossible = false;
break; break;
case ERROR: case ERROR:
intralineDifferenceIsPossible = false;
intralineFailure = true; intralineFailure = true;
break; break;
case TIMEOUT: case TIMEOUT:
intralineDifferenceIsPossible = false;
intralineTimeout = true; intralineTimeout = true;
break; break;
} }
} else { } else {
intralineDifferenceIsPossible = false;
intralineFailure = true; intralineFailure = true;
} }
} }
@@ -223,7 +216,6 @@ class PatchScriptBuilder {
comments, comments,
history, history,
hugeFile, hugeFile,
intralineDifferenceIsPossible,
intralineFailure, intralineFailure,
intralineTimeout, intralineTimeout,
content.getPatchType() == Patch.PatchType.BINARY, content.getPatchType() == Patch.PatchType.BINARY,