Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2011-05-18 22:44:29 +0000
committerRyan D. Brooks2011-05-18 22:44:29 +0000
commit9341e8ff9ae5c0fcc4d5e3db5b010a82ddade1c8 (patch)
tree05e4782340e9910ba25ebe6ff1964169db84fa0b
parent3afd175f6f5a06036973d92002bebd7474e11d5a (diff)
downloadorg.eclipse.osee-9341e8ff9ae5c0fcc4d5e3db5b010a82ddade1c8.tar.gz
org.eclipse.osee-9341e8ff9ae5c0fcc4d5e3db5b010a82ddade1c8.tar.xz
org.eclipse.osee-9341e8ff9ae5c0fcc4d5e3db5b010a82ddade1c8.zip
bug[ats_LCBBP]: Fix osee type exception message
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java25
1 files changed, 19 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
index c250e04c70d..7d21ebfb400 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
@@ -26,6 +26,10 @@ import org.eclipse.osee.framework.branch.management.internal.Activator;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.AbstractOseeType;
+import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -92,6 +96,18 @@ public class DbTableSaxHandler extends BaseDbSaxHandler {
}
}
+ private int getTypeId(AbstractOseeCache<? extends AbstractOseeType> cache, Map<String, String> fieldMap) throws OseeCoreException {
+ Conditions.checkNotNull(cache, "cache");
+ String guid = fieldMap.get(ExchangeDb.TYPE_GUID);
+ AbstractOseeType typeObject = cache.getByGuid(guid);
+ Conditions.checkNotNull(typeObject, "type", "type [%s] was not found in cache [%s]", guid, cache.getCacheId());
+ return typeObject.getId();
+ }
+
+ private IOseeCachingService getCachingService() {
+ return services.getCachingService();
+ }
+
@Override
protected void processData(Map<String, String> fieldMap) throws OseeCoreException {
boolean process = true;
@@ -119,20 +135,17 @@ public class DbTableSaxHandler extends BaseDbSaxHandler {
}
if (exportItem.equals(ExportItem.OSEE_ARTIFACT_DATA)) {
- int typeId =
- services.getCachingService().getArtifactTypeCache().getByGuid(fieldMap.get(ExchangeDb.TYPE_GUID)).getId();
+ int typeId = getTypeId(getCachingService().getArtifactTypeCache(), fieldMap);
fieldMap.put("art_type_id", String.valueOf(typeId));
}
if (exportItem.equals(ExportItem.OSEE_ATTRIBUTE_DATA)) {
- int typeId =
- services.getCachingService().getAttributeTypeCache().getByGuid(fieldMap.get(ExchangeDb.TYPE_GUID)).getId();
+ int typeId = getTypeId(getCachingService().getAttributeTypeCache(), fieldMap);
fieldMap.put("attr_type_id", String.valueOf(typeId));
}
if (exportItem.equals(ExportItem.OSEE_RELATION_LINK_DATA)) {
- int typeId =
- services.getCachingService().getRelationTypeCache().getByGuid(fieldMap.get(ExchangeDb.TYPE_GUID)).getId();
+ int typeId = getTypeId(getCachingService().getRelationTypeCache(), fieldMap);
fieldMap.put("rel_link_type_id", String.valueOf(typeId));
}

Back to the top