Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Joy2016-11-08 15:35:37 -0500
committerDavid W. Miller2016-11-08 15:35:37 -0500
commitfe03be65162abc5eb84154f4fbad9df94707b4ab (patch)
tree1b43317d8c7ae881b165e56c0a06dc9f87059e04
parent494ea6a387bc2487e5d88532bffc7edf43a49a60 (diff)
downloadorg.eclipse.osee-fe03be65162abc5eb84154f4fbad9df94707b4ab.tar.gz
org.eclipse.osee-fe03be65162abc5eb84154f4fbad9df94707b4ab.tar.xz
org.eclipse.osee-fe03be65162abc5eb84154f4fbad9df94707b4ab.zip
refactor: Create NamedId as an interface and move toStringWithId there
Change-Id: Ibd45c42520597cfaa018984d0c0427230b0824ed Signed-off-by: Mark Joy <mark.joy@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/SubscriptionGroupId.java4
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java9
-rw-r--r--plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java9
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUser.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AbstractOseeType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeLoadingCache.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ApplicabilityToken.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java6
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedId.java43
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdBase.java42
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdSerializer.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchReadableTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/src/org/eclipse/osee/orcs/script/dsl/ui/integration/internal/OrcsObjectProviderImpl.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/IOrcsObjectProvider.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/contentassist/OrcsScriptDslProposalProvider.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/internal/DefaultOrcsObjectProvider.java18
31 files changed, 132 insertions, 141 deletions
diff --git a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/SubscriptionGroupId.java b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/SubscriptionGroupId.java
index 3b2d214e8e..c9fb004275 100644
--- a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/SubscriptionGroupId.java
+++ b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/SubscriptionGroupId.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.account.rest.model;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Angel Avila
*/
-public class SubscriptionGroupId extends NamedId {
+public class SubscriptionGroupId extends NamedIdBase {
public SubscriptionGroupId(Long id) {
super(id, String.valueOf(id));
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 57ec35dc1d..560d1e20a3 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
@@ -12,17 +12,12 @@ package org.eclipse.osee.ats.api;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.jdk.core.type.HasDescription;
-import org.eclipse.osee.framework.jdk.core.type.Id;
-import org.eclipse.osee.framework.jdk.core.type.Named;
+import org.eclipse.osee.framework.jdk.core.type.NamedId;
/**
* @author Donald G. Dunne
*/
-public interface IAtsObject extends Named, Id, HasDescription {
-
- default String toStringWithId() {
- return String.format("[%s][%s]", getName(), getId());
- }
+public interface IAtsObject extends NamedId, HasDescription {
default ArtifactToken getStoreObject() {
return null;
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 f1d0fddf09..46cb6bda81 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
@@ -90,11 +90,6 @@ public class MockWorkItem implements IAtsWorkItem {
}
@Override
- public String toStringWithId() {
- return toString();
- }
-
- @Override
public IAtsStateManager getStateMgr() {
return null;
}
@@ -255,4 +250,8 @@ public class MockWorkItem implements IAtsWorkItem {
return false;
}
+ @Override
+ public String toStringWithId() {
+ return String.format("[%s]-[%s]", getName(), getId());
+ }
}
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 c8017846ff..fd2a55b230 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
@@ -12,12 +12,12 @@ package org.eclipse.osee.ats.core.model.impl;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.framework.core.data.ArtifactToken;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Donald G. Dunne
*/
-public class AtsObject extends NamedId implements IAtsObject {
+public class AtsObject extends NamedIdBase implements IAtsObject {
private String desc;
private ArtifactToken object;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUser.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUser.java
index 5575053e06..51292c9447 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUser.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUser.java
@@ -12,13 +12,13 @@ package org.eclipse.osee.ats.core.users;
import org.eclipse.osee.ats.api.user.IAtsUser;
import org.eclipse.osee.framework.core.data.IUserToken;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Donald G. Dunne
*/
-public class AtsUser extends NamedId implements IAtsUser {
+public class AtsUser extends NamedIdBase implements IAtsUser {
private String userId;
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java
index 9a557abe09..189f4aabdc 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.junit.Assert;
import org.junit.FixMethodOrder;
@@ -27,7 +27,7 @@ import org.junit.runners.MethodSorters;
* @author Roberto E. Escobar
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public abstract class AbstractOseeCacheTest<T extends NamedId> {
+public abstract class AbstractOseeCacheTest<T extends NamedIdBase> {
private final List<T> data;
private final AbstractOseeCache<T> cache;
private final TypeComparator comparator;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AbstractOseeType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AbstractOseeType.java
index 5f70a84e2f..782954b4b3 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AbstractOseeType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AbstractOseeType.java
@@ -16,12 +16,12 @@ import java.util.Set;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.enums.StorageState;
import org.eclipse.osee.framework.core.model.internal.fields.UniqueIdField;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.logging.OseeLog;
-public abstract class AbstractOseeType extends NamedId implements IOseeStorable {
+public abstract class AbstractOseeType extends NamedIdBase implements IOseeStorable {
public static final String NAME_FIELD_KEY = "osee.name.field";
public static final String UNIQUE_ID_FIELD_KEY = "osee.unique.id.field";
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
index 9dde10d85e..c3a08b63ef 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/Branch.java
@@ -23,13 +23,13 @@ import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
*/
-public class Branch extends NamedId implements IOseeBranch, Adaptable {
+public class Branch extends NamedIdBase implements IOseeBranch, Adaptable {
private final Set<Branch> childBranches = new HashSet<>();
private BranchType branchType;
@@ -167,11 +167,4 @@ public class Branch extends NamedId implements IOseeBranch, Adaptable {
return false;
}
- /*
- * Provide easy way to display/report [guid][name]
- */
- public final String toStringWithId() {
- return String.format("[%s][%s]", getId(), getName());
- }
-
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
index f961e11dc5..d39fba7474 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java
@@ -19,7 +19,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.Id;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -28,7 +28,7 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions;
/**
* @author Roberto E. Escobar
*/
-public abstract class AbstractOseeCache<T extends NamedId> implements IOseeCache<T> {
+public abstract class AbstractOseeCache<T extends NamedIdBase> implements IOseeCache<T> {
private final HashCollection<String, T> nameToTypeMap = new HashCollection<>(true, CopyOnWriteArrayList.class);
private final ConcurrentHashMap<Long, T> idToTypeMap = new ConcurrentHashMap<>();
private final OseeCacheEnum cacheId;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeLoadingCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeLoadingCache.java
index 3220c0a688..82bb98a543 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeLoadingCache.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeLoadingCache.java
@@ -13,14 +13,14 @@ package org.eclipse.osee.framework.core.model.cache;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
/**
* @author Roberto E. Escobar
*/
-public abstract class AbstractOseeLoadingCache<T extends NamedId> extends AbstractOseeCache<T> implements IOseeLoadingCache<T> {
+public abstract class AbstractOseeLoadingCache<T extends NamedIdBase> extends AbstractOseeCache<T> implements IOseeLoadingCache<T> {
private final IOseeDataAccessor<T> dataAccessor;
private final AtomicBoolean wasLoaded;
private long lastLoaded;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ApplicabilityToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ApplicabilityToken.java
index 562c430520..4a796920d8 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ApplicabilityToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ApplicabilityToken.java
@@ -13,14 +13,14 @@ package org.eclipse.osee.framework.core.data;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.NamedIdSerializer;
/**
* @author Angel Avila
*/
@JsonSerialize(using = NamedIdSerializer.class)
-public class ApplicabilityToken extends NamedId implements ApplicabilityId {
+public class ApplicabilityToken extends NamedIdBase implements ApplicabilityId {
public static final ApplicabilityToken BASE = new ApplicabilityToken(ApplicabilityId.BASE.getId(), "Base");
public ApplicabilityToken(long applId, String name) {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
index afdcd9d5f3..978cfa4199 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
@@ -11,15 +11,15 @@
package org.eclipse.osee.framework.core.data;
import org.eclipse.osee.framework.jdk.core.type.Id;
-import org.eclipse.osee.framework.jdk.core.type.Named;
import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.util.GUID;
/**
* @author Ryan D. Brooks
* @author Donald G. Dunne
*/
-public interface ArtifactToken extends ArtifactId, HasArtifactType, HasBranch, Named {
+public interface ArtifactToken extends ArtifactId, HasArtifactType, HasBranch, NamedId {
default ArtifactTypeId getArtifactTypeId() {
return null;
}
@@ -45,7 +45,7 @@ public interface ArtifactToken extends ArtifactId, HasArtifactType, HasBranch, N
}
public static ArtifactToken valueOf(long id, String guid, String name, BranchId branch, IArtifactType artifactType) {
- final class ArtifactTokenImpl extends NamedId implements ArtifactToken {
+ final class ArtifactTokenImpl extends NamedIdBase implements ArtifactToken {
private final BranchId branch;
private final IArtifactType artifactType;
private final String guid;
@@ -89,7 +89,4 @@ public interface ArtifactToken extends ArtifactId, HasArtifactType, HasBranch, N
return new ArtifactTokenImpl(id, guid, name, branch, artifactType);
}
- default String toStringWithId() {
- return String.format("[%s][%s]", getName(), getId());
- }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java
index f043f9bc07..9279f48ddf 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.jdk.core.type.FullyNamed;
import org.eclipse.osee.framework.jdk.core.type.HasDescription;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.Named;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Ryan D. Brooks
@@ -33,7 +33,7 @@ public interface AttributeTypeToken extends AttributeTypeId, FullyNamed, HasDesc
@JsonCreator
public static AttributeTypeToken valueOf(long id, String name, String description) {
- final class AttributeTypeImpl extends NamedId implements AttributeTypeToken {
+ final class AttributeTypeImpl extends NamedIdBase implements AttributeTypeToken {
private final String description;
public AttributeTypeImpl(Long txId, String name, String description) {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
index 96057e9988..f14bc010ec 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.core.data;
import org.eclipse.osee.framework.jdk.core.type.Named;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -42,7 +42,7 @@ public interface IOseeBranch extends BranchId, Named {
}
public static IOseeBranch create(Long id, String name) {
- final class BranchTokenImpl extends NamedId implements IOseeBranch {
+ final class BranchTokenImpl extends NamedIdBase implements IOseeBranch {
public BranchTokenImpl(Long id, String name) {
super(id, name);
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
index 361f9f2ed7..c372aeb514 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.data;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.IdSerializer;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Ryan D. Brooks
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.type.NamedId;
public interface IRelationType extends Id {
public static IRelationType valueOf(long id, String name) {
- final class RelationTypeIdImpl extends NamedId implements IRelationType {
+ final class RelationTypeIdImpl extends NamedIdBase implements IRelationType {
public RelationTypeIdImpl(Long id, String name) {
super(id, name);
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java
index 0e73e02caa..f033e5baaf 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java
@@ -12,12 +12,12 @@
package org.eclipse.osee.framework.core.data;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Andrew M. Finkbeiner
*/
-public class RelationTypeSide extends NamedId implements RelationTypeToken {
+public class RelationTypeSide extends NamedIdBase implements RelationTypeToken {
private final RelationTypeToken type;
private final RelationSide side;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java
index 697aee5323..2c7589dcfb 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.data;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.Named;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Ryan D. Brooks
@@ -25,7 +25,7 @@ public interface RelationTypeToken extends IRelationType, Named {
}
public static RelationTypeToken create(Long id, String name) {
- final class RelationTypeTokenImpl extends NamedId implements RelationTypeToken {
+ final class RelationTypeTokenImpl extends NamedIdBase implements RelationTypeToken {
public RelationTypeTokenImpl(Long id, String name) {
super(id, name);
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
index 044e99e9c2..23c83363e7 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
@@ -14,7 +14,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -68,7 +68,7 @@ public final class TokenFactory {
return new UserToken(uuid, guid, name, userId, active, admin, email, creationRequired);
}
- private final static class ArtifactTypeToken extends NamedId implements IArtifactType {
+ private final static class ArtifactTypeToken extends NamedIdBase implements IArtifactType {
public ArtifactTypeToken(Long id, String name) {
super(id, name);
}
@@ -97,7 +97,7 @@ public final class TokenFactory {
}
}
- private static class UserToken extends NamedId implements IUserToken {
+ private static class UserToken extends NamedIdBase implements IUserToken {
private final String userId;
private final boolean active;
private final boolean admin;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedId.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedId.java
index fe1aa93fa7..88a1bd3a20 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedId.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedId.java
@@ -1,41 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2016 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Created on Nov 8, 2016
*
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.jdk.core.type;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-/**
- * @author Ryan D. Brooks
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
*/
-@JsonSerialize(using = NamedIdSerializer.class)
-public class NamedId extends BaseId implements Named {
- private String name;
-
- public NamedId(Long id, String name) {
- super(id);
- this.name = name;
- }
+package org.eclipse.osee.framework.jdk.core.type;
- @Override
- public String getName() {
- return name;
- }
+public interface NamedId extends Named, Id {
- public void setName(String name) {
- this.name = name;
+ default String toStringWithId() {
+ return String.format("[%s][%s]", getName(), getId());
}
- @Override
- public String toString() {
- return name == null ? super.toString() : name;
- }
-} \ No newline at end of file
+}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdBase.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdBase.java
new file mode 100644
index 0000000000..2383e9c737
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdBase.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.osee.framework.jdk.core.type;
+
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+/**
+ * @author Ryan D. Brooks
+ */
+@JsonSerialize(using = NamedIdSerializer.class)
+public class NamedIdBase extends BaseId implements NamedId {
+ private String name;
+
+ public NamedIdBase(Long id, String name) {
+ super(id);
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return name == null ? super.toString() : name;
+ }
+
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdSerializer.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdSerializer.java
index f8b5fbb1bd..e20036bf33 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdSerializer.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/NamedIdSerializer.java
@@ -22,14 +22,14 @@ import org.codehaus.jackson.map.ser.std.SerializerBase;
/**
* @author Angel Avila
*/
-public class NamedIdSerializer extends SerializerBase<NamedId> {
+public class NamedIdSerializer extends SerializerBase<NamedIdBase> {
public NamedIdSerializer() {
- super(NamedId.class);
+ super(NamedIdBase.class);
}
@Override
- public void serialize(NamedId id, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
+ public void serialize(NamedIdBase id, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
jgen.writeStartObject();
jgen.writeStringField("id", String.valueOf(id.getId()));
jgen.writeStringField("name", id.getName());
@@ -42,7 +42,7 @@ public class NamedIdSerializer extends SerializerBase<NamedId> {
* most cases; some sub-classes may want to change this behavior.
*/
@Override
- public void serializeWithType(NamedId id, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer) throws IOException, JsonGenerationException {
+ public void serializeWithType(NamedIdBase id, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer) throws IOException, JsonGenerationException {
typeSer.writeTypePrefixForScalar(id, jgen);
serialize(id, jgen, provider);
typeSer.writeTypeSuffixForScalar(id, jgen);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 249879de5f..0d6e14819a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -260,14 +260,6 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
return getName();
}
- /*
- * Provide easy way to display/report [name][uuid]
- */
- @Override
- public final String toStringWithId() {
- return String.format("[%s][%s]", getSafeName(), getUuid());
- }
-
// TODO should not return null but currently application code expects it to
/**
* The method should be used when the caller expects this artifact to have exactly one parent. Otherwise use
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
index 9a11a03901..f566878fc0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RenderingUtilTest.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.renderer;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
import org.junit.Assert;
@@ -90,7 +90,7 @@ public class RenderingUtilTest {
return URLEncoder.encode(guid, "UTF-8");
}
- public static final class BranchTokenImpl extends NamedId implements IOseeBranch {
+ public static final class BranchTokenImpl extends NamedIdBase implements IOseeBranch {
public BranchTokenImpl(Long id, String name) {
super(id, name);
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
index b60f6c6a10..8031ec7a4d 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
@@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.account.admin.internal;
import org.eclipse.osee.account.admin.SubscriptionGroup;
import org.eclipse.osee.account.rest.model.SubscriptionGroupId;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.orcs.data.ArtifactReadable;
/**
* @author Roberto E. Escobar
*/
-public class AccountSubscriptionGroupImpl extends NamedId implements SubscriptionGroup {
+public class AccountSubscriptionGroupImpl extends NamedIdBase implements SubscriptionGroup {
private static final String NOT_AVAILABLE = "N/A";
private final ArtifactReadable artifact;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchReadableTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchReadableTest.java
index 8160df4825..5343798339 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchReadableTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchUtilBranchReadableTest.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.orcs.data.BranchReadable;
import org.junit.Assert;
import org.junit.Before;
@@ -45,7 +45,7 @@ public class BranchUtilBranchReadableTest {
ten = new BranchReadableImpl(10);
}
- private static class BranchReadableImpl extends NamedId implements BranchReadable {
+ private static class BranchReadableImpl extends NamedIdBase implements BranchReadable {
private BranchId parent;
public void setParentBranch(BranchId parent) {
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java
index e0d1ea4c41..6b938ef82b 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.types.impl;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.data.EnumEntry;
@@ -22,7 +22,7 @@ import org.eclipse.osee.orcs.data.EnumType;
/**
* @author Roberto E. Escobar
*/
-public final class EnumTypeImpl extends NamedId implements EnumType {
+public final class EnumTypeImpl extends NamedIdBase implements EnumType {
private final List<EnumEntry> entries;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
index daf81a450f..7eedd94a42 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
@@ -16,14 +16,14 @@ import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.orcs.core.ds.BranchData;
import org.eclipse.osee.orcs.data.BranchReadable;
/**
* @author Roberto E. Escobar
*/
-public class BranchDataImpl extends NamedId implements BranchData, BranchReadable {
+public class BranchDataImpl extends NamedIdBase implements BranchData, BranchReadable {
private ArtifactId associatedArtifact = ArtifactId.SENTINEL;
private TransactionId baseTransaction = TransactionId.SENTINEL;
private TransactionId sourceTransaction = TransactionId.SENTINEL;
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/src/org/eclipse/osee/orcs/script/dsl/ui/integration/internal/OrcsObjectProviderImpl.java b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/src/org/eclipse/osee/orcs/script/dsl/ui/integration/internal/OrcsObjectProviderImpl.java
index a8aa28c8bd..a8674ee060 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/src/org/eclipse/osee/orcs/script/dsl/ui/integration/internal/OrcsObjectProviderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui.integration/src/org/eclipse/osee/orcs/script/dsl/ui/integration/internal/OrcsObjectProviderImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.script.dsl.ui.integration.internal;
import java.util.Collections;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.util.OsgiUtil;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.orcs.script.dsl.ui.IOrcsObjectProvider;
/**
@@ -26,26 +26,26 @@ public class OrcsObjectProviderImpl implements IOrcsObjectProvider {
}
@Override
- public Iterable<? extends NamedId> getBranches() {
+ public Iterable<? extends NamedIdBase> getBranches() {
IOseeCachingService caches = getCache();
- return caches != null ? caches.getBranchCache().getAll() : Collections.<NamedId> emptyList();
+ return caches != null ? caches.getBranchCache().getAll() : Collections.<NamedIdBase> emptyList();
}
@Override
- public Iterable<? extends NamedId> getArtifactTypes() {
+ public Iterable<? extends NamedIdBase> getArtifactTypes() {
IOseeCachingService caches = getCache();
- return caches != null ? caches.getArtifactTypeCache().getAll() : Collections.<NamedId> emptyList();
+ return caches != null ? caches.getArtifactTypeCache().getAll() : Collections.<NamedIdBase> emptyList();
}
@Override
- public Iterable<? extends NamedId> getAttributeTypes() {
+ public Iterable<? extends NamedIdBase> getAttributeTypes() {
IOseeCachingService caches = getCache();
- return caches != null ? caches.getAttributeTypeCache().getAll() : Collections.<NamedId> emptyList();
+ return caches != null ? caches.getAttributeTypeCache().getAll() : Collections.<NamedIdBase> emptyList();
}
@Override
- public Iterable<? extends NamedId> getRelationTypes() {
+ public Iterable<? extends NamedIdBase> getRelationTypes() {
IOseeCachingService caches = getCache();
- return caches != null ? caches.getRelationTypeCache().getAll() : Collections.<NamedId> emptyList();
+ return caches != null ? caches.getRelationTypeCache().getAll() : Collections.<NamedIdBase> emptyList();
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/IOrcsObjectProvider.java b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/IOrcsObjectProvider.java
index 4668181b0c..909fd1ed34 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/IOrcsObjectProvider.java
+++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/IOrcsObjectProvider.java
@@ -10,19 +10,19 @@
*******************************************************************************/
package org.eclipse.osee.orcs.script.dsl.ui;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
/**
* @author Roberto E. Escobar
*/
public interface IOrcsObjectProvider {
- Iterable<? extends NamedId> getBranches();
+ Iterable<? extends NamedIdBase> getBranches();
- Iterable<? extends NamedId> getArtifactTypes();
+ Iterable<? extends NamedIdBase> getArtifactTypes();
- Iterable<? extends NamedId> getAttributeTypes();
+ Iterable<? extends NamedIdBase> getAttributeTypes();
- Iterable<? extends NamedId> getRelationTypes();
+ Iterable<? extends NamedIdBase> getRelationTypes();
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/contentassist/OrcsScriptDslProposalProvider.java b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/contentassist/OrcsScriptDslProposalProvider.java
index 00852e321a..60b70a6fc5 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/contentassist/OrcsScriptDslProposalProvider.java
+++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/contentassist/OrcsScriptDslProposalProvider.java
@@ -16,7 +16,7 @@ import java.util.Set;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.orcs.script.dsl.IFieldResolver;
import org.eclipse.osee.orcs.script.dsl.IFieldResolver.OsField;
import org.eclipse.osee.orcs.script.dsl.OrcsScriptUtil;
@@ -51,8 +51,8 @@ public class OrcsScriptDslProposalProvider extends AbstractOrcsScriptDslProposal
if (acceptor.canAcceptMoreProposals()) {
Image image = imageProvider.getBranchImage();
- Iterable<? extends NamedId> entries = provider.getBranches();
- for (NamedId entry : entries) {
+ Iterable<? extends NamedIdBase> entries = provider.getBranches();
+ for (NamedIdBase entry : entries) {
ICompletionProposal proposal = createCompletionProposal(OrcsScriptUtil.quote(entry.getName()),
new StyledString(entry.getName()), image, Integer.MIN_VALUE, context.getPrefix(), context);
acceptor.accept(proposal);
@@ -64,7 +64,7 @@ public class OrcsScriptDslProposalProvider extends AbstractOrcsScriptDslProposal
public void complete_OsMetaTypeId(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
super.complete_OsMetaTypeId(model, ruleCall, context, acceptor);
String name = model.getClass().getName().toLowerCase();
- Iterable<? extends NamedId> entries;
+ Iterable<? extends NamedIdBase> entries;
if (name.contains("artifact")) {
entries = provider.getArtifactTypes();
} else if (name.contains("attribute")) {
@@ -74,7 +74,7 @@ public class OrcsScriptDslProposalProvider extends AbstractOrcsScriptDslProposal
} else {
entries = Collections.emptyList();
}
- for (NamedId entry : entries) {
+ for (NamedIdBase entry : entries) {
Image image = null;
if (name.contains("artifact")) {
image = imageProvider.getArtifactTypeImage(entry);
diff --git a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/internal/DefaultOrcsObjectProvider.java b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/internal/DefaultOrcsObjectProvider.java
index fc9d8c65c1..00e7739fa5 100644
--- a/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/internal/DefaultOrcsObjectProvider.java
+++ b/plugins/org.eclipse.osee.orcs.script.dsl.ui/src/org/eclipse/osee/orcs/script/dsl/ui/internal/DefaultOrcsObjectProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.script.dsl.ui.internal;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.jdk.core.type.NamedId;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
import org.eclipse.osee.orcs.script.dsl.ui.IOrcsObjectProvider;
@@ -30,8 +30,8 @@ public class DefaultOrcsObjectProvider implements IOrcsObjectProvider {
new ExtensionDefinedObjects<IOrcsObjectProvider>(EXTENSION_POINT_ID, EXTENSION_ELEMENT, CLASSNAME, true);
@Override
- public Iterable<? extends NamedId> getBranches() {
- List<NamedId> toReturn = new ArrayList<>();
+ public Iterable<? extends NamedIdBase> getBranches() {
+ List<NamedIdBase> toReturn = new ArrayList<>();
for (IOrcsObjectProvider provider : getProviders()) {
Iterables.addAll(toReturn, provider.getBranches());
}
@@ -39,8 +39,8 @@ public class DefaultOrcsObjectProvider implements IOrcsObjectProvider {
}
@Override
- public Iterable<? extends NamedId> getArtifactTypes() {
- List<NamedId> toReturn = new ArrayList<>();
+ public Iterable<? extends NamedIdBase> getArtifactTypes() {
+ List<NamedIdBase> toReturn = new ArrayList<>();
for (IOrcsObjectProvider provider : getProviders()) {
Iterables.addAll(toReturn, provider.getArtifactTypes());
}
@@ -48,8 +48,8 @@ public class DefaultOrcsObjectProvider implements IOrcsObjectProvider {
}
@Override
- public Iterable<? extends NamedId> getAttributeTypes() {
- List<NamedId> toReturn = new ArrayList<>();
+ public Iterable<? extends NamedIdBase> getAttributeTypes() {
+ List<NamedIdBase> toReturn = new ArrayList<>();
for (IOrcsObjectProvider provider : getProviders()) {
Iterables.addAll(toReturn, provider.getAttributeTypes());
}
@@ -57,8 +57,8 @@ public class DefaultOrcsObjectProvider implements IOrcsObjectProvider {
}
@Override
- public Iterable<? extends NamedId> getRelationTypes() {
- List<NamedId> toReturn = new ArrayList<>();
+ public Iterable<? extends NamedIdBase> getRelationTypes() {
+ List<NamedIdBase> toReturn = new ArrayList<>();
for (IOrcsObjectProvider provider : getProviders()) {
Iterables.addAll(toReturn, provider.getRelationTypes());
}

Back to the top