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

---
 .../auth/engine/core/impl/QAAAttributeImpl.java    | 93 +++++++++++-----------
 1 file changed, 47 insertions(+), 46 deletions(-)

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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
index 46f3bb402..423cf8b25 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
@@ -29,56 +29,57 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class QAAAttributeImpl extends AbstractSAMLObject implements
-	QAAAttribute {
+public class QAAAttributeImpl extends AbstractSAMLObject implements QAAAttribute {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
-    /** The quality authentication assurance level. */
-    private String qaaLevel;
+	private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
+	/** The quality authentication assurance level. */
+	private String qaaLevel;
 
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object
-     * represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected QAAAttributeImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Constructor.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace the element is in
+	 * @param elementLocalName
+	 *            the local name of the XML element this Object represents
+	 * @param namespacePrefix
+	 *            the prefix for the given namespace
+	 */
+	protected QAAAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the quality authentication assurance level.
-     *
-     * @return the quality authentication assurance level
-     */
-    public final String getQaaLevel() {
-	return qaaLevel;
-    }
+	/**
+	 * Gets the quality authentication assurance level.
+	 *
+	 * @return the quality authentication assurance level
+	 */
+	public final String getQaaLevel() {
+		return qaaLevel;
+	}
 
-    /**
-     * Sets the quality authentication assurance level.
-     *
-     * @param newQaaLevel the new quality authentication assurance level
-     */
-    public final void setQaaLevel(final String newQaaLevel) {
-	this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
-    }
+	/**
+	 * Sets the quality authentication assurance level.
+	 *
+	 * @param newQaaLevel
+	 *            the new quality authentication assurance level
+	 */
+	public final void setQaaLevel(final String newQaaLevel) {
+		this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
+	}
 
-    /**
-     * 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

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

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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
index 423cf8b25..e74ce1fec 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
@@ -77,9 +77,4 @@ public class QAAAttributeImpl extends AbstractSAMLObject implements QAAAttribute
 		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