Cleanup:

- compareTo()/Comparable<T> 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 e905316a232cc3f743e47c1d041b3c782fa666f1..c06f26338a644f05dc23d0100e3b2efc31d0f98f 100644 (file)
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 8f2a52866c7ad118b28db9a470c105f6fc62f655..70a1a6a6565139b666bc696a133750c5800a8b3b 100644 (file)
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 221f558c88c722e38e98a8f00c55f365f4cf1498..d453cc6e2ed5caff242d519a97bb61fe244d2da0 100644 (file)
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 7dad4a093ec73a3f597125d3068b39e293fae567..0ec158aec46f5e2cb152081a1e03136da2eb0fb9 100644 (file)
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 53a00bf27ebd6d4bbd18470052d63b6aefc7fbfc..3642930de6d2e12f5e79cf75aa515151700022b7 100644 (file)
--- 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<BusinessContact> {
+public class CompanyContact implements BusinessContact {
 
        /**
         * Serial number
@@ -113,14 +113,9 @@ public class CompanyContact implements BusinessContact, Comparable<BusinessConta
        @OneToOne (targetEntity = CompanyHeadQuartersData.class, cascade = CascadeType.ALL, optional = false)
        private HeadQuartersData headQuartersData;
 
-       @Override
-       public int compareTo (final BusinessContact businessContact) {
-               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/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
index a5c0815378200b5a2a56ca435dcd0d141f5896c1..ca92223afa8b398a1c4ded0188f6089ba7e2f9c3 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
@@ -47,7 +47,7 @@ import org.mxchange.jusercore.model.user.User;
  */
 @Entity (name = "company_basic_data")
 @Table (name = "company_basic_data")
-public class CompanyBasicData implements BusinessBasicData, Comparable<BusinessBasicData> {
+public class CompanyBasicData implements BusinessBasicData {
 
        /**
         * Serial number
@@ -137,14 +137,9 @@ public class CompanyBasicData implements BusinessBasicData, Comparable<BusinessB
        @Column (name = "company_website_url")
        private String companyWebsiteUrl;
 
-       @Override
-       public int compareTo (final BusinessBasicData businessData) {
-               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/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
index 227ac7fba0d7d010ee7b0fa3b55b9b7ec5ecbb7a..062b78102f553f111e818f88c19f03dced079a2b 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
@@ -47,7 +47,7 @@ import org.mxchange.jusercore.model.user.User;
  */
 @Entity (name = "company_branch_offices")
 @Table (name = "company_branch_offices")
-public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffice> {
+public class CompanyBranchOffice implements BranchOffice {
 
        /**
         * Serial number
@@ -151,14 +151,9 @@ public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffic
        @Column (name = "branch_zip_code", length = 6, nullable = false)
        private Integer branchZipCode;
 
-       @Override
-       public int compareTo (final BranchOffice branchOffice) {
-               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/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
index 83a420be3fddb4155d1a20157acca69fa149ea57..2ef70403ca84a254619291e2d52e95d44ed4fb9b 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
+++ b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
@@ -49,7 +49,7 @@ import org.mxchange.jusercore.model.user.User;
  */
 @Entity (name = "company_departments")
 @Table (name = "company_departments")
-public class CompanyDepartment implements Department, Comparable<Department> {
+public class CompanyDepartment implements Department {
 
        /**
         * Serial number
@@ -114,14 +114,9 @@ public class CompanyDepartment implements Department, Comparable<Department> {
        @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 af2261f05c82035c032e569c6544be880ac12f0b..3b33f6c8888b480b0bff9737653f985ce6404234 100644 (file)
--- 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<Employee> {
+public class CompanyEmployee implements Employee {
 
        /**
         * Serial number
@@ -151,14 +151,9 @@ public class CompanyEmployee implements Employee, Comparable<Employee> {
        @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 bbd15da32fe622805a1ea4d9ca64775e09a20450..87166fe066c9e738e2901701d4f35d2446ef1bfe 100644 (file)
--- 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<HeadQuartersData> {
+public class CompanyHeadQuartersData implements HeadQuartersData {
 
        /**
         * Serial number
@@ -137,14 +137,9 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<Hea
        @Column (name = "headquarters_zip_code", length = 6, nullable = false)
        private Integer headquartersZipCode;
 
-       @Override
-       public int compareTo (final HeadQuartersData headQuartersData) {
-               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/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java
index 0c23f73a5d1f82976ec578b06cc8d6d905523ea4..6ebfcb96253f7c02cfeece538a511a83ed3fd9da 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java
+++ b/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java
@@ -24,6 +24,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -34,8 +35,13 @@ import javax.persistence.TemporalType;
  * @author Roland Haeder<roland@mxchange.org>
  */
 @Entity (name = "company_job_positions")
-@Table (name = "company_job_positions")
-public class EmployeePosition implements JobPosition, Comparable<JobPosition> {
+@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<JobPosition> {
         * 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 2df7718295c541202703e42dfd23c31ea72f23d8..3b98382c3ce7cb28a616052a3ce261c88a981dea 100644 (file)
--- 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<BusinessLogo> {
+public class CompanyLogo implements BusinessLogo {
 
        /**
         * Serial number
@@ -77,14 +77,9 @@ public class CompanyLogo implements BusinessLogo, Comparable<BusinessLogo> {
        @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;