Add Violation.endColumn property

Signed-off-by: Semyon Levin <levin.semen@gmail.com>
tomasbjerre · Jun 10, 2020 · e513933 · e513933
1 parent 27f3841
commit e513933
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/src/main/java/se/bjurr/violations/lib/model/Violation.java b/src/main/java/se/bjurr/violations/lib/model/Violation.java
@@ -16,6 +16,7 @@ public static class ViolationBuilder {
 
     private Integer column;
     private Integer endLine;
+    private Integer endColumn;
     private String file;
     private String message;
     private Parser parser;
@@ -44,6 +45,11 @@ public ViolationBuilder setEndLine(final Integer endLine) {
       return this;
     }
 
+    public ViolationBuilder setEndColumn(final Integer endColumn) {
+      this.endColumn = endColumn;
+      return this;
+    }
+
     public ViolationBuilder setFile(final String file) {
       this.file = file;
       return this;
@@ -118,6 +124,7 @@ public static ViolationBuilder violationBuilder() {
 
   private Integer column;
   private final Integer endLine;
+  private final Integer endColumn;
   private final String file;
   private final String message;
   /** The algorithm, the format, used. */
@@ -144,6 +151,7 @@ public static ViolationBuilder violationBuilder() {
   public Violation() {
     startLine = null;
     endLine = null;
+    endColumn = null;
     severity = null;
     message = null;
     file = null;
@@ -166,6 +174,7 @@ public Violation(final ViolationBuilder vb) {
     startLine = checkNotNull(vb.startLine, "startline");
     endLine = firstNonNull(vb.endLine, vb.startLine);
     column = vb.column;
+    endColumn = vb.endColumn;
     severity = checkNotNull(vb.severity, "severity");
     message = checkNotNull(emptyToNull(vb.message), "message");
     file = checkNotNull(emptyToNull(vb.file), "file").replaceAll("\\\\", "/");
@@ -181,6 +190,7 @@ public Violation(final Violation v) {
     reporter = v.reporter;
     startLine = v.startLine;
     endLine = v.endLine;
+    endColumn = v.endColumn;
     column = v.column;
     severity = v.severity;
     message = v.message;
@@ -225,6 +235,13 @@ public boolean equals(final Object obj) {
     } else if (!endLine.equals(other.endLine)) {
       return false;
     }
+    if (endColumn == null) {
+      if (other.endColumn != null) {
+        return false;
+      }
+    } else if (!endColumn.equals(other.endColumn)) {
+      return false;
+    }
     if (file == null) {
       if (other.file != null) {
         return false;
@@ -298,6 +315,10 @@ public Integer getEndLine() {
     return endLine;
   }
 
+  public Integer getEndColumn() {
+    return endColumn;
+  }
+
   public String getFile() {
     return file;
   }
@@ -358,6 +379,7 @@ public int hashCode() {
     result = prime * result + (category == null ? 0 : category.hashCode());
     result = prime * result + (column == null ? 0 : column.hashCode());
     result = prime * result + (endLine == null ? 0 : endLine.hashCode());
+    result = prime * result + (endColumn == null ? 0 : endColumn.hashCode());
     result = prime * result + (file == null ? 0 : file.hashCode());
     result = prime * result + (group == null ? 0 : group.hashCode());
     result = prime * result + (message == null ? 0 : message.hashCode());
@@ -377,6 +399,8 @@ public String toString() {
         + column
         + ", endLine="
         + endLine
+        + ", endColumn="
+        + endColumn
         + ", file="
         + file
         + ", message="