Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2011-05-24 22:43:30 +0000
committerRyan D. Brooks2011-05-24 22:43:30 +0000
commitf28113b5cd91d824b975255c6ca0cd51bb1b84ee (patch)
tree6b37e929e8a54858c272bbc70e9cad8e6b7004a8 /plugins/org.eclipse.osee.framework.core.client
parentec251295444641a088d3acc3622d9a2c0fe10fb0 (diff)
downloadorg.eclipse.osee-f28113b5cd91d824b975255c6ca0cd51bb1b84ee.tar.gz
org.eclipse.osee-f28113b5cd91d824b975255c6ca0cd51bb1b84ee.tar.xz
org.eclipse.osee-f28113b5cd91d824b975255c6ca0cd51bb1b84ee.zip
refactor: Create IBasicUser and UserToken
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.client')
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/ClientSessionManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/GuestCredentialProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/ClientSessionManager.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/ClientSessionManager.java
index 80078f11fd8..46b5f166f5d 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/ClientSessionManager.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/ClientSessionManager.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.client;
import java.util.List;
import org.eclipse.osee.framework.core.client.internal.InternalClientSessionManager;
-import org.eclipse.osee.framework.core.data.IOseeUser;
+import org.eclipse.osee.framework.core.data.IUserToken;
import org.eclipse.osee.framework.core.data.OseeSessionGrant;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
@@ -60,8 +60,8 @@ public class ClientSessionManager {
getSessionGrant().setCreationRequired(false);
}
- public static IOseeUser getCurrentUserInfo() throws OseeAuthenticationRequiredException {
- return getSessionGrant().getOseeUserInfo();
+ public static IUserToken getCurrentUserToken() throws OseeAuthenticationRequiredException {
+ return getSessionGrant().getUserToken();
}
public static String getSessionId() throws OseeAuthenticationRequiredException {
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/GuestCredentialProvider.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/GuestCredentialProvider.java
index c906411245b..1cccf1c0c42 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/GuestCredentialProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/GuestCredentialProvider.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.core.client;
import org.eclipse.osee.framework.core.data.OseeCredential;
-import org.eclipse.osee.framework.core.data.SystemUser;
+import org.eclipse.osee.framework.core.enums.SystemUser;
/**
* @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
index 0fb3b76d8d1..77654432361 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
@@ -110,7 +110,7 @@ public class InternalClientSessionManager {
oseeSessionGrant = internalAcquireSession(credential);
oseeSession =
new OseeClientSession(oseeSessionGrant.getSessionId(), clientInfo.getClientMachineName(),
- oseeSessionGrant.getOseeUserInfo().getUserID(), clientInfo.getClientAddress(), clientInfo.getPort(),
+ oseeSessionGrant.getUserToken().getUserId(), clientInfo.getClientAddress(), clientInfo.getPort(),
clientInfo.getVersion(), credential.getAuthenticationProtocol());
} catch (Exception ex) {
OseeLog.reportStatus(new BaseStatus(STATUS_ID, Level.SEVERE, ex));

Back to the top