From 0ed5db9366541069ac4585c16d57138a9c4deac2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 1 Oct 2014 16:53:55 +0200
Subject: Adapt to changed DB scheme (eppn handling for multiple suffixes)

---
 .../java/org/openslx/imagemaster/session/User.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/session/User.java')

diff --git a/src/main/java/org/openslx/imagemaster/session/User.java b/src/main/java/org/openslx/imagemaster/session/User.java
index 264c17f..bbbe8c7 100644
--- a/src/main/java/org/openslx/imagemaster/session/User.java
+++ b/src/main/java/org/openslx/imagemaster/session/User.java
@@ -7,19 +7,19 @@ package org.openslx.imagemaster.session;
  */
 public abstract class User
 {
-	public final String username, organization;
+	public final String eppn, organizationId;
 	public final String password;
 	public final String firstName, lastName;
 	public final String eMail;
 	public final String satelliteAddress;
 	public final int userId;
 
-	protected User( int userId, String username, String password, String organization, String firstName, String lastName, String eMail,
+	protected User( int userId, String eppn, String password, String organization, String firstName, String lastName, String eMail,
 			String satelliteAddress )
 	{
 		this.userId = userId;
-		this.username = username;
-		this.organization = organization;
+		this.eppn = eppn;
+		this.organizationId = organization;
 		this.password = password;
 		this.firstName = firstName;
 		this.lastName = lastName;
@@ -30,10 +30,10 @@ public abstract class User
 	@Override
 	public String toString()
 	{
-		final StringBuilder sb = new StringBuilder( this.username );
-		sb.append( "@" );
-		sb.append( this.organization );
-		sb.append( ": " );
+		final StringBuilder sb = new StringBuilder( this.eppn );
+		sb.append( " (" );
+		sb.append( this.organizationId );
+		sb.append( "): " );
 		sb.append( this.firstName );
 		sb.append( ' ' );
 		sb.append( this.lastName );
@@ -48,7 +48,7 @@ public abstract class User
 
 	public String getLogin()
 	{
-		return username + "@" + organization;
+		return eppn;
 	}
 
 }
-- 
cgit v1.2.3-55-g7522