From dba0324bc2cf517cf1636153ec9246c97cfef09a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 13 Mar 2018 00:58:19 +0100 Subject: [PATCH] Continued: - removed no longer used (please refacture your code) named queries as they were no good idea since there is JCache around. - updated copyright year MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../events/contact/add/AdminAddedContactEvent.java | 2 +- .../contact/add/ObservableAdminAddedContactEvent.java | 2 +- .../events/contact/created/CreatedContactEvent.java | 2 +- .../contact/created/ObservableCreatedContactEvent.java | 2 +- .../events/contact/deleted/AdminDeletedContactEvent.java | 2 +- .../deleted/ObservableAdminDeletedContactEvent.java | 2 +- .../events/contact/update/AdminUpdatedContactEvent.java | 2 +- .../contact/update/ObservableAdminUpdatedContactEvent.java | 2 +- .../events/fax/linked/AdminLinkedFaxNumberEvent.java | 2 +- .../fax/linked/ObservableAdminLinkedFaxNumberEvent.java | 2 +- .../events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java | 2 +- .../unlinked/ObservableAdminUnlinkedFaxNumberEvent.java | 2 +- .../landline/linked/AdminLinkedLandLineNumberEvent.java | 2 +- .../linked/ObservableAdminLinkedLandLineNumberEvent.java | 2 +- .../unlinked/AdminUnlinkedLandLineNumberEvent.java | 2 +- .../ObservableAdminUnlinkedLandLineNumberEvent.java | 2 +- .../events/mobile/linked/AdminLinkedMobileNumberEvent.java | 2 +- .../linked/ObservableAdminLinkedMobileNumberEvent.java | 2 +- .../mobile/unlinked/AdminUnlinkedMobileNumberEvent.java | 2 +- .../unlinked/ObservableAdminUnlinkedMobileNumberEvent.java | 2 +- .../jcontacts/exceptions/ContactAlreadyAddedException.java | 2 +- .../jcontacts/exceptions/ContactNotFoundException.java | 2 +- src/org/mxchange/jcontacts/model/contact/Contact.java | 2 +- src/org/mxchange/jcontacts/model/contact/ContactUtils.java | 2 +- src/org/mxchange/jcontacts/model/contact/UserContact.java | 7 ++----- .../mxchange/jcontacts/model/contact/gender/Gender.java | 2 +- .../jcontacts/model/contact/gender/GenderUtils.java | 2 +- .../jcontacts/model/contact/title/PersonalTitle.java | 2 +- .../mxchange/jcontacts/model/contact/title/TitleUtils.java | 2 +- 29 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java index c15b49c..a414b01 100644 --- a/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.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/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java index 330c291..3957d7e 100644 --- a/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/add/ObservableAdminAddedContactEvent.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/jcontacts/events/contact/created/CreatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java index c92a539..54d8d0e 100644 --- a/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/created/CreatedContactEvent.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/jcontacts/events/contact/created/ObservableCreatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java index 05041e1..44baf43 100644 --- a/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/created/ObservableCreatedContactEvent.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/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java index a799f01..245583c 100644 --- a/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/deleted/AdminDeletedContactEvent.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/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java index 41b4fbd..cb8cfd3 100644 --- a/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/deleted/ObservableAdminDeletedContactEvent.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/jcontacts/events/contact/update/AdminUpdatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java index 2e71db2..bff739b 100644 --- a/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.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/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java index 92851d9..ec10513 100644 --- a/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.java +++ b/src/org/mxchange/jcontacts/events/contact/update/ObservableAdminUpdatedContactEvent.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/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java index 4c20c70..f177ae1 100644 --- a/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/linked/AdminLinkedFaxNumberEvent.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/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java index 05a9720..3085f33 100644 --- a/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/linked/ObservableAdminLinkedFaxNumberEvent.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/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java index adb33ed..daf7838 100644 --- a/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/unlinked/AdminUnlinkedFaxNumberEvent.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/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java b/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java index c845759..994a2a7 100644 --- a/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/fax/unlinked/ObservableAdminUnlinkedFaxNumberEvent.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/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java index b163f8d..b0622d0 100644 --- a/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/linked/AdminLinkedLandLineNumberEvent.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/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java index 4c0fefc..ac91449 100644 --- a/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/linked/ObservableAdminLinkedLandLineNumberEvent.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/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java index 9c7c1c2..de139a2 100644 --- a/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/unlinked/AdminUnlinkedLandLineNumberEvent.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/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java b/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java index 765563a..4603e08 100644 --- a/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/landline/unlinked/ObservableAdminUnlinkedLandLineNumberEvent.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/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java index 2c45b6f..3b0571f 100644 --- a/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/linked/AdminLinkedMobileNumberEvent.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/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java index a77be92..d9d010c 100644 --- a/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/linked/ObservableAdminLinkedMobileNumberEvent.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/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java index 4a0bb10..5fa98ee 100644 --- a/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/unlinked/AdminUnlinkedMobileNumberEvent.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/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java b/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java index b124581..d4172cc 100644 --- a/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.java +++ b/src/org/mxchange/jcontacts/events/mobile/unlinked/ObservableAdminUnlinkedMobileNumberEvent.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/jcontacts/exceptions/ContactAlreadyAddedException.java b/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java index c0686cd..dedaaea 100644 --- a/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.java +++ b/src/org/mxchange/jcontacts/exceptions/ContactAlreadyAddedException.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/jcontacts/exceptions/ContactNotFoundException.java b/src/org/mxchange/jcontacts/exceptions/ContactNotFoundException.java index 5c4f3aa..7a9ddfd 100644 --- a/src/org/mxchange/jcontacts/exceptions/ContactNotFoundException.java +++ b/src/org/mxchange/jcontacts/exceptions/ContactNotFoundException.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/jcontacts/model/contact/Contact.java b/src/org/mxchange/jcontacts/model/contact/Contact.java index a60a591..f82cc43 100644 --- a/src/org/mxchange/jcontacts/model/contact/Contact.java +++ b/src/org/mxchange/jcontacts/model/contact/Contact.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/jcontacts/model/contact/ContactUtils.java b/src/org/mxchange/jcontacts/model/contact/ContactUtils.java index 56d6e7c..d39444c 100644 --- a/src/org/mxchange/jcontacts/model/contact/ContactUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/ContactUtils.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/jcontacts/model/contact/UserContact.java b/src/org/mxchange/jcontacts/model/contact/UserContact.java index e885716..e61d4df 100644 --- a/src/org/mxchange/jcontacts/model/contact/UserContact.java +++ b/src/org/mxchange/jcontacts/model/contact/UserContact.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 @@ -66,10 +66,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; @NamedQueries ( { @NamedQuery (name = "AllContacts", query = "SELECT c FROM contacts AS c ORDER BY c.contactId ASC"), - @NamedQuery (name = "AllContactEmailAddresses", query = "SELECT c.contactEmailAddress FROM contacts AS c ORDER BY c.contactId ASC"), - @NamedQuery (name = "AllContactsByCellphone", query = "SELECT c FROM contacts AS c WHERE c.contactMobileNumber = :mobileNumber ORDER BY c.contactId ASC"), - @NamedQuery (name = "SearchContact", query = "SELECT c FROM contacts AS c WHERE c = :contact"), - @NamedQuery (name = "SearchContactByEmailAddress", query = "SELECT c FROM contacts AS c WHERE LOWER(c.contactEmailAddress) LIKE LOWER(:emailAddress)") + @NamedQuery (name = "SearchContact", query = "SELECT c FROM contacts AS c WHERE c = :contact") } ) @SuppressWarnings ("PersistenceUnitPresent") diff --git a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java b/src/org/mxchange/jcontacts/model/contact/gender/Gender.java index 7bdec12..6bb2e11 100644 --- a/src/org/mxchange/jcontacts/model/contact/gender/Gender.java +++ b/src/org/mxchange/jcontacts/model/contact/gender/Gender.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/jcontacts/model/contact/gender/GenderUtils.java b/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java index dfdc4a5..18bb055 100644 --- a/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/gender/GenderUtils.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/jcontacts/model/contact/title/PersonalTitle.java b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java index 8b093e7..f37c702 100644 --- a/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.java +++ b/src/org/mxchange/jcontacts/model/contact/title/PersonalTitle.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/jcontacts/model/contact/title/TitleUtils.java b/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java index 69ad35b..3525a54 100644 --- a/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.java +++ b/src/org/mxchange/jcontacts/model/contact/title/TitleUtils.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