From: Roland Haeder <roland@mxchange.org>
Date: Thu, 15 Oct 2015 17:22:22 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ecf20b30f296a02457aad870218bfc412c31f6c1;p=addressbook-lib.git

Continued:
- moved event classes to better location
- updated jar(s)
---

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 0a7e08c..9492047 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/src/org/mxchange/addressbook/events/AddressbookLoadedEvent.java b/src/org/mxchange/addressbook/events/AddressbookLoadedEvent.java
deleted file mode 100644
index 69811f9..0000000
--- a/src/org/mxchange/addressbook/events/AddressbookLoadedEvent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events;
-
-import java.io.Serializable;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-
-/**
- * An interface for an event if an address book has been loaded
- * <p>
- * @author Roland Haeder
- */
-public interface AddressbookLoadedEvent extends Serializable {
-
-	/**
-	 * Getter for address book instance
-	 * <p>
-	 * @return Address book instance
-	 */
-	public Addressbook getAddressbook ();
-}
diff --git a/src/org/mxchange/addressbook/events/LoadedAddressbookEvent.java b/src/org/mxchange/addressbook/events/LoadedAddressbookEvent.java
deleted file mode 100644
index 733cde7..0000000
--- a/src/org/mxchange/addressbook/events/LoadedAddressbookEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.events;
-
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-
-/**
- * An event fired when an address book has been loaded
- * <p>
- * @author Roland Haeder
- */
-public class LoadedAddressbookEvent implements AddressbookLoadedEvent {
-
-	/**
-	 * Serial number
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Adress book instance causing this event
-	 */
-	private final Addressbook addressbook;
-
-	/**
-	 * Constructor with address book instance
-	 * <p>
-	 * @param addressbook Address book instance
-	 */
-	public LoadedAddressbookEvent (final Addressbook addressbook) {
-		this.addressbook = addressbook;
-	}
-
-	@Override
-	public Addressbook getAddressbook () {
-		return this.addressbook;
-	}
-}
diff --git a/src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java b/src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java
new file mode 100644
index 0000000..c44b4dd
--- /dev/null
+++ b/src/org/mxchange/addressbook/events/addressbook/AddressbookLoadedEvent.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2015 Roland Haeder
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.addressbook.events.addressbook;
+
+import java.io.Serializable;
+import org.mxchange.addressbook.model.addressbook.Addressbook;
+
+/**
+ * An interface for an event if an address book has been loaded
+ * <p>
+ * @author Roland Haeder
+ */
+public interface AddressbookLoadedEvent extends Serializable {
+
+	/**
+	 * Getter for address book instance
+	 * <p>
+	 * @return Address book instance
+	 */
+	public Addressbook getAddressbook ();
+}
diff --git a/src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java b/src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java
new file mode 100644
index 0000000..80aed20
--- /dev/null
+++ b/src/org/mxchange/addressbook/events/addressbook/LoadedAddressbookEvent.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Roland Haeder
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.addressbook.events.addressbook;
+
+import org.mxchange.addressbook.model.addressbook.Addressbook;
+
+/**
+ * An event fired when an address book has been loaded
+ * <p>
+ * @author Roland Haeder
+ */
+public class LoadedAddressbookEvent implements AddressbookLoadedEvent {
+
+	/**
+	 * Serial number
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Adress book instance causing this event
+	 */
+	private final Addressbook addressbook;
+
+	/**
+	 * Constructor with address book instance
+	 * <p>
+	 * @param addressbook Address book instance
+	 */
+	public LoadedAddressbookEvent (final Addressbook addressbook) {
+		this.addressbook = addressbook;
+	}
+
+	@Override
+	public Addressbook getAddressbook () {
+		return this.addressbook;
+	}
+}
diff --git a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
index b9face6..0237bfa 100644
--- a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
+++ b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
@@ -26,8 +26,8 @@ import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.ValidatorException;
 import javax.inject.Inject;
-import org.mxchange.addressbook.events.AddressbookLoadedEvent;
-import org.mxchange.addressbook.events.LoadedAddressbookEvent;
+import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent;
+import org.mxchange.addressbook.events.addressbook.LoadedAddressbookEvent;
 import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
 import org.mxchange.addressbook.model.addressbook.Addressbook;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;