Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2018-08-19 01:44:39 -0400
committerRyan D. Brooks2018-08-29 15:37:34 -0400
commit77f526f0a96447839aa5401b98c35826097aa266 (patch)
treec040ba4a4273bb6d40f371a9ffabf4b871c2a75c
parentd8d548bb26dd21e997f3925974d6bde6598fca1c (diff)
downloadorg.eclipse.osee-77f526f0a96447839aa5401b98c35826097aa266.tar.gz
org.eclipse.osee-77f526f0a96447839aa5401b98c35826097aa266.tar.xz
org.eclipse.osee-77f526f0a96447839aa5401b98c35826097aa266.zip
refactor: Implement NamedId in osee tokens
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeTypeToken.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java3
3 files changed, 5 insertions, 3 deletions
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 c9823284de1..db35d4fc57f 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
@@ -14,12 +14,13 @@ 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
*/
-public interface AttributeTypeToken extends AttributeTypeId, FullyNamed, HasDescription {
+public interface AttributeTypeToken extends AttributeTypeId, FullyNamed, HasDescription, NamedId {
AttributeTypeToken SENTINEL = valueOf(Id.SENTINEL, Named.SENTINEL);
public static AttributeTypeToken valueOf(String id) {
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 6010108eb99..7f2247fa4e6 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
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.jdk.core.type.NamedIdBase;
* @author Ryan D. Brooks
*/
@JsonSerialize(using = IdSerializer.class)
-// TODO: Rename to RelationTypeId
+// TODO: Replace usage with RelationTypeId or RelationTypeToken as applicable
public interface IRelationType extends RelationTypeId {
public static IRelationType valueOf(long id, String name) {
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 2c7589dcfbb..c96df434107 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,12 +12,13 @@ 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
*/
-public interface RelationTypeToken extends IRelationType, Named {
+public interface RelationTypeToken extends IRelationType, NamedId {
RelationTypeToken SENTINEL = create(Id.SENTINEL, Named.SENTINEL);
public static RelationTypeToken create(long id, String name) {

Back to the top