Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbroberts2018-10-11 17:26:25 +0000
committerDavid Miller2018-10-17 23:18:20 +0000
commitf202ceffa3387d9a48e98358ba6d8d6b72082606 (patch)
tree1d488eccf3f2a1ed4fc4d28f3e4022e37768ebf5
parentb79cda0ca152396295adb542c4f01cfc43ecebe6 (diff)
downloadorg.eclipse.osee-f202ceffa3387d9a48e98358ba6d8d6b72082606.tar.gz
org.eclipse.osee-f202ceffa3387d9a48e98358ba6d8d6b72082606.tar.xz
org.eclipse.osee-f202ceffa3387d9a48e98358ba6d8d6b72082606.zip
refactor: Remove OseeTypeDefinitionTemp from the CoreArtifactTypes
Change-Id: Ieb7817f03f13927043d1cad7042c6cf109b8e54b Signed-off-by: broberts <baily.e.roberts@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java2
3 files changed, 6 insertions, 11 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
index ccd86be1bb3..51a6d72b65b 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
@@ -32,10 +32,8 @@ import org.eclipse.osee.framework.ui.skynet.render.FileToAttributeUpdateOperatio
* @author Roberto E. Escobar
*/
public final class OseeDslRenderer extends AbstractDslRenderer {
- private static final IArtifactType[] MATCHING_ARTIFACT_TYPES = {
- CoreArtifactTypes.AccessControlModel,
- CoreArtifactTypes.OseeTypeDefinition,
- CoreArtifactTypes.OseeTypeDefinitionTemp};
+ private static final IArtifactType[] MATCHING_ARTIFACT_TYPES =
+ {CoreArtifactTypes.AccessControlModel, CoreArtifactTypes.OseeTypeDefinition};
private static final OseeDslSegmentParser parser = new OseeDslSegmentParser();
@@ -59,8 +57,7 @@ public final class OseeDslRenderer extends AbstractDslRenderer {
Artifact artifact = artifacts.iterator().next();
String data;
- if (artifact.isOfType(CoreArtifactTypes.OseeTypeDefinition) || artifact.isOfType(
- CoreArtifactTypes.OseeTypeDefinitionTemp)) {
+ if (artifact.isOfType(CoreArtifactTypes.OseeTypeDefinition)) {
data = artifact.getSoleAttributeValueAsString(CoreAttributeTypes.UriGeneralStringData, "");
} else {
StringBuilder builder = new StringBuilder();
@@ -83,8 +80,7 @@ public final class OseeDslRenderer extends AbstractDslRenderer {
protected IOperation getUpdateOperation(File file, List<Artifact> artifacts, BranchId branch, PresentationType presentationType) {
IOperation op;
Artifact artifact = artifacts.iterator().next();
- if (artifact.isOfType(CoreArtifactTypes.OseeTypeDefinition) || artifact.isOfType(
- CoreArtifactTypes.OseeTypeDefinitionTemp)) {
+ if (artifact.isOfType(CoreArtifactTypes.OseeTypeDefinition)) {
OseeTypeModifier modifier = new OseeTypeModifier();
op = new FileToAttributeUpdateOperation(file, artifacts.get(0), CoreAttributeTypes.UriGeneralStringData,
modifier);
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
index 1d9bbe2dc76..f143aad20a3 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
@@ -56,8 +56,7 @@ public final class CoreArtifactTypes {
public static final IArtifactType WholeWord = TokenFactory.createArtifactType(18, "MS Word Whole Document");
public static final IArtifactType OseeApp = TokenFactory.createArtifactType(89, "OSEE App");
public static final IArtifactType OseeTypeDefinition = TokenFactory.createArtifactType(60, "Osee Type Definition");
- // Added to support OSEE types versioning between 23.1 and 24. Remove after 24.0 release.
- public static final IArtifactType OseeTypeDefinitionTemp = TokenFactory.createArtifactType(1870068013413878868L, "Osee Type Definition Temp");
+
public static final IArtifactType OseeTypesEnum = TokenFactory.createArtifactType(5447805027409642344L, "Osee Type Enum");
public static final IArtifactType PlainText = TokenFactory.createArtifactType(784L, "Plain Text");
public static final IArtifactType RendererTemplate = TokenFactory.createArtifactType(9, "Renderer Template");
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
index e9c84258d75..2f43be45c60 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TypesEndpointImpl.java
@@ -332,7 +332,7 @@ public class TypesEndpointImpl implements TypesEndpoint {
public Response getConfigSheets() {
List<OrcsTypesSheet> sheets = new LinkedList<>();
for (ArtifactReadable art : orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andIsOfType(
- CoreArtifactTypes.OseeTypeDefinition, CoreArtifactTypes.OseeTypeDefinitionTemp).getResults()) {
+ CoreArtifactTypes.OseeTypeDefinition).getResults()) {
OrcsTypesSheet sheet = new OrcsTypesSheet();
sheet.setArtifactId(art.getId());
sheet.setName(art.getName());

Back to the top