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

---
 .../eu/stork/peps/auth/commons/AttributeName.java  | 128 +++++++++++----------
 1 file changed, 66 insertions(+), 62 deletions(-)

(limited to 'id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java')

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
index a44768c7e..f47cca6be 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
@@ -8,67 +8,71 @@ package eu.stork.peps.auth.commons;
  * @version $Revision: 1.00 $, $Date: 2013-11-26 $
  */
 public final class AttributeName {
-  
-  /**
-   * Attribute Id.
-   */
-  private String attributeId;
-  
-  /**
-   * Attribute Name.
-   */
-  private String attributeName;
 
-  /**
-   * Attribute Name Constructor.
-   * 
-   * @param aId Id of the Attribute Name.
-   * @param aName Name of the Attribute Name.
-   */
-  public AttributeName(final String aId, final String aName) {
-    
-    this.attributeId = aId;
-    this.attributeName = aName;
-  }
-  
-  /**
-   * Getter for the attributeId value.
-   * 
-   * @return The attributeId value.
-   */
-  public String getAttributeId() {
-    
-    return attributeId;
-  }
-  
-  /**
-   * Setter for the attributeId value.
-   * 
-   * @param aId Id of the Attribute Name.
-   */
-  public void setAttributeId(final String aId) {
-    
-    this.attributeId = aId;
-  }
-  
-  /**
-   * Getter for the attributeName value.
-   * 
-   * @return The attributeName value.
-   */
-  public String getAttributeName() {
-    
-    return attributeName;
-  }
-  
-  /**
-   * Setter for the attributeName value.
-   * 
-   * @param name Name of the Attribute Name.
-   */
-  public void setAttributeName(final String name) {
-    
-    this.attributeName = name;
-  }
-  
+	/**
+	 * Attribute Id.
+	 */
+	private String attributeId;
+
+	/**
+	 * Attribute Name.
+	 */
+	private String attributeName;
+
+	/**
+	 * Attribute Name Constructor.
+	 * 
+	 * @param aId
+	 *            Id of the Attribute Name.
+	 * @param aName
+	 *            Name of the Attribute Name.
+	 */
+	public AttributeName(final String aId, final String aName) {
+
+		this.attributeId = aId;
+		this.attributeName = aName;
+	}
+
+	/**
+	 * Getter for the attributeId value.
+	 * 
+	 * @return The attributeId value.
+	 */
+	public String getAttributeId() {
+
+		return attributeId;
+	}
+
+	/**
+	 * Setter for the attributeId value.
+	 * 
+	 * @param aId
+	 *            Id of the Attribute Name.
+	 */
+	public void setAttributeId(final String aId) {
+
+		this.attributeId = aId;
+	}
+
+	/**
+	 * Getter for the attributeName value.
+	 * 
+	 * @return The attributeName value.
+	 */
+	public String getAttributeName() {
+
+		return attributeName;
+	}
+
+	/**
+	 * Setter for the attributeName value.
+	 * 
+	 * @param name
+	 *            Name of the Attribute Name.
+	 */
+	public void setAttributeName(final String name) {
+
+		this.attributeName = name;
+	}
+
 }
\ 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

---
 .../main/java/eu/stork/peps/auth/commons/AttributeName.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java')

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
index f47cca6be..28115ae62 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
@@ -1,13 +1,20 @@
 package eu.stork.peps.auth.commons;
 
+import java.io.Serializable;
+
 /**
  * This class is a bean used to store information relative to Attribute Names.
- * 
+ *
  * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)
  *
  * @version $Revision: 1.00 $, $Date: 2013-11-26 $
  */
-public final class AttributeName {
+public final class AttributeName implements Serializable {
+
+	/**
+     *
+     */
+	private static final long serialVersionUID = -3537736618869722308L;
 
 	/**
 	 * Attribute Id.
-- 
cgit v1.2.3