Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-08-01 12:21:05 -0400
committerdonald.g.dunne2017-08-01 12:21:05 -0400
commitc5b472372637010c432efe65b5e5fbd2f8261f4d (patch)
treeff325aade3a464271703bb5600d49ada531d43b5
parentabe8259378e01848fd492bc1d432ff3c7f66f3bc (diff)
downloadorg.eclipse.osee-c5b472372637010c432efe65b5e5fbd2f8261f4d.tar.gz
org.eclipse.osee-c5b472372637010c432efe65b5e5fbd2f8261f4d.tar.xz
org.eclipse.osee-c5b472372637010c432efe65b5e5fbd2f8261f4d.zip
bug: fix ATS Admin serialization
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java5
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserServiceClientImpl.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
index 80079949e2..c3e6b4b06c 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/AtsUser.java
@@ -16,6 +16,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
+import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -118,8 +119,8 @@ public class AtsUser extends JaxAtsObject implements IAtsUser {
if (this == obj) {
return true;
}
- if (!(obj instanceof IAtsUser)) {
- return false;
+ if (obj instanceof Id) {
+ return obj.equals(getId());
}
try {
String thisUserId = getUserId();
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserServiceClientImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserServiceClientImpl.java
index 73c781c0fb..1840fff00f 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserServiceClientImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserServiceClientImpl.java
@@ -162,7 +162,7 @@ public class AtsUserServiceClientImpl extends AbstractAtsUserService implements
@Override
public boolean isAtsAdmin() {
- return configurationProvider.getConfigurations().getAtsAdmins().contains(getCurrentUser().getId());
+ return configurationProvider.getConfigurations().getAtsAdmins().contains(getCurrentUser());
}
@Override

Back to the top