From f71531346c6be197957311712ba093e024545e37 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 7 Aug 2015 13:24:09 +0200
Subject: preparing the old code for the merge

---
 .../peps/auth/engine/core/impl/SPCountryImpl.java  | 89 +++++++++++-----------
 1 file changed, 46 insertions(+), 43 deletions(-)

(limited to 'id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java')

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
index 40a1ac86a..404a90079 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
@@ -31,52 +31,55 @@ import org.slf4j.LoggerFactory;
  */
 public class SPCountryImpl extends AbstractSAMLObject implements SPCountry {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
-    /** The service provider country. */
-    private String spCountry;
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
+	/** The service provider country. */
+	private String spCountry;
 
-    /**
-     * Instantiates a new service provider country.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPCountryImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Instantiates a new service provider country.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPCountryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the service provider country.
-     *
-     * @return the service provider country
-     */
-    public final String getSPCountry() {
-	return spCountry;
-    }
+	/**
+	 * Gets the service provider country.
+	 *
+	 * @return the service provider country
+	 */
+	public final String getSPCountry() {
+		return spCountry;
+	}
 
-    /**
-     * Sets the service provider country.
-     *
-     * @param newSpCountry the new service provider country
-     */
-    public final void setSPCountry(final String newSpCountry) {
-	this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
-    }
+	/**
+	 * Sets the service provider country.
+	 *
+	 * @param newSpCountry
+	 *            the new service provider country
+	 */
+	public final void setSPCountry(final String newSpCountry) {
+		this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
+	@Override
+	public int hashCode() {
+		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
+		return super.hashCode();
+	}
 }
-- 
cgit v1.2.3


From 496ba9bb6e150ad67c5c628c1c97f30d6da81dfb Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 10 Aug 2015 16:35:14 +0200
Subject: approved changes

---
 .../main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java')

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
index 404a90079..ea9085867 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
@@ -77,9 +77,4 @@ public class SPCountryImpl extends AbstractSAMLObject implements SPCountry {
 		return null;
 	}
 
-	@Override
-	public int hashCode() {
-		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-		return super.hashCode();
-	}
 }
-- 
cgit v1.2.3