From 26029796d14f603c503749bab4f87356cb01a0bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 13 Mar 2018 00:56:54 +0100 Subject: [PATCH] Continued: - implemented Comparable interface in BranchOffice as PrimeFaces require this - updated copyright year MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AdminAddedBusinessBasicDataEvent.java | 2 +- ...vableAdminAddedBusinessBasicDataEvent.java | 2 +- .../added/BranchOfficeAddedEvent.java | 2 +- .../ObservableBranchOfficeAddedEvent.java | 2 +- .../added/DepartmentAddedEvent.java | 2 +- .../added/ObservableDepartmentAddedEvent.java | 2 +- .../employee/added/EmployeeAddedEvent.java | 2 +- .../added/ObservableEmployeeAddedEvent.java | 2 +- .../added/HeadquarterAddedEvent.java | 2 +- .../ObservableHeadquarterAddedEvent.java | 2 +- .../ObservableOpeningTimeAddedEvent.java | 2 +- .../added/OpeningTimeAddedEvent.java | 2 +- .../BasicDataAlreadyAddedException.java | 2 +- .../basicdata/BasicDataNotFoundException.java | 2 +- .../BranchOfficeAlreadyAddedException.java | 2 +- .../BranchOfficeNotFoundException.java | 2 +- .../DepartmentAlreadyAddedException.java | 2 +- .../DepartmentNotFoundException.java | 2 +- .../EmployeeAlreadyAddedException.java | 2 +- .../employee/EmployeeNotFoundException.java | 2 +- .../HeadquarterAlreadyAddedException.java | 2 +- .../HeadquarterNotFoundException.java | 2 +- .../OpeningTimeNotFoundException.java | 2 +- .../model/basicdata/BasicData.java | 2 +- .../model/basicdata/BusinessBasicData.java | 2 +- .../model/branchoffice/BranchOffice.java | 4 +- .../model/branchoffice/BranchOffices.java | 2 +- .../branchoffice/BusinessBranchOffice.java | 58 ++++++++++++++++++- .../model/department/BusinessDepartment.java | 2 +- .../model/department/Department.java | 2 +- .../model/department/Departments.java | 2 +- .../model/employee/BusinessEmployee.java | 2 +- .../model/employee/Employable.java | 2 +- .../model/employee/Employees.java | 2 +- .../model/headquarter/Headquarter.java | 2 +- .../model/headquarter/Headquarters.java | 2 +- .../model/jobposition/EmployeePosition.java | 2 +- .../model/jobposition/JobPosition.java | 2 +- .../model/logo/BusinessLogo.java | 2 +- .../jcontactsbusiness/model/logo/Logo.java | 2 +- .../opening_time/BusinessOpeningTime.java | 2 +- .../model/opening_time/OpeningTime.java | 2 +- .../opening_time/dayofweek/DayOfTheWeek.java | 2 +- 43 files changed, 100 insertions(+), 44 deletions(-) diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java index 693153f..4bdc2dd 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java index dd1a041..1551740 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java index 0209798..2f26c5c 100644 --- a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java index 8ff1b06..71b55f4 100644 --- a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/department/added/DepartmentAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/department/added/DepartmentAddedEvent.java index e7386a8..bfd0b54 100644 --- a/src/org/mxchange/jcontactsbusiness/events/department/added/DepartmentAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/department/added/DepartmentAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/department/added/ObservableDepartmentAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/department/added/ObservableDepartmentAddedEvent.java index 5d89324..ea7769d 100644 --- a/src/org/mxchange/jcontactsbusiness/events/department/added/ObservableDepartmentAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/department/added/ObservableDepartmentAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java index 6ec72ae..e1f23db 100644 --- a/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java index ed930f7..f8c7e6d 100644 --- a/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/headquarter/added/HeadquarterAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/headquarter/added/HeadquarterAddedEvent.java index c7470b1..b7f3694 100644 --- a/src/org/mxchange/jcontactsbusiness/events/headquarter/added/HeadquarterAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/headquarter/added/HeadquarterAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/headquarter/added/ObservableHeadquarterAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/headquarter/added/ObservableHeadquarterAddedEvent.java index 0689a6d..8062d30 100644 --- a/src/org/mxchange/jcontactsbusiness/events/headquarter/added/ObservableHeadquarterAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/headquarter/added/ObservableHeadquarterAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/opening_time/added/ObservableOpeningTimeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/opening_time/added/ObservableOpeningTimeAddedEvent.java index 8d68ca4..1b4155f 100644 --- a/src/org/mxchange/jcontactsbusiness/events/opening_time/added/ObservableOpeningTimeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/opening_time/added/ObservableOpeningTimeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/events/opening_time/added/OpeningTimeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/opening_time/added/OpeningTimeAddedEvent.java index bcdcbc5..ecfc7fd 100644 --- a/src/org/mxchange/jcontactsbusiness/events/opening_time/added/OpeningTimeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/opening_time/added/OpeningTimeAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java index 7c470ac..908d478 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java index 2a661ce..378ec56 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java index 8002fa9..8cdc3b0 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeNotFoundException.java index 83f6158..2063521 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentAlreadyAddedException.java index d0d2165..2b96c64 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentNotFoundException.java index a8c0d11..f999dec 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/department/DepartmentNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeAlreadyAddedException.java index 4366ef4..33d0f92 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java index cf12dcb..ab19291 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterAlreadyAddedException.java index 002142c..efc3229 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterNotFoundException.java index 038d48b..60ed198 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/headquarter/HeadquarterNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/opening_time/OpeningTimeNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/opening_time/OpeningTimeNotFoundException.java index c3c4dd6..73e8506 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/opening_time/OpeningTimeNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/opening_time/OpeningTimeNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java index 19313af..554cb84 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index d00e19c..dd3ab39 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 0bc6e03..e3096c4 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -public interface BranchOffice extends Serializable { +public interface BranchOffice extends Comparable, Serializable { /** * Getter for branch office's city name diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java index a5897c7..284d097 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java index 7935f15..1c32787 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,6 +43,7 @@ import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; +import org.mxchange.jcoreee.utils.StringUtils; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -286,6 +287,60 @@ public class BusinessBranchOffice implements BranchOffice { this.branchHouseNumber = branchHouseNumber; } + @Override + public int compareTo (final BranchOffice branchOffice) { + // For performance reasons + if (Objects.equals(this, branchOffice)) { + // Same object + return 0; + } + + // Init check array (I could repeat myself here, but no) + final int[] comparators = { + // A different branch number is a clear indication ... + // A different branch number is a clear indication ... + // A different branch number is a clear indication ... + // A different branch number is a clear indication ... + Long.compare(this.getBranchNumber(), branchOffice.getBranchNumber()), + // ... same with id ... + Long.compare(this.getBranchId(), branchOffice.getBranchId()), + // ... then country + this.getBranchCountry().compareTo(branchOffice.getBranchCountry()), + // ... next city + this.getBranchCity().compareToIgnoreCase(branchOffice.getBranchCity()), + // ... then ZIP code + this.getBranchZipCode().compareTo(branchOffice.getBranchZipCode()), + // ... and street + this.getBranchStreet().compareToIgnoreCase(branchOffice.getBranchStreet()), + // ... and house number + this.getBranchHouseNumber().compareTo(branchOffice.getBranchHouseNumber()), + // ... and last house number + Short.compare(this.getBranchLastHouseNumber(), branchOffice.getBranchLastHouseNumber()), + StringUtils.comareToIgnoreCase(this.getBranchHouseNumberExtension(), branchOffice.getBranchHouseNumberExtension()), + // ... store ... + Short.compare(this.getBranchStore(), branchOffice.getBranchStore()), + // ... suite number ... + Short.compare(this.getBranchSuiteNumber(), branchOffice.getBranchSuiteNumber()) + }; + + // Loop through all + for (int i = 0; i < comparators.length; i++) { + + // Is it smaller or bigger? + if (comparators[i] < 0) { + return -1; + } else if (comparators[i] > 0) { + return 1; + } + } + + // Verify that compareTo() is constistent with equals() + assert Objects.equals(this, branchOffice) : "compareTo inconsistent with equals()"; //NOI18N + + // Assume euqality + return 0; + } + @Override public boolean equals (final Object object) { if (null == object) { @@ -294,6 +349,7 @@ public class BusinessBranchOffice implements BranchOffice { return false; } + // @todo Maybe a bit unsafe cast? final BranchOffice branchOffice = (BranchOffice) object; if (!Objects.equals(this.getBranchId(), branchOffice.getBranchId())) { diff --git a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java index 9190115..611e0e4 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/department/Department.java b/src/org/mxchange/jcontactsbusiness/model/department/Department.java index 4b1cbe5..eeb9226 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/Department.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/Department.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/department/Departments.java b/src/org/mxchange/jcontactsbusiness/model/department/Departments.java index 479a565..b1664a8 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/Departments.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/Departments.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java index 81f4e41..8e349f6 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java index fd00e56..faac464 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employees.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employees.java index 5d72d78..50fec03 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/Employees.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employees.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarter.java b/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarter.java index 79a579a..92c7535 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarter.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarters.java b/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarters.java index 13b980b..d43189a 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarters.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarter/Headquarters.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Free Software Foundation + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java index e934a00..592d078 100644 --- a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java +++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java index 2fd4d52..e9ee417 100644 --- a/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java +++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java index 7505c32..07604b1 100644 --- a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java +++ b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/logo/Logo.java b/src/org/mxchange/jcontactsbusiness/model/logo/Logo.java index f852c01..dda0532 100644 --- a/src/org/mxchange/jcontactsbusiness/model/logo/Logo.java +++ b/src/org/mxchange/jcontactsbusiness/model/logo/Logo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java b/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java index afefcf1..c9397f5 100644 --- a/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_time/OpeningTime.java b/src/org/mxchange/jcontactsbusiness/model/opening_time/OpeningTime.java index 55e549a..130add0 100644 --- a/src/org/mxchange/jcontactsbusiness/model/opening_time/OpeningTime.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_time/OpeningTime.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_time/dayofweek/DayOfTheWeek.java b/src/org/mxchange/jcontactsbusiness/model/opening_time/dayofweek/DayOfTheWeek.java index 37b4517..9472438 100644 --- a/src/org/mxchange/jcontactsbusiness/model/opening_time/dayofweek/DayOfTheWeek.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_time/dayofweek/DayOfTheWeek.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Free Software Foundation + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- 2.39.5