From 397af7dbf782e39809b78074699c3a125412e62f Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 2 Oct 2014 18:50:15 +0200 Subject: Implement API methods getPublicImages, getOrganizations --- src/main/java/org/openslx/imagemaster/session/Session.java | 2 +- src/main/java/org/openslx/imagemaster/session/User.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/openslx/imagemaster/session') diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java index 54a2757..f91a3ae 100644 --- a/src/main/java/org/openslx/imagemaster/session/Session.java +++ b/src/main/java/org/openslx/imagemaster/session/Session.java @@ -39,7 +39,7 @@ public class Session public String getLogin() { - return user.eppn; + return user.login; } public String getFirstName() diff --git a/src/main/java/org/openslx/imagemaster/session/User.java b/src/main/java/org/openslx/imagemaster/session/User.java index bbbe8c7..a64ab5b 100644 --- a/src/main/java/org/openslx/imagemaster/session/User.java +++ b/src/main/java/org/openslx/imagemaster/session/User.java @@ -7,18 +7,18 @@ package org.openslx.imagemaster.session; */ public abstract class User { - public final String eppn, organizationId; + public final String login, 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 eppn, String password, String organization, String firstName, String lastName, String eMail, + protected User( int userId, String login, String password, String organization, String firstName, String lastName, String eMail, String satelliteAddress ) { this.userId = userId; - this.eppn = eppn; + this.login = login; this.organizationId = organization; this.password = password; this.firstName = firstName; @@ -30,7 +30,7 @@ public abstract class User @Override public String toString() { - final StringBuilder sb = new StringBuilder( this.eppn ); + final StringBuilder sb = new StringBuilder( this.login ); sb.append( " (" ); sb.append( this.organizationId ); sb.append( "): " ); @@ -48,7 +48,7 @@ public abstract class User public String getLogin() { - return eppn; + return login; } } -- cgit v1.2.3-55-g7522