Continued:

- implemented Comparable interface in BranchOffice as PrimeFaces require this
- updated copyright year

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java
index 693153f1c0a0c1b111d9f23f2727d280a6877728..4bdc2dd321c1f63ededfd82fb04839fd051d4f70 100644 (file)
--- 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 dd1a04142b759f19fe5a80108636d784acf2573a..1551740fdc06b87cead8432c2c1c32ee16c4c15d 100644 (file)
--- 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 02097988a186ff51cd0bd3b587fae8d9cca8a5f4..2f26c5c342f6bcbe05654e7a5da6a7567f1a433a 100644 (file)
--- 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 8ff1b0637661d96df75f843c62f3247bec048d13..71b55f4247b956b1f15add13684673f382e96dc1 100644 (file)
--- 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 e7386a8d11c24ab9191b99227d3af1d76e1e0510..bfd0b54ddaf3bd99d455e590f62a8353f0011446 100644 (file)
--- 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 5d8932497b5a3241017ea84e8f4805696ba421c6..ea7769d485b8efb182332004d537c58c86aff7d9 100644 (file)
--- 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 6ec72aea21015f626df7744a60c3224bd3aa61f3..e1f23db824af4e32a42fb4901393e60acf2ad880 100644 (file)
--- 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 ed930f788e3641237112bb87d3701ca70fa2fc75..f8c7e6d929b768d58b29524feaaf89b909dc0054 100644 (file)
--- 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 c7470b1563bbf77b7cedea986ee5a6143fe348c9..b7f369480015dd4e099f356623d6ddbb3509ec73 100644 (file)
--- 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 0689a6df327bac76beef6b0cdd832cb4d3890b08..8062d30dcd924e1bc0139d70bd4e2c4981e965a9 100644 (file)
--- 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 8d68ca429681143234dee5c4a9602e15542210a5..1b4155fe7e72ecf8473f300e9ab90563a1f963c5 100644 (file)
--- 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 bcdcbc502b8d4e6927856a9e4fe84ba6740a6d10..ecfc7fd01809dab3cabc8d30ada39a8a8d4db9cb 100644 (file)
--- 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 7c470ace2a57188ed2dfcc7916b0c7daa016bb3a..908d478461ffc096c7aad9fa51358bb22749734c 100644 (file)
--- 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 2a661ce55f81424bda02487f1cc9da634329e749..378ec56e4cc6024a4bfe97e53d704870d9b8dc30 100644 (file)
--- 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 8002fa923a1fd920852118f3b5eae455bd915296..8cdc3b014e4b0840bd66645c75c62f95df77301d 100644 (file)
--- 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 83f6158ff76d381e3d05c42410ddd299aa9a7d94..2063521ef0715ddf9bb509ecb935aed0ecf26249 100644 (file)
--- 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 d0d2165a3933892eafb6316aed72f3eaf128e736..2b96c64444af9500a39c0831c43a384033f98bd6 100644 (file)
--- 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 a8c0d11df9e45adf992aaa4d43eca1a7ef04cd6b..f999dec84c984d15c95bdb63916ee2f3764b8f3c 100644 (file)
--- 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 4366ef4a00901e5a3b466b9266ba3289c70382bf..33d0f929277999caf573d9eafca64ae89f552247 100644 (file)
--- 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 cf12dcb5f6f05a44cd90f3acdb57cb8bb8e9b8ce..ab192911bf7e982740f7acfc88792aeb4c71aaeb 100644 (file)
--- 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 002142c6fbd9dbd3cb26a408d79c0dc279028c37..efc3229440a1886819e26c7204b4a9124f2c9ec0 100644 (file)
--- 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 038d48b7fc5d13181973893e5131da2c83d2114a..60ed198d23f26cc672a2dc39c4c59a658bda6758 100644 (file)
--- 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 c3c4dd6e1d3e7a58b05e817c88d4252d74f5e49c..73e850665df496dabdffb58223d30f446acbb290 100644 (file)
--- 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 19313af59b281e062e31a5d70644147033880769..554cb84f394c1d60a5878557499f14e7c10907bc 100644 (file)
--- 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 d00e19cee3facd8098cfc6a841460d0bac0fa662..dd3ab39538058eb694d534b3d1b252212351fa95 100644 (file)
--- 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 0bc6e03c2612f72191fe280248e3a7013ad5b74a..e3096c4c7272f33a03b463ae53eba9394ea9705d 100644 (file)
--- 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;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public interface BranchOffice extends Serializable {
+public interface BranchOffice extends Comparable<BranchOffice>, 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 a5897c7569011190381ecb92391468326b1ed89c..284d0976602eb40cc452990e564c945eb3042c87 100644 (file)
--- 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 7935f157b9e668bc4c8ace6ba9e5b319c8a9f4cd..1c327872d99da89c88415e1214c432dfdbe539e8 100644 (file)
--- 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 9190115d734518f954c3a6c67a2fc9b164adf219..611e0e48642cb8f91d3146e045fad89b803a9a61 100644 (file)
--- 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 4b1cbe55c45102f691c52156d4e319f25bb4cc37..eeb92267b1ce32fe066feca5750750a7998af04d 100644 (file)
--- 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 479a565cc90f6701ffb26ed479420ce570661eaf..b1664a8c79509b01abbb25e1f8fb841fb71e5ba8 100644 (file)
--- 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 81f4e4181d18d03d90d63c19a4376f6d9d2782f6..8e349f6331ad6bc14e343d896c5070d5dfd46d36 100644 (file)
--- 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 fd00e56c9a8a6186b065479cb85e1bd43c5ea23c..faac46437660a934ee187e9dfab93591b526b289 100644 (file)
--- 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 5d72d7829df5afcf7804214d496ac6a8e20f3253..50fec03737e629997def3a34cb691ea41d370298 100644 (file)
--- 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 79a579abbcbc5a692689275058293254f2c7e1f2..92c7535e2f4eb8d292fea947b7a42dcc3b50a4bf 100644 (file)
--- 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 13b980bcd9b1980576b377c5fa12a59ea869e23e..d43189a1bb840584b444d2f84b0f2dea9f523f03 100644 (file)
--- 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 e934a00532db3c322c9ca8239fca2c774f6cd42e..592d0783892e5c4da829939309bc09983a70b8ee 100644 (file)
--- 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 2fd4d5209f0eef9d810c95c5ecf1f91233a40030..e9ee4178bf4852ff7b7e6da638db739ddfe4daed 100644 (file)
--- 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 7505c32e35999d87d9d24902ca546c5590cf1802..07604b1f8b389360024566e00a0d1e33da90e23e 100644 (file)
--- 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 f852c0157c1c7b02045f34c55c26ac28738d5382..dda0532282a1a63199219418f2392ddb1273a16b 100644 (file)
--- 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 afefcf1493e8b28f4d0d756e0f3546dd9df6fad0..c9397f52ffcb2254b1822c2d54e3164c79200a2c 100644 (file)
--- 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 55e549a078e225544e1d6e4820b0a8fd97abf518..130add04419f7997a2f59b37ba49058afdabaa2c 100644 (file)
--- 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 37b4517a0a40e3a0cbb1b10816559f65206ed774..9472438e84bad28de0fedf8e90e67f51f05fdfb7 100644 (file)
--- 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