From c3c831772c3d6533d69119c4040aec56ce8e1af0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 20 Jun 2016 10:53:23 +0200
Subject: [PATCH] closed internal todo: renamed to naming convention
 (camelCase)

---
 src/org/mxchange/jcountry/data/Country.java     |  4 ++--
 src/org/mxchange/jcountry/data/CountryData.java | 17 ++++++++---------
 .../CountryAlreadyAddedException.java           |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/org/mxchange/jcountry/data/Country.java b/src/org/mxchange/jcountry/data/Country.java
index 90b46cb..52380f2 100644
--- a/src/org/mxchange/jcountry/data/Country.java
+++ b/src/org/mxchange/jcountry/data/Country.java
@@ -101,14 +101,14 @@ public interface Country extends Serializable {
 	 * <p>
 	 * @return i18n key for country name
 	 */
-	String getCountryI18nkey ();
+	String getCountryI18nKey ();
 
 	/**
 	 * Setter for i18n key for country name
 	 * <p>
 	 * @param countryI18nKey i18n key for country name
 	 */
-	void setCountryI18nkey (final String countryI18nKey);
+	void setCountryI18nKey (final String countryI18nKey);
 
 	/**
 	 * Getter for whether the local dial prefix is required for local calls
diff --git a/src/org/mxchange/jcountry/data/CountryData.java b/src/org/mxchange/jcountry/data/CountryData.java
index 216b9c3..74a45de 100644
--- a/src/org/mxchange/jcountry/data/CountryData.java
+++ b/src/org/mxchange/jcountry/data/CountryData.java
@@ -41,7 +41,7 @@ import javax.persistence.Transient;
 @NamedQueries (
 		{
 			@NamedQuery (name = "AllCountries", query = "SELECT c FROM country_data AS c ORDER BY c.countryId ASC"),
-			@NamedQuery (name = "SearchCountryByCodeI18nKey", query = "SELECT c FROM country_data AS c WHERE c.countryCode = :code OR c.countryI18nkey = :key")
+			@NamedQuery (name = "SearchCountryByCodeI18nKey", query = "SELECT c FROM country_data AS c WHERE c.countryCode = :code OR c.countryI18nKey = :key")
 		}
 )
 @SuppressWarnings ("PersistenceUnitPresent")
@@ -87,11 +87,10 @@ public class CountryData implements Country {
 
 	/**
 	 * Key to i18n key (to have translated country names)
-	 * @TODO Apply naming convention: camel case
 	 */
 	@Basic (optional = false)
 	@Column (name = "country_i18n_key", length = 100, nullable = false)
-	private String countryI18nkey;
+	private String countryI18nKey;
 
 	/**
 	 * Id number
@@ -131,7 +130,7 @@ public class CountryData implements Country {
 
 		if (!Objects.equals(this.getCountryCode(), other.getCountryCode())) {
 			return false;
-		} else if (!Objects.equals(this.getCountryI18nkey(), other.getCountryI18nkey())) {
+		} else if (!Objects.equals(this.getCountryI18nKey(), other.getCountryI18nKey())) {
 			return false;
 		} else if (!Objects.equals(this.getCountryId(), other.getCountryId())) {
 			return false;
@@ -144,7 +143,7 @@ public class CountryData implements Country {
 	public int hashCode () {
 		int hash = 7;
 		hash = 41 * hash + Objects.hashCode(this.getCountryCode());
-		hash = 41 * hash + Objects.hashCode(this.getCountryI18nkey());
+		hash = 41 * hash + Objects.hashCode(this.getCountryI18nKey());
 		hash = 41 * hash + Objects.hashCode(this.getCountryId());
 		return hash;
 	}
@@ -192,13 +191,13 @@ public class CountryData implements Country {
 	}
 
 	@Override
-	public String getCountryI18nkey () {
-		return this.countryI18nkey;
+	public String getCountryI18nKey () {
+		return this.countryI18nKey;
 	}
 
 	@Override
-	public void setCountryI18nkey (final String countryI18nkey) {
-		this.countryI18nkey = countryI18nkey;
+	public void setCountryI18nKey (final String countryI18nKey) {
+		this.countryI18nKey = countryI18nKey;
 	}
 
 	@Override
diff --git a/src/org/mxchange/jcountry/exceptions/CountryAlreadyAddedException.java b/src/org/mxchange/jcountry/exceptions/CountryAlreadyAddedException.java
index 1cb74d7..acbb78d 100644
--- a/src/org/mxchange/jcountry/exceptions/CountryAlreadyAddedException.java
+++ b/src/org/mxchange/jcountry/exceptions/CountryAlreadyAddedException.java
@@ -39,7 +39,7 @@ public class CountryAlreadyAddedException extends Exception {
 	 */
 	public CountryAlreadyAddedException (final Country country) {
 		// Call super constructor
-		super(MessageFormat.format("Country with code {0} or i18n key {1} has already been added.", country.getCountryCode(), country.getCountryI18nkey()));
+		super(MessageFormat.format("Country with code {0} or i18n key {1} has already been added.", country.getCountryCode(), country.getCountryI18nKey()));
 	}
 
 }
-- 
2.39.5