From 592726be30ce2529b740a7530f5fa413fbb1d056 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Apr 2017 01:02:47 +0200 Subject: [PATCH] renamed to better names (Observable hints an interface) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../added/AdminAddedCustomerEvent.java | 58 +++++++++++-- .../added/CustomerAdminAddedEvent.java | 81 ------------------- .../ObservableAdminAddedCustomerEvent.java | 37 +++++++++ .../update/AdminCustomerDataUpdatedEvent.java | 66 --------------- .../update/AdminUpdatedCustomerDataEvent.java | 42 ++++++++-- ...servableAdminUpdatedCustomerDataEvent.java | 36 +++++++++ 6 files changed, 160 insertions(+), 160 deletions(-) delete mode 100644 src/org/mxchange/jcustomercore/events/customer/added/CustomerAdminAddedEvent.java create mode 100644 src/org/mxchange/jcustomercore/events/customer/added/ObservableAdminAddedCustomerEvent.java delete mode 100644 src/org/mxchange/jcustomercore/events/customer/update/AdminCustomerDataUpdatedEvent.java create mode 100644 src/org/mxchange/jcustomercore/events/customer/update/ObservableAdminUpdatedCustomerDataEvent.java diff --git a/src/org/mxchange/jcustomercore/events/customer/added/AdminAddedCustomerEvent.java b/src/org/mxchange/jcustomercore/events/customer/added/AdminAddedCustomerEvent.java index 8b13aa5..bba20a3 100644 --- a/src/org/mxchange/jcustomercore/events/customer/added/AdminAddedCustomerEvent.java +++ b/src/org/mxchange/jcustomercore/events/customer/added/AdminAddedCustomerEvent.java @@ -16,22 +16,66 @@ */ package org.mxchange.jcustomercore.events.customer.added; -import java.io.Serializable; +import java.text.MessageFormat; import org.mxchange.jcustomercore.model.customer.Customer; /** - * An interface for events being fired when an administrator has added a - * customer. + * An event being fired when an administrator has added a new customer *

* @author Roland Häder */ -public interface AdminAddedCustomerEvent extends Serializable { +public class AdminAddedCustomerEvent implements ObservableAdminAddedCustomerEvent { /** - * Getter for added customer instance + * Serial number + */ + private static final long serialVersionUID = 1_782_358_678_347_190L; + + /** + * Added customer + */ + private final Customer addedCustomer; + + /** + * Constructor with valid customer instance being added (updated varriant) *

- * @return Added customer instance + * @param addedCustomer Added customer instance */ - Customer getAddedCustomer (); + public AdminAddedCustomerEvent (final Customer addedCustomer) { + // The instance should be valid + if (null == addedCustomer) { + // Throw NPE + throw new NullPointerException("addedCustomer is null"); //NOI18N + } else if (addedCustomer.getCustomerId() == null) { + // Throw NPE, again ... + throw new NullPointerException("addedCustomer.customerId is null"); //NOI18N + } else if (addedCustomer.getCustomerId() < 1) { + // Not valid + throw new IllegalArgumentException(MessageFormat.format("addedCustomer.customerId={0} is not valid", addedCustomer.getCustomerId())); //NOI18N + } else if (addedCustomer.getCustomerNumber() == null) { + // Throw NPE, again ... + throw new NullPointerException("addedCustomer.customerNumber is null"); //NOI18N + } else if (addedCustomer.getCustomerNumber() == null) { + // Empty customer number + throw new IllegalArgumentException("addedCustomer.customerNumber is empty"); //NOI18N + } else if (addedCustomer.getCustomerContact() == null) { + // Throw again ... + throw new NullPointerException("addedCustomer.customerContact is null"); //NOI18N + } else if (addedCustomer.getCustomerContact().getContactId() == null) { + // ... and again ... + throw new NullPointerException("addedCustomer.customerContact.contactId is null"); //NOI18N + } else if (addedCustomer.getCustomerContact().getContactId() < 1) { + // Not valid + throw new IllegalArgumentException(MessageFormat.format("addedCustomer.customerContact.contactId={0} is not valid", addedCustomer.getCustomerContact().getContactId())); //NOI18N + } + + // Set it here + this.addedCustomer = addedCustomer; + } + + @Override + public Customer getAddedCustomer () { + return this.addedCustomer; + } } diff --git a/src/org/mxchange/jcustomercore/events/customer/added/CustomerAdminAddedEvent.java b/src/org/mxchange/jcustomercore/events/customer/added/CustomerAdminAddedEvent.java deleted file mode 100644 index d1c2e26..0000000 --- a/src/org/mxchange/jcustomercore/events/customer/added/CustomerAdminAddedEvent.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2016 Roland Häder - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcustomercore.events.customer.added; - -import java.text.MessageFormat; -import org.mxchange.jcustomercore.model.customer.Customer; - -/** - * An event being fired when an administrator has added a new customer - *

- * @author Roland Häder - */ -public class CustomerAdminAddedEvent implements AdminAddedCustomerEvent { - - /** - * Serial number - */ - private static final long serialVersionUID = 1_782_358_678_347_190L; - - /** - * Added customer - */ - private final Customer addedCustomer; - - /** - * Constructor with valid customer instance being added (updated varriant) - *

- * @param addedCustomer Added customer instance - */ - public CustomerAdminAddedEvent (final Customer addedCustomer) { - // The instance should be valid - if (null == addedCustomer) { - // Throw NPE - throw new NullPointerException("addedCustomer is null"); //NOI18N - } else if (addedCustomer.getCustomerId() == null) { - // Throw NPE, again ... - throw new NullPointerException("addedCustomer.customerId is null"); //NOI18N - } else if (addedCustomer.getCustomerId() < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("addedCustomer.customerId={0} is not valid", addedCustomer.getCustomerId())); //NOI18N - } else if (addedCustomer.getCustomerNumber() == null) { - // Throw NPE, again ... - throw new NullPointerException("addedCustomer.customerNumber is null"); //NOI18N - } else if (addedCustomer.getCustomerNumber() == null) { - // Empty customer number - throw new IllegalArgumentException("addedCustomer.customerNumber is empty"); //NOI18N - } else if (addedCustomer.getCustomerContact() == null) { - // Throw again ... - throw new NullPointerException("addedCustomer.customerContact is null"); //NOI18N - } else if (addedCustomer.getCustomerContact().getContactId() == null) { - // ... and again ... - throw new NullPointerException("addedCustomer.customerContact.contactId is null"); //NOI18N - } else if (addedCustomer.getCustomerContact().getContactId() < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("addedCustomer.customerContact.contactId={0} is not valid", addedCustomer.getCustomerContact().getContactId())); //NOI18N - } - - // Set it here - this.addedCustomer = addedCustomer; - } - - @Override - public Customer getAddedCustomer () { - return this.addedCustomer; - } - -} diff --git a/src/org/mxchange/jcustomercore/events/customer/added/ObservableAdminAddedCustomerEvent.java b/src/org/mxchange/jcustomercore/events/customer/added/ObservableAdminAddedCustomerEvent.java new file mode 100644 index 0000000..79b254a --- /dev/null +++ b/src/org/mxchange/jcustomercore/events/customer/added/ObservableAdminAddedCustomerEvent.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 Roland Häder + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcustomercore.events.customer.added; + +import java.io.Serializable; +import org.mxchange.jcustomercore.model.customer.Customer; + +/** + * An interface for events being fired when an administrator has added a + * customer. + *

+ * @author Roland Häder + */ +public interface ObservableAdminAddedCustomerEvent extends Serializable { + + /** + * Getter for added customer instance + *

+ * @return Added customer instance + */ + Customer getAddedCustomer (); + +} diff --git a/src/org/mxchange/jcustomercore/events/customer/update/AdminCustomerDataUpdatedEvent.java b/src/org/mxchange/jcustomercore/events/customer/update/AdminCustomerDataUpdatedEvent.java deleted file mode 100644 index 9064c42..0000000 --- a/src/org/mxchange/jcustomercore/events/customer/update/AdminCustomerDataUpdatedEvent.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2016 Roland Häder - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcustomercore.events.customer.update; - -import java.text.MessageFormat; -import org.mxchange.jcustomercore.model.customer.Customer; - -/** - * An event being fired when the administrator has updated customer data - *

- * @author Roland Häder - */ -public class AdminCustomerDataUpdatedEvent implements AdminUpdatedCustomerDataEvent { - - /** - * Serial number - */ - private static final long serialVersionUID = 14_785_787_174_676_290L; - - /** - * Updated customer instance - */ - private final Customer updatedCustomer; - - /** - * Constructor with updated customer instance - *

- * @param updatedCustomer Updated customer instance - */ - public AdminCustomerDataUpdatedEvent (final Customer updatedCustomer) { - // Is the customer instance valid? - if (null == updatedCustomer) { - // Throw NPE - throw new NullPointerException("updatedCustomer is null"); //NOI18N - } else if (updatedCustomer.getCustomerId() == null) { - // Throw NPE again - throw new NullPointerException("updatedCustomer.customerId is null"); //NOI18N - } else if (updatedCustomer.getCustomerId() < 1) { - // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("updatedCustomer.customerId={0} is invalid.", updatedCustomer.getCustomerId())); //NOI18N - } - - // Set it here - this.updatedCustomer = updatedCustomer; - } - - @Override - public Customer getUpdatedCustomer () { - return this.updatedCustomer; - } - -} diff --git a/src/org/mxchange/jcustomercore/events/customer/update/AdminUpdatedCustomerDataEvent.java b/src/org/mxchange/jcustomercore/events/customer/update/AdminUpdatedCustomerDataEvent.java index ba3ac13..c2b437c 100644 --- a/src/org/mxchange/jcustomercore/events/customer/update/AdminUpdatedCustomerDataEvent.java +++ b/src/org/mxchange/jcustomercore/events/customer/update/AdminUpdatedCustomerDataEvent.java @@ -16,21 +16,51 @@ */ package org.mxchange.jcustomercore.events.customer.update; -import java.io.Serializable; +import java.text.MessageFormat; import org.mxchange.jcustomercore.model.customer.Customer; /** - * An interface for events being fired when an administrator updated customer data. + * An event being fired when the administrator has updated customer data *

* @author Roland Häder */ -public interface AdminUpdatedCustomerDataEvent extends Serializable { +public class AdminUpdatedCustomerDataEvent implements ObservableAdminUpdatedCustomerDataEvent { /** - * Getter for updated customer instance + * Serial number + */ + private static final long serialVersionUID = 14_785_787_174_676_290L; + + /** + * Updated customer instance + */ + private final Customer updatedCustomer; + + /** + * Constructor with updated customer instance *

- * @return Added customer instance + * @param updatedCustomer Updated customer instance */ - Customer getUpdatedCustomer (); + public AdminUpdatedCustomerDataEvent (final Customer updatedCustomer) { + // Is the customer instance valid? + if (null == updatedCustomer) { + // Throw NPE + throw new NullPointerException("updatedCustomer is null"); //NOI18N + } else if (updatedCustomer.getCustomerId() == null) { + // Throw NPE again + throw new NullPointerException("updatedCustomer.customerId is null"); //NOI18N + } else if (updatedCustomer.getCustomerId() < 1) { + // Invalid id number + throw new IllegalArgumentException(MessageFormat.format("updatedCustomer.customerId={0} is invalid.", updatedCustomer.getCustomerId())); //NOI18N + } + + // Set it here + this.updatedCustomer = updatedCustomer; + } + + @Override + public Customer getUpdatedCustomer () { + return this.updatedCustomer; + } } diff --git a/src/org/mxchange/jcustomercore/events/customer/update/ObservableAdminUpdatedCustomerDataEvent.java b/src/org/mxchange/jcustomercore/events/customer/update/ObservableAdminUpdatedCustomerDataEvent.java new file mode 100644 index 0000000..ec9cef5 --- /dev/null +++ b/src/org/mxchange/jcustomercore/events/customer/update/ObservableAdminUpdatedCustomerDataEvent.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2016 Roland Häder + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcustomercore.events.customer.update; + +import java.io.Serializable; +import org.mxchange.jcustomercore.model.customer.Customer; + +/** + * An interface for events being fired when an administrator updated customer data. + *

+ * @author Roland Häder + */ +public interface ObservableAdminUpdatedCustomerDataEvent extends Serializable { + + /** + * Getter for updated customer instance + *

+ * @return Added customer instance + */ + Customer getUpdatedCustomer (); + +} -- 2.39.5