From: Roland Haeder Date: Sat, 12 Mar 2016 11:42:31 +0000 (+0100) Subject: Cleanup: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d40ed4a5304e6612992f0da3a21732c7e607786b;p=jcontacts-business-core.git Cleanup: - compareTo()/Comparable was used back in the TDGP times and is no longer needed - value first, then variable on comparison to avoid accidently assignments - updated jar(s) --- diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index e905316..c06f263 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 8f2a528..70a1a6a 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 221f558..d453cc6 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 7dad4a0..0ec158a 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/src/org/mxchange/jcontactsbusiness/CompanyContact.java b/src/org/mxchange/jcontactsbusiness/CompanyContact.java index 53a00bf..3642930 100644 --- a/src/org/mxchange/jcontactsbusiness/CompanyContact.java +++ b/src/org/mxchange/jcontactsbusiness/CompanyContact.java @@ -49,7 +49,7 @@ import org.mxchange.jusercore.model.user.User; */ @Entity (name = "company_contacts") @Table (name = "company_contacts") -public class CompanyContact implements BusinessContact, Comparable { +public class CompanyContact implements BusinessContact { /** * Serial number @@ -113,14 +113,9 @@ public class CompanyContact implements BusinessContact, Comparable { +public class CompanyBasicData implements BusinessBasicData { /** * Serial number @@ -137,14 +137,9 @@ public class CompanyBasicData implements BusinessBasicData, Comparable { +public class CompanyBranchOffice implements BranchOffice { /** * Serial number @@ -151,14 +151,9 @@ public class CompanyBranchOffice implements BranchOffice, Comparable { +public class CompanyDepartment implements Department { /** * Serial number @@ -114,14 +114,9 @@ public class CompanyDepartment implements Department, Comparable { @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) private User departmentUserOwner; - @Override - public int compareTo (final Department department) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public boolean equals (final Object object) { - if (object == null) { + if (null == object) { return false; } else if (this.getClass() != object.getClass()) { return false; diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index af2261f..3b33f6c 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -54,7 +54,7 @@ import org.mxchange.jusercore.model.user.User; */ @Entity (name = "company_employees") @Table (name = "company_employees") -public class CompanyEmployee implements Employee, Comparable { +public class CompanyEmployee implements Employee { /** * Serial number @@ -151,14 +151,9 @@ public class CompanyEmployee implements Employee, Comparable { @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) private User employeeUserOwner; - @Override - public int compareTo (final Employee employee) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public boolean equals (final Object object) { - if (object == null) { + if (null == object) { return false; } else if (this.getClass() != object.getClass()) { return false; diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java index bbd15da..87166fe 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java +++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java @@ -46,7 +46,7 @@ import org.mxchange.jusercore.model.user.User; */ @Entity (name = "company_headquarters") @Table (name = "company_headquarters") -public class CompanyHeadQuartersData implements HeadQuartersData, Comparable { +public class CompanyHeadQuartersData implements HeadQuartersData { /** * Serial number @@ -137,14 +137,9 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable */ @Entity (name = "company_job_positions") -@Table (name = "company_job_positions") -public class EmployeePosition implements JobPosition, Comparable { +@Table ( + name = "company_job_positions", + indexes = { + @Index (name = "job_position", columnList = "job_position_name", unique = true) + } +) +public class EmployeePosition implements JobPosition { /** * Serial number @@ -62,17 +68,12 @@ public class EmployeePosition implements JobPosition, Comparable { * Name/description of the job position (example: CEO) */ @Basic (optional = false) - @Column (name = "job_position_name", length = 10, nullable = false, unique = true) + @Column (name = "job_position_name", length = 20, nullable = false, unique = true) private String jobPositionName; - @Override - public int compareTo (final JobPosition jobPosition) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public boolean equals (final Object object) { - if (object == null) { + if (null == object) { return false; } else if (this.getClass() != object.getClass()) { return false; diff --git a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java index 2df7718..3b98382 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java +++ b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java @@ -40,7 +40,7 @@ import org.mxchange.jusercore.model.user.User; */ @Entity (name = "company_logos") @Table (name = "company_logos") -public class CompanyLogo implements BusinessLogo, Comparable { +public class CompanyLogo implements BusinessLogo { /** * Serial number @@ -77,14 +77,9 @@ public class CompanyLogo implements BusinessLogo, Comparable { @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) private User logoUploader; - @Override - public int compareTo (final BusinessLogo businessLogo) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } - @Override public boolean equals (final Object object) { - if (object == null) { + if (null == object) { return false; } else if (this.getClass() != object.getClass()) { return false;