From: Roland Haeder <roland@mxchange.org>
Date: Sat, 20 Feb 2016 19:01:35 +0000 (+0100)
Subject: resorted members + added this.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f92f5d642873ec69d9fd6bf4ed7e0df6a18229db;p=jphone-core.git

resorted members + added this.
---

diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 52485d7..2dd9d20 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -48,6 +48,20 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	 */
 	private static final long serialVersionUID = 18_563_748_781_956L;
 
+	/**
+	 * Area code (example: 2151 for Krefeld)
+	 */
+	@Basic (optional = false)
+	@Column (name = "phone_area_code", length = 10, nullable = false)
+	private Integer phoneAreaCode;
+
+	/**
+	 * Connection to table "country_data"
+	 */
+	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
+	private Country phoneCountry;
+
 	/**
 	 * Timestamp when this entry has been created
 	 */
@@ -71,20 +85,6 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	@Column (name = "phone_number", length = 20, nullable = false)
 	private Long phoneNumber;
 
-	/**
-	 * Area code (example: 2151 for Krefeld)
-	 */
-	@Basic (optional = false)
-	@Column (name = "phone_area_code", length = 10, nullable = false)
-	private Integer phoneAreaCode;
-
-	/**
-	 * Connection to table "country_data"
-	 */
-	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
-	private Country phoneCountry;
-
 	/**
 	 * Counstructor with country instance, area code and number
 	 * <p>
@@ -107,23 +107,38 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	}
 
 	@Override
-	public Long getPhoneId () {
-		return this.phoneId;
+	public int compareTo (final DialableLandLineNumber dialableNumber) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 
 	@Override
-	public void setPhoneId (final Long phoneId) {
-		this.phoneId = phoneId;
-	}
+	public boolean equals (Object object) {
+		if (object == null) {
+			return false;
+		} else if (this.getClass() != object.getClass()) {
+			return false;
+		}
 
-	@Override
-	public Long getPhoneNumber () {
-		return this.phoneNumber;
+		final DialableLandLineNumber other = (DialableLandLineNumber) object;
+
+		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneCountry(), other.getPhoneCountry())) {
+			return false;
+		}
+
+		return true;
 	}
 
 	@Override
-	public void setPhoneNumber (final Long phoneNumber) {
-		this.phoneNumber = phoneNumber;
+	public int hashCode () {
+		int hash = 7;
+		hash = 47 * hash + Objects.hashCode(this.getPhoneNumber());
+		hash = 47 * hash + Objects.hashCode(this.getPhoneAreaCode());
+		hash = 47 * hash + Objects.hashCode(this.getPhoneCountry());
+		return hash;
 	}
 
 	@Override
@@ -157,37 +172,21 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	}
 
 	@Override
-	public int compareTo (final DialableLandLineNumber dialableNumber) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	public Long getPhoneId () {
+		return this.phoneId;
 	}
 
 	@Override
-	public boolean equals (Object object) {
-		if (object == null) {
-			return false;
-		} else if (getClass() != object.getClass()) {
-			return false;
-		}
-
-		final DialableLandLineNumber other = (DialableLandLineNumber) object;
-
-		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
-			return false;
-		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
-			return false;
-		} else if (!Objects.equals(this.getPhoneCountry(), other.getPhoneCountry())) {
-			return false;
-		}
-
-		return true;
+	public void setPhoneId (final Long phoneId) {
+		this.phoneId = phoneId;
 	}
-
 	@Override
-	public int hashCode () {
-		int hash = 7;
-		hash = 47 * hash + Objects.hashCode(this.getPhoneNumber());
-		hash = 47 * hash + Objects.hashCode(this.getPhoneAreaCode());
-		hash = 47 * hash + Objects.hashCode(this.getPhoneCountry());
-		return hash;
+	public Long getPhoneNumber () {
+		return this.phoneNumber;
+	}
+	@Override
+	public void setPhoneNumber (final Long phoneNumber) {
+		this.phoneNumber = phoneNumber;
 	}
+
 }