Continued (similar to juser-core):

- moved added-contact event to own package
- added updated-contact event

diff --git a/src/org/mxchange/jcontacts/events/contact/AdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/AdminAddedContactEvent.java
deleted file mode 100644 (file)
index 2cbedf0..0000000
--- a/src/org/mxchange/jcontacts/events/contact/AdminAddedContactEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jcontacts.events.contact;\r
-\r
-import java.io.Serializable;\r
-import org.mxchange.jcontacts.contact.Contact;\r
-\r
-/**\r
- * An interface for events being fired when an administrator added a new user\r
- * account.\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public interface AdminAddedContactEvent extends Serializable {\r
-\r
-       /**\r
-        * Getter for added contact instance\r
-        * <p>\r
-        * @return Added contact instance\r
-        */\r
-       Contact getAddedContact ();\r
-\r
-}\r

diff --git a/src/org/mxchange/jcontacts/events/contact/AdminContactAddedEvent.java b/src/org/mxchange/jcontacts/events/contact/AdminContactAddedEvent.java
deleted file mode 100644 (file)
index c52e8bb..0000000
--- a/src/org/mxchange/jcontacts/events/contact/AdminContactAddedEvent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*\r
- * Copyright (C) 2016 Roland Haeder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jcontacts.events.contact;\r
-\r
-import java.text.MessageFormat;\r
-import org.mxchange.jcontacts.contact.Contact;\r
-\r
-/**\r
- * An event being fired when the administrator has added a new user account\r
- * <p>\r
- * @author Roland Haeder<roland@mxchange.org>\r
- */\r
-public class AdminContactAddedEvent implements AdminAddedContactEvent {\r
-\r
-       /**\r
-        * Serial number\r
-        */\r
-       private static final long serialVersionUID = 14_785_787_174_676_290L;\r
-\r
-       /**\r
-        * Added contact instance\r
-        */\r
-       private final Contact addedContact;\r
-\r
-       /**\r
-        * Constructor with added contact instance\r
-        * <p>\r
-        * @param addedContact Added contact instance\r
-        */\r
-       public AdminContactAddedEvent (final Contact addedContact) {\r
-               // Is the contact instance valid?\r
-               if (null == addedContact) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("addedContact is null"); //NOI18N\r
-               } else if (addedContact.getContactId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("addedContact.contactId is null"); //NOI18N\r
-               } else if (addedContact.getContactId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("addedContact.contactId={0} is invalid.", addedContact.getContactId())); //NOI18N\r
-               }\r
-\r
-               // Set it here\r
-               this.addedContact = addedContact;\r
-       }\r
-\r
-       @Override\r
-       public Contact getAddedContact () {\r
-               return this.addedContact;\r
-       }\r
-\r
-}\r

diff --git a/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java
new file mode 100644 (file)
index 0000000..b34bafa
--- /dev/null
+++ b/src/org/mxchange/jcontacts/events/contact/add/AdminAddedContactEvent.java
@@ -0,0 +1,37 @@
+/*\r
+ * Copyright (C) 2016 Roland Haeder\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.jcontacts.events.contact.add;\r
+\r
+import java.io.Serializable;\r
+import org.mxchange.jcontacts.contact.Contact;\r
+\r
+/**\r
+ * An interface for events being fired when an administrator added a new user\r
+ * account.\r
+ * <p>\r
+ * @author Roland Haeder<roland@mxchange.org>\r
+ */\r
+public interface AdminAddedContactEvent extends Serializable {\r
+\r
+       /**\r
+        * Getter for added contact instance\r
+        * <p>\r
+        * @return Added contact instance\r
+        */\r
+       Contact getAddedContact ();\r
+\r
+}\r

