Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-10-25 15:28:30 +0000
committerjmisinco2013-11-04 17:05:54 +0000
commit1dd2453be862c689cd7506aa9ae195850c04ee6e (patch)
tree519c87c8202e17aa8d6d75cab7197437505103c1 /plugins/org.eclipse.osee.framework.ui.data.model.editor
parent63693d264eddca2a6c1ac2b08bd91fec05ab3e2d (diff)
downloadorg.eclipse.osee-1dd2453be862c689cd7506aa9ae195850c04ee6e.tar.gz
org.eclipse.osee-1dd2453be862c689cd7506aa9ae195850c04ee6e.tar.xz
org.eclipse.osee-1dd2453be862c689cd7506aa9ae195850c04ee6e.zip
feature[ats_ZQZZF]: Change identity service to return longs for local ids
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.data.model.editor')
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/model/AttributeDataType.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/AttributePropertySource.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java2
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java
index c75a8eb34b8..423fd858418 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeConverter.java
@@ -51,7 +51,7 @@ public class OseeDataTypeConverter implements IOseeDataTypeProcessor {
@Override
public void onAttributeType(String baseAttributeClass, String providerAttributeClass, String fileTypeExtension, String name, String defaultValue, String validityXml, int minOccurrence, int maxOccurrence, String toolTipText, String taggerId) throws OseeCoreException {
OseeEnumType enumType = OseeEnumTypeManager.getType(name);
- int enumTypeId = enumType.getId();
+ long enumTypeId = enumType.getId();
AttributeDataType attributeDataType =
new AttributeDataType(name, baseAttributeClass, defaultValue, fileTypeExtension, maxOccurrence, minOccurrence,
providerAttributeClass, taggerId, toolTipText, enumTypeId);
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java
index 427e8acab92..63c558cb9f5 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeDatastore.java
@@ -78,7 +78,7 @@ public class OseeDataTypeDatastore {
artifactType.getAttributeTypes(BranchManager.getBranch(CoreBranches.SYSTEM_ROOT));
for (IAttributeType attrType : attributeTypes) {
- int typeId = AttributeTypeManager.getType(attrType).getId();
+ long typeId = AttributeTypeManager.getType(attrType).getId();
toReturn.put(String.valueOf(artifactType.getId()), String.valueOf(typeId));
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/model/AttributeDataType.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/model/AttributeDataType.java
index 2f652e6c7a9..2b4eb09a263 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/model/AttributeDataType.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/model/AttributeDataType.java
@@ -16,7 +16,7 @@ package org.eclipse.osee.framework.ui.data.model.editor.model;
public class AttributeDataType extends DataType {
private String defaultValue;
- private int enumTypeId;
+ private long enumTypeId;
private String toolTipText;
private String fileTypeExtension;
private String taggerId;
@@ -32,7 +32,7 @@ public class AttributeDataType extends DataType {
EMPTY_STRING, -1);
}
- public AttributeDataType(String typeId, String name, String baseAttributeClass, String defaultValue, String fileTypeExtension, int maxOccurrence, int minOccurrence, String providerAttributeClass, String taggerId, String toolTipText, int enumTypeId) {
+ public AttributeDataType(String typeId, String name, String baseAttributeClass, String defaultValue, String fileTypeExtension, int maxOccurrence, int minOccurrence, String providerAttributeClass, String taggerId, String toolTipText, long enumTypeId) {
super(typeId, name);
this.baseAttributeClass = baseAttributeClass;
this.defaultValue = defaultValue;
@@ -45,7 +45,7 @@ public class AttributeDataType extends DataType {
this.enumTypeId = enumTypeId;
}
- public AttributeDataType(String name, String baseAttributeClass, String defaultValue, String fileTypeExtension, int maxOccurrence, int minOccurrence, String providerAttributeClass, String taggerId, String toolTipText, int enumTypeId) {
+ public AttributeDataType(String name, String baseAttributeClass, String defaultValue, String fileTypeExtension, int maxOccurrence, int minOccurrence, String providerAttributeClass, String taggerId, String toolTipText, long enumTypeId) {
this(EMPTY_STRING, name, baseAttributeClass, defaultValue, fileTypeExtension, maxOccurrence, minOccurrence,
providerAttributeClass, taggerId, toolTipText, enumTypeId);
}
@@ -67,14 +67,14 @@ public class AttributeDataType extends DataType {
/**
* @return the enumTypeId
*/
- public int getEnumTypeId() {
+ public long getEnumTypeId() {
return enumTypeId;
}
/**
* @param enumTypeId the enumTypeId to set
*/
- public void setEnumTypeId(int enumTypeId) {
+ public void setEnumTypeId(long enumTypeId) {
this.enumTypeId = enumTypeId;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/AttributePropertySource.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/AttributePropertySource.java
index 63232f3e5ce..c158c079ac1 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/AttributePropertySource.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/AttributePropertySource.java
@@ -115,7 +115,7 @@ public class AttributePropertySource extends ModelPropertySource {
return StringPropertyDescriptor.fromModel(getDataTypeElement().getDefaultValue());
}
if (id == idEnumType) {
- int enumTypeId = getDataTypeElement().getEnumTypeId();
+ long enumTypeId = getDataTypeElement().getEnumTypeId();
try {
return EnumeratedAttributeValuesPropertyDescriptor.fromModel(OseeEnumTypeManager.getType(enumTypeId).getName());
} catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java
index 33d17058a20..2a721c39e7b 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/property/EnumPropertySource.java
@@ -59,7 +59,7 @@ public class EnumPropertySource extends ModelPropertySource {
@Override
public Object getPropertyValue(Object id) {
if (id == idEnumTypeList) {
- int enumTypeId = getDataTypeElement().getEnumTypeId();
+ long enumTypeId = getDataTypeElement().getEnumTypeId();
OseeEnumType enumType = null;
String descriptor = "";
try {

Back to the top