Merge changes I6f5acd4e,I2b824c24

* changes:
  Remove handling of ignored diff context parameter (just backend logic)
  EditList: Remove unused methods
This commit is contained in:
Alice Kober-Sotzek
2020-10-02 12:49:47 +00:00
committed by Gerrit Code Review
12 changed files with 169 additions and 685 deletions

View File

@@ -52,7 +52,6 @@ public interface FileApi {
abstract class DiffRequest {
private String base;
private Integer context;
private Boolean intraline;
private Whitespace whitespace;
private OptionalInt parent = OptionalInt.empty();
@@ -64,11 +63,6 @@ public interface FileApi {
return this;
}
public DiffRequest withContext(int context) {
this.context = context;
return this;
}
public DiffRequest withIntraline(boolean intraline) {
this.intraline = intraline;
return this;
@@ -88,10 +82,6 @@ public interface FileApi {
return base;
}
public Integer getContext() {
return context;
}
public Boolean getIntraline() {
return intraline;
}

View File

@@ -28,12 +28,6 @@ public class DiffPreferencesInfo {
/** Default line length. */
public static final int DEFAULT_LINE_LENGTH = 100;
/** Context setting to display the entire file. */
public static final short WHOLE_FILE_CONTEXT = -1;
/** Typical valid choices for the default context setting. */
public static final short[] CONTEXT_CHOICES = {3, 10, 25, 50, 75, 100, WHOLE_FILE_CONTEXT};
public enum Whitespace {
IGNORE_NONE,
IGNORE_TRAILING,