diff --git a/src/org/mxchange/jcontacts/events/contact/add/AdminContactAddedEvent.java b/src/org/mxchange/jcontacts/events/contact/add/AdminContactAddedEvent.java
new file mode 100644 (file)
index 0000000..bb7d004
--- /dev/null
+++ b/src/org/mxchange/jcontacts/events/contact/add/AdminContactAddedEvent.java
@@ -0,0 +1,66 @@
+/*\r
+ * Copyright (C) 2016 Roland Haeder\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.jcontacts.events.contact.add;\r
+\r
+import java.text.MessageFormat;\r
+import org.mxchange.jcontacts.contact.Contact;\r
+\r
+/**\r
+ * An event being fired when the administrator has added a new user account\r
+ * <p>\r
+ * @author Roland Haeder<roland@mxchange.org>\r
+ */\r
+public class AdminContactAddedEvent implements AdminAddedContactEvent {\r
+\r
+       /**\r
+        * Serial number\r
+        */\r
+       private static final long serialVersionUID = 14_785_787_174_676_290L;\r
+\r
+       /**\r
+        * Added contact instance\r
+        */\r
+       private final Contact addedContact;\r
+\r
+       /**\r
+        * Constructor with added contact instance\r
+        * <p>\r
+        * @param addedContact Added contact instance\r
+        */\r
+       public AdminContactAddedEvent (final Contact addedContact) {\r
+               // Is the contact instance valid?\r
+               if (null == addedContact) {\r
+                       // Throw NPE\r
+                       throw new NullPointerException("addedContact is null"); //NOI18N\r
+               } else if (addedContact.getContactId() == null) {\r
+                       // Throw NPE again\r
+                       throw new NullPointerException("addedContact.contactId is null"); //NOI18N\r
+               } else if (addedContact.getContactId() < 1) {\r
+                       // Invalid id number\r
+                       throw new IllegalArgumentException(MessageFormat.format("addedContact.contactId={0} is invalid.", addedContact.getContactId())); //NOI18N\r
+               }\r
+\r
+               // Set it here\r
+               this.addedContact = addedContact;\r
+       }\r
+\r
+       @Override\r
+       public Contact getAddedContact () {\r
+               return this.addedContact;\r
+       }\r
+\r
+}\r

diff --git a/src/org/mxchange/jcontacts/events/contact/update/AdminContactUpdatedEvent.java b/src/org/mxchange/jcontacts/events/contact/update/AdminContactUpdatedEvent.java
new file mode 100644 (file)
index 0000000..fcaac04
--- /dev/null
+++ b/src/org/mxchange/jcontacts/events/contact/update/AdminContactUpdatedEvent.java
@@ -0,0 +1,66 @@
+/*\r
+ * Copyright (C) 2016 Roland Haeder\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.jcontacts.events.contact.update;\r
+\r
+import java.text.MessageFormat;\r
+import org.mxchange.jcontacts.contact.Contact;\r
+\r
+/**\r
+ * An event being fired when the administrator has updated a new user account\r
+ * <p>\r
+ * @author Roland Haeder<roland@mxchange.org>\r
+ */\r
+public class AdminContactUpdatedEvent implements AdminUpdatedContactEvent {\r
+\r
+       /**\r
+        * Serial number\r
+        */\r
+       private static final long serialVersionUID = 185_381_945_234_802L;\r
+\r
+       /**\r
+        * Updated contact instance\r
+        */\r
+       private final Contact updatedContact;\r
+\r
+       /**\r
+        * Constructor with updated contact instance\r
+        * <p>\r
+        * @param updatedContact Updated contact instance\r
+        */\r
+       public AdminContactUpdatedEvent (final Contact updatedContact) {\r
+               // Is the contact instance valid?\r
+               if (null == updatedContact) {\r
+                       // Throw NPE\r
+                       throw new NullPointerException("updatedContact is null"); //NOI18N\r
+               } else if (updatedContact.getContactId() == null) {\r
+                       // Throw NPE again\r
+                       throw new NullPointerException("updatedContact.contactId is null"); //NOI18N\r
+               } else if (updatedContact.getContactId() < 1) {\r
+                       // Invalid id number\r
+                       throw new IllegalArgumentException(MessageFormat.format("updatedContact.contactId={0} is invalid.", updatedContact.getContactId())); //NOI18N\r
+               }\r
+\r
+               // Set it here\r
+               this.updatedContact = updatedContact;\r
+       }\r
+\r
+       @Override\r
+       public Contact getUpdatedContact () {\r
+               return this.updatedContact;\r
+       }\r
+\r
+}\r

diff --git a/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java
new file mode 100644 (file)
index 0000000..5a0d5a1
--- /dev/null
+++ b/src/org/mxchange/jcontacts/events/contact/update/AdminUpdatedContactEvent.java
@@ -0,0 +1,37 @@
+/*\r
+ * Copyright (C) 2016 Roland Haeder\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.jcontacts.events.contact.update;\r
+\r
+import java.io.Serializable;\r
+import org.mxchange.jcontacts.contact.Contact;\r
+\r
+/**\r
+ * An interface for events being fired when an administrator updated a new user\r
+ * account.\r
+ * <p>\r
+ * @author Roland Haeder<roland@mxchange.org>\r
+ */\r
+public interface AdminUpdatedContactEvent extends Serializable {\r
+\r
+       /**\r
+        * Getter for updated contact instance\r
+        * <p>\r
+        * @return Updated contact instance\r
+        */\r
+       Contact getUpdatedContact ();\r
+\r
+}\r