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

---
 .../engine/core/impl/EIDCrossSectorShareImpl.java  | 95 +++++++++++-----------
 1 file changed, 46 insertions(+), 49 deletions(-)

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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
index 7b2ad3dbd..f2762e327 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
@@ -25,65 +25,62 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * The Class EIDCrossSectorShareImpl.
  * 
  * @author fjquevedo
  */
-public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements
-	EIDCrossSectorShare {
+public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements EIDCrossSectorShare {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
+	private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
 	/** The citizen country code. */
-    private String eIDCrossSectorShare;
+	private String eIDCrossSectorShare;
 
+	/**
+	 * Instantiates a new eID cross sector share implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected EIDCrossSectorShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Instantiates a new eID cross sector share implementation.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected EIDCrossSectorShareImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-    
-  
-    /**
-     * Gets the eID cross sector share.
-     *
-     * @return the eID cross sector share
-     */
-    public final String getEIDCrossSectorShare() {
-    	return eIDCrossSectorShare;
-    }
+	/**
+	 * Gets the eID cross sector share.
+	 *
+	 * @return the eID cross sector share
+	 */
+	public final String getEIDCrossSectorShare() {
+		return eIDCrossSectorShare;
+	}
 
+	/**
+	 * Sets the eID cross sector share.
+	 *
+	 * @param newEIDCrossSectorShare
+	 *            the new eID cross sector share
+	 */
+	public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
+		this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
+	}
 
-    /**
-     * Sets the eID cross sector share.
-     *
-     * @param newEIDCrossSectorShare the new eID cross sector share
-     */
-    public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
-    	this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
-    }
-    
-    /**
-     * 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();
+	}
 }
\ No newline at end of file
-- 
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

---
 .../stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
index f2762e327..2e3f6ab7e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
@@ -78,9 +78,4 @@ public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements EIDCr
 		return null;
 	}
 
-	@Override
-	public int hashCode() {
-		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-		return super.hashCode();
-	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3