OP-1220 Add Supplier comparator to sort in combobox (#1330)

* OP-1220 Add Supplier comparator to sort in combobox

* Replace compareTo with Apache Commons compare

* Organize imports

src/main/java/org/isf/supplier/model/Supplier.java

@@ -22,6 +22,7 @@
 package org.isf.supplier.model;
 
 import java.io.Serializable;
+import java.util.Comparator;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.Column;
@@ -34,14 +35,15 @@
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.lang3.StringUtils;
 import org.isf.utils.db.Auditable;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
  * Supplier generated by hbm2java
  */
 @Entity
-@Table(name="OH_SUPPLIER")
+@Table(name = "OH_SUPPLIER")
 @EntityListeners(AuditingEntityListener.class)
 @AttributeOverride(name = "createdBy", column = @Column(name = "SUP_CREATED_BY", updatable = false))
 @AttributeOverride(name = "createdDate", column = @Column(name = "SUP_CREATED_DATE", updatable = false))
@@ -51,37 +53,37 @@
 public class Supplier extends Auditable<String> implements Serializable {
 
 	private static final long serialVersionUID = 1L;
-	
-	@Id 
-	@GeneratedValue(strategy=GenerationType.AUTO)
-	@Column(name="SUP_ID")
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "SUP_ID")
 	private Integer supId;
-	
+
 	@NotNull
-	@Column(name="SUP_NAME")
+	@Column(name = "SUP_NAME")
 	private String supName;
-	
-	@Column(name="SUP_ADDRESS")
+
+	@Column(name = "SUP_ADDRESS")
 	private String supAddress;
-	
-	@Column(name="SUP_TAXCODE")
+
+	@Column(name = "SUP_TAXCODE")
 	private String supTaxcode;
-	
-	@Column(name="SUP_PHONE")
+
+	@Column(name = "SUP_PHONE")
 	private String supPhone;
-	
-	@Column(name="SUP_FAX")
+
+	@Column(name = "SUP_FAX")
 	private String supFax;
-	
-	@Column(name="SUP_EMAIL")
+
+	@Column(name = "SUP_EMAIL")
 	private String supEmail;
-	
-	@Column(name="SUP_NOTE")
+
+	@Column(name = "SUP_NOTE")
 	private String supNote;
-	
-	@Column(name="SUP_DELETED", columnDefinition = "char(1) default 'N'")
+
+	@Column(name = "SUP_DELETED", columnDefinition = "char(1) default 'N'")
 	private char supDeleted;
-	
+
 	@Transient
 	private volatile int hashCode;
 
@@ -110,7 +112,7 @@ public Supplier(Integer supID, String supName, String supAddress, String supTaxc
 		this.supNote = supNote;
 		this.supDeleted = 'N';
 	}
-	
+
 	/**
 	 * @param supID
 	 * @param supName
@@ -122,7 +124,8 @@ public Supplier(Integer supID, String supName, String supAddress, String supTaxc
 	 * @param supNote
 	 * @param supDeleted
 	 */
-	public Supplier(Integer supID, String supName, String supAddress, String supTaxcode, String supPhone, String supFax, String supEmail, String supNote, Character supDeleted) {
+	public Supplier(Integer supID, String supName, String supAddress, String supTaxcode, String supPhone, String supFax, String supEmail, String supNote,
+					Character supDeleted) {
 		this.supId = supID;
 		this.supName = supName;
 		this.supAddress = supAddress;
@@ -133,7 +136,7 @@ public Supplier(Integer supID, String supName, String supAddress, String supTaxc
 		this.supNote = supNote;
 		this.supDeleted = supDeleted;
 	}
-	
+
 	public Integer getSupId() {
 		return this.supId;
 	}
@@ -210,32 +213,40 @@ public void setSupDeleted(Character supDeleted) {
 	public String toString() {
 		return this.supName;
 	}
-	
+
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
 		}
-		
+
 		if (!(obj instanceof Supplier)) {
 			return false;
 		}
-		
-		Supplier supplier = (Supplier)obj;
+
+		Supplier supplier = (Supplier) obj;
 		return (this.getSupId().equals(supplier.getSupId()));
 	}
 
 	@Override
 	public int hashCode() {
-	    if (this.hashCode == 0) {
-	        final int m = 23;
-	        int c = 133;
-
-	        c = m * c + supId.hashCode();
-
-	        this.hashCode = c;
-	    }
-
-	    return this.hashCode;
-	}	
+		if (this.hashCode == 0) {
+			final int m = 23;
+			int c = 133;
+
+			c = m * c + supId.hashCode();
+
+			this.hashCode = c;
+		}
+
+		return this.hashCode;
+	}
+
+	public static class SupplierNameComparator implements Comparator<Supplier> {
+
+		@Override
+		public int compare(Supplier object1, Supplier object2) {
+			return StringUtils.compare(object1.getSupName(), object2.getSupName());
+		}
+	}
 }