Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-06-27 21:12:34 +0000
committerRyan D. Brooks2016-07-29 06:18:28 +0000
commit0ff6aba5036081c457be0ecff42f3c4f3feb543f (patch)
tree8b13d7a05cf3fbdb64247cd69040b47e940cb471 /plugins/org.eclipse.osee.framework.core
parent318b5413f15d3e014e23a790043e8b9b1202ac73 (diff)
downloadorg.eclipse.osee-0ff6aba5036081c457be0ecff42f3c4f3feb543f.tar.gz
org.eclipse.osee-0ff6aba5036081c457be0ecff42f3c4f3feb543f.tar.xz
org.eclipse.osee-0ff6aba5036081c457be0ecff42f3c4f3feb543f.zip
feature[ats_ATS286643]: HLR - Implement Types Versioning
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core')
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeId.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypeSheet.java66
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypesData.java42
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java2
4 files changed, 113 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeId.java
index ffbacdd8419..73dbac43a42 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/AttributeId.java
@@ -25,8 +25,8 @@ public interface AttributeId extends HasLocalId<Integer>, Id {
@JsonCreator
public static AttributeId valueOf(long id) {
- final class AttributeIdImpl extends BaseId implements AttributeId {
- public AttributeIdImpl(Long txId) {
+ final class AttributeToken extends BaseId implements AttributeId {
+ public AttributeToken(Long txId) {
super(txId);
}
@@ -35,6 +35,6 @@ public interface AttributeId extends HasLocalId<Integer>, Id {
return getId().intValue();
}
}
- return new AttributeIdImpl(id);
+ return new AttributeToken(id);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypeSheet.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypeSheet.java
new file mode 100644
index 00000000000..1501a0ab638
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypeSheet.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * 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.core.data;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Donald G. Dunne
+ */
+@XmlRootElement
+public class OrcsTypeSheet {
+
+ public String name;
+ public String typesSheet;
+ public String id;
+ public String guid;
+
+ public OrcsTypeSheet() {
+ // For JAX-RS Instantiation
+ }
+
+ public OrcsTypeSheet(String name, String typesSheet) {
+ this.name = name;
+ this.typesSheet = typesSheet;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getTypesSheet() {
+ return typesSheet;
+ }
+
+ public void setTypesSheet(String typesSheet) {
+ this.typesSheet = typesSheet;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypesData.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypesData.java
new file mode 100644
index 00000000000..3d9e9a5b4cd
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OrcsTypesData.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.core.data;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Donald G. Dunne
+ */
+@XmlRootElement
+public class OrcsTypesData {
+
+ /**
+ * This value should change and the corresponding entries made in the Tuple2 table that maps this version to the Uri
+ * attribute ids of the types to load. This provides for production code to access an over version of the types
+ * model/sheets while the current code base works of this specified version.</br>
+ * </br>
+ * Version 1 = Corresponds to 0.23.1 and earlier code base
+ */
+ public static final Long OSEE_TYPE_VERSION = 2L; // Corresponds to 0.24.0 code base
+
+ private List<OrcsTypeSheet> sheets = new ArrayList<>();
+
+ public List<OrcsTypeSheet> getSheets() {
+ return sheets;
+ }
+
+ public void setSheets(List<OrcsTypeSheet> sheets) {
+ this.sheets = sheets;
+ }
+
+}
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 f6f27f049ef..1f2f9af2c2e 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
@@ -52,6 +52,8 @@ public final class CoreArtifactTypes {
public static final IArtifactType WholeWord = TokenFactory.createArtifactType(0x0000000000000012L, "MS Word Whole Document");
public static final IArtifactType OseeApp = TokenFactory.createArtifactType(0x0000000000000059L, "OSEE App");
public static final IArtifactType OseeTypeDefinition = TokenFactory.createArtifactType(0x000000000000003CL, "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(0x19F3D0F33D5ACC54L, "Osee Type Definition Temp");
public static final IArtifactType OseeTypesEnum = TokenFactory.createArtifactType(0x4B9A7DCF0856C368L, "Osee Type Enum");
public static final IArtifactType RendererTemplate = TokenFactory.createArtifactType(0x0000000000000009L, "Renderer Template");
public static final IArtifactType Requirement = TokenFactory.createArtifactType(0x0000000000000015L, "Requirement");

Back to the top