diff options
14 files changed, 45 insertions, 32 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java index a8cc93a03c3..698ba543187 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.api; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.HasDescription; import org.eclipse.osee.framework.jdk.core.type.Named; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; @@ -21,8 +22,8 @@ public interface IAtsObject extends Named, UuidIdentity, HasDescription { String toStringWithId(); - Object getStoreObject(); + ArtifactId getStoreObject(); - void setStoreObject(Object object); + void setStoreObject(ArtifactId artifact); } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java index f491ed4a50c..b75665751cb 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java @@ -21,6 +21,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -79,12 +80,12 @@ public class ActionArtifact extends Artifact implements IAtsAction { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return this; } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java index 95c70853511..ed03ca3ca80 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.core.client.artifact; import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -31,12 +32,12 @@ public abstract class AbstractAtsArtifact extends Artifact implements IAtsObject } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return this; } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AbstractAtsProgramClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AbstractAtsProgramClient.java index 5ba50af432d..decd97d9e71 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AbstractAtsProgramClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AbstractAtsProgramClient.java @@ -14,6 +14,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.config.AbstractAtsProgram; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -35,13 +36,13 @@ public abstract class AbstractAtsProgramClient extends AbstractAtsProgram implem } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return artifact; } @Override - public void setStoreObject(Object object) { - this.artifact = (Artifact) object; + public void setStoreObject(ArtifactId artifact) { + this.artifact = (Artifact) artifact; } @Override diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java index 18ba7b9d708..4b80434fa68 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.IAtsClient; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.model.impl.AtsObject; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -121,7 +122,7 @@ public abstract class AtsConfigObject extends AtsObject implements IAtsConfigObj } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return (artifact != null ? artifact : super.getStoreObject()); } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java index 907c9f01a0d..77841f049aa 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.core.client.internal.user; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; import org.eclipse.osee.framework.skynet.core.User; @@ -140,14 +141,14 @@ public class AtsUser implements IAtsUser { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return user; } @Override - public void setStoreObject(Object object) { - if (object instanceof User) { - this.user = (User) object; + public void setStoreObject(ArtifactId artifact) { + if (artifact instanceof User) { + this.user = (User) artifact; } } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/WorkItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/WorkItem.java index 13983015fc0..6ec1e5435c9 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/WorkItem.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/WorkItem.java @@ -33,6 +33,7 @@ import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.internal.AtsClientService; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.model.impl.AtsObject; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -220,7 +221,7 @@ public class WorkItem extends AtsObject implements IAtsWorkItem { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return artifact; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java index 1e0383fe121..87f8f56b99a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java @@ -25,6 +25,7 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.internal.log.AtsLogFactory; import org.eclipse.osee.ats.core.internal.state.StateManager; import org.eclipse.osee.ats.core.util.AtsUserGroup; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; @@ -145,12 +146,12 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return null; } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java index d3e1bfd2033..359c0ec33ea 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ats.core.users; import java.util.HashMap; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; @@ -180,7 +181,7 @@ public class CoreAtsUsersTest { } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } @@ -238,12 +239,12 @@ public class CoreAtsUsersTest { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return null; } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java index df44d7d373d..6b10cf85d8a 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java @@ -123,7 +123,7 @@ public abstract class AtsConfigObject extends org.eclipse.osee.ats.core.model.im } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return (artifact != null ? artifact : super.getStoreObject()); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java index 087d0357df1..450455b2800 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.core.model.impl; import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.UuidNamedIdentity; /** @@ -19,7 +20,7 @@ import org.eclipse.osee.framework.jdk.core.type.UuidNamedIdentity; public class AtsObject extends UuidNamedIdentity implements IAtsObject { private String desc; - private Object object; + private ArtifactId object; public AtsObject(String name, long uuid) { super(uuid, name); @@ -45,13 +46,13 @@ public class AtsObject extends UuidNamedIdentity implements IAtsObject { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return object; } @Override - public void setStoreObject(Object object) { - this.object = object; + public void setStoreObject(ArtifactId artifact) { + this.object = artifact; } @Override diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java index 1b3a5d4325a..b248998a814 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.core.users; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; @@ -119,12 +120,12 @@ public abstract class AbstractAtsUser implements IAtsUser { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return null; } @Override - public void setStoreObject(Object object) { + public void setStoreObject(ArtifactId artifact) { // do nothing } } diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java index 596cc18e19b..2f878ae9e89 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java +++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/user/AtsUser.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.impl.internal.user; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.UuidIdentity; @@ -137,14 +138,14 @@ public class AtsUser implements IAtsUser { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return user; } @Override - public void setStoreObject(Object object) { - if (object instanceof ArtifactReadable) { - this.user = (ArtifactReadable) object; + public void setStoreObject(ArtifactId artifact) { + if (artifact instanceof ArtifactReadable) { + this.user = (ArtifactReadable) artifact; } } diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java index 05be9a5835f..206a11eb631 100644 --- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java +++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/WorkItem.java @@ -29,6 +29,7 @@ import org.eclipse.osee.ats.api.workflow.log.IAtsLog; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.model.impl.AtsObject; import org.eclipse.osee.ats.impl.IAtsServer; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.jdk.core.type.ResultSet; @@ -214,7 +215,7 @@ public class WorkItem extends AtsObject implements IAtsWorkItem { } @Override - public Object getStoreObject() { + public ArtifactId getStoreObject() { return artifact; } |