From: Roland Häder <roland@mxchange.org>
Date: Wed, 19 Apr 2017 23:01:22 +0000 (+0200)
Subject: renamed to better names (Observable hints interface)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6490d423cd4f817dff4f2c260ec6e48a4314463;p=jcountry-core.git

renamed to better names (Observable hints interface)

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

diff --git a/src/org/mxchange/jcountry/events/AdminAddedCountryEvent.java b/src/org/mxchange/jcountry/events/AdminAddedCountryEvent.java
index b014c92..b1a4492 100644
--- a/src/org/mxchange/jcountry/events/AdminAddedCountryEvent.java
+++ b/src/org/mxchange/jcountry/events/AdminAddedCountryEvent.java
@@ -16,21 +16,51 @@
  */
 package org.mxchange.jcountry.events;
 
-import java.io.Serializable;
+import java.text.MessageFormat;
 import org.mxchange.jcountry.data.Country;
 
 /**
- * An interface for a country being added by the administrator.
+ * An addedCountry triggered when the administrator adds a new country
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public interface AdminAddedCountryEvent extends Serializable {
+public class AdminAddedCountryEvent implements ObservableAdminAddedCountryEvent {
 
 	/**
-	 * Getter for added country
+	 * Serial number
+	 */
+	private static final long serialVersionUID = 13_856_941_875_871_769L;
+
+	/**
+	 * Added country
+	 */
+	private final Country addedCountry;
+
+	/**
+	 * Constructor with added country
 	 * <p>
-	 * @return Added country
+	 * @param addedCountry Added country
 	 */
-	Country getAddedCountry ();
+	public AdminAddedCountryEvent (final Country addedCountry) {
+		// Is all valid?
+		if (null == addedCountry) {
+			// Throw NPE
+			throw new NullPointerException("addedCountry is null"); //NOI18N
+		} else if (addedCountry.getCountryId() == null) {
+			// And again ...
+			throw new NullPointerException("addedCountry.countryId is null"); //NOI18N
+		} else if (addedCountry.getCountryId() < 1) {
+			// Id is invalid
+			throw new IllegalArgumentException(MessageFormat.format("addedCountry.countryId={0} is not valid.", addedCountry.getCountryId())); //NOI18N
+		}
+
+		// Set country
+		this.addedCountry = addedCountry;
+	}
+
+	@Override
+	public Country getAddedCountry () {
+		return this.addedCountry;
+	}
 
 }
diff --git a/src/org/mxchange/jcountry/events/AdminEventCountryAdded.java b/src/org/mxchange/jcountry/events/AdminEventCountryAdded.java
deleted file mode 100644
index 0ba4657..0000000
--- a/src/org/mxchange/jcountry/events/AdminEventCountryAdded.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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jcountry.events;
-
-import java.text.MessageFormat;
-import org.mxchange.jcountry.data.Country;
-
-/**
- * An addedCountry triggered when the administrator adds a new country
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-public class AdminEventCountryAdded implements AdminAddedCountryEvent {
-
-	/**
-	 * Serial number
-	 */
-	private static final long serialVersionUID = 13_856_941_875_871_769L;
-
-	/**
-	 * Added country
-	 */
-	private final Country addedCountry;
-
-	/**
-	 * Constructor with added country
-	 * <p>
-	 * @param addedCountry Added country
-	 */
-	public AdminEventCountryAdded (final Country addedCountry) {
-		// Is all valid?
-		if (null == addedCountry) {
-			// Throw NPE
-			throw new NullPointerException("addedCountry is null"); //NOI18N
-		} else if (addedCountry.getCountryId() == null) {
-			// And again ...
-			throw new NullPointerException("addedCountry.countryId is null"); //NOI18N
-		} else if (addedCountry.getCountryId() < 1) {
-			// Id is invalid
-			throw new IllegalArgumentException(MessageFormat.format("addedCountry.countryId={0} is not valid.", addedCountry.getCountryId())); //NOI18N
-		}
-
-		// Set country
-		this.addedCountry = addedCountry;
-	}
-
-	@Override
-	public Country getAddedCountry () {
-		return this.addedCountry;
-	}
-
-}
diff --git a/src/org/mxchange/jcountry/events/ObservableAdminAddedCountryEvent.java b/src/org/mxchange/jcountry/events/ObservableAdminAddedCountryEvent.java
new file mode 100644
index 0000000..48ccb4c
--- /dev/null
+++ b/src/org/mxchange/jcountry/events/ObservableAdminAddedCountryEvent.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 <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jcountry.events;
+
+import java.io.Serializable;
+import org.mxchange.jcountry.data.Country;
+
+/**
+ * An interface for a country being added by the administrator.
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+public interface ObservableAdminAddedCountryEvent extends Serializable {
+
+	/**
+	 * Getter for added country
+	 * <p>
+	 * @return Added country
+	 */
+	Country getAddedCountry ();
+
+}