diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal')
11 files changed, 53 insertions, 55 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java index 98832facbd4..9548c580ba8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal; +import com.google.common.collect.Sets; import java.util.Collections; import java.util.Set; import java.util.concurrent.Callable; @@ -35,7 +36,6 @@ import org.eclipse.osee.orcs.OrcsTypes; import org.eclipse.osee.orcs.SystemPreferences; import org.eclipse.osee.orcs.core.ds.DataModule; import org.eclipse.osee.orcs.core.ds.OrcsDataStore; -import org.eclipse.osee.orcs.core.internal.artifact.Artifact; import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory; import org.eclipse.osee.orcs.core.internal.attribute.AttributeClassRegistry; import org.eclipse.osee.orcs.core.internal.attribute.AttributeClassResolver; @@ -48,7 +48,6 @@ import org.eclipse.osee.orcs.core.internal.graph.impl.GraphFactoryImpl; import org.eclipse.osee.orcs.core.internal.indexer.IndexerModule; import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager; import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.RelationFactory; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; import org.eclipse.osee.orcs.core.internal.relation.RelationManagerFactory; @@ -76,7 +75,6 @@ import org.eclipse.osee.orcs.search.BranchQuery; import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.search.QueryIndexer; import org.eclipse.osee.orcs.transaction.TransactionFactory; -import com.google.common.collect.Sets; /** * @author Roberto E. Escobar @@ -180,18 +178,9 @@ public class OrcsApiImpl implements OrcsApi { }; - ProxyProvider proxyProvider = new ProxyProvider() { - - @Override - public Artifact getInternalArtifact(ArtifactReadable external) { - return proxyManager.asInternalArtifact(external); - } - - }; - RelationNodeLoader nodeLoader = new RelationNodeLoaderImpl(module.getDataLoaderFactory(), graphBuilderFactory); RelationManager relationManager = RelationManagerFactory.createRelationManager(logger, - orcsTypes.getRelationTypes(), relationFactory, nodeLoader, queryModuleProvider, proxyProvider); + orcsTypes.getRelationTypes(), relationFactory, nodeLoader, queryModuleProvider); TupleFactory tupleFactory = new TupleFactory(module.getDataFactory()); TupleManager tupleManager = TupleManagerFactory.createTupleManager(tupleFactory); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java index 269f3a34aba..a7f75bb86a8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java @@ -17,6 +17,7 @@ import org.eclipse.osee.console.admin.Console; import org.eclipse.osee.console.admin.ConsoleCommand; import org.eclipse.osee.console.admin.ConsoleParameters; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.HexUtil; @@ -84,7 +85,7 @@ public class PurgeRelationTypeCommand implements ConsoleCommand { for (String uuid : typesToPurge) { try { Long typeId = HexUtil.toLong(uuid); - IRelationType type = relationTypes.get(typeId); + RelationTypeToken type = relationTypes.get(typeId); console.writeln("Type [%s] found. Id: [%s]", type.getName(), type.getId()); toReturn.add(type); } catch (OseeArgumentException ex) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java index 76c67147fe1..63a788042ef 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java @@ -12,6 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation; import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -45,7 +46,7 @@ public class Relation implements HasOrcsData<RelationData>, OrcsWriteable { this.relationData = data; } - public IRelationType getRelationType() throws OseeCoreException { + public RelationTypeToken getRelationType() throws OseeCoreException { return relationTypes.get(getOrcsData().getTypeUuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java index 033bc8b310d..fa2c2459a36 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java @@ -11,7 +11,6 @@ package org.eclipse.osee.orcs.core.internal.relation; import org.eclipse.osee.logger.Log; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.impl.RelationManagerImpl; import org.eclipse.osee.orcs.core.internal.relation.impl.RelationResolverImpl; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; @@ -29,7 +28,7 @@ public final class RelationManagerFactory { // Static Factory } - public static RelationManager createRelationManager(Log logger, RelationTypes relationTypes, RelationFactory relationFactory, RelationNodeLoader loader, QueryModuleProvider provider, ProxyProvider proxy) { + public static RelationManager createRelationManager(Log logger, RelationTypes relationTypes, RelationFactory relationFactory, RelationNodeLoader loader, QueryModuleProvider provider) { OrderParser orderParser = new OrderParser(relationTypes); SorterProvider sorterProvider = new SorterProvider(relationTypes); OrderManagerFactory orderManagerFactory = new OrderManagerFactory(orderParser, sorterProvider); @@ -37,6 +36,7 @@ public final class RelationManagerFactory { RelationResolver resolver = new RelationResolverImpl(loader); RelationTypeValidity validity = new RelationTypeValidity(relationTypes); - return new RelationManagerImpl(logger, validity, resolver, relationFactory, orderManagerFactory, provider, proxy); + return new RelationManagerImpl(logger, validity, resolver, relationFactory, orderManagerFactory, provider, + relationTypes); } } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java index 94d5d3608fe..f3b696fe710 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -37,7 +38,7 @@ public class RelationTypeValidity { this.relationTypes = relationTypes; } - public void checkRelationTypeMultiplicity(IRelationType type, RelationNode node, RelationSide side, int count) throws OseeCoreException { + public void checkRelationTypeMultiplicity(RelationTypeToken type, RelationNode node, RelationSide side, int count) throws OseeCoreException { MultiplicityState state = getRelationMultiplicityState(type, side, count); switch (state) { case MAX_VIOLATION: @@ -78,7 +79,7 @@ public class RelationTypeValidity { return toReturn; } - public MultiplicityState getRelationMultiplicityState(IRelationType type, RelationSide side, int count) throws OseeCoreException { + public MultiplicityState getRelationMultiplicityState(RelationTypeToken type, RelationSide side, int count) throws OseeCoreException { Conditions.checkNotNull(type, "type"); Conditions.checkNotNull(side, "relationSide"); checkTypeExists(type); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java index e1d400e46ec..81769965c6c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.relation.impl; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; -import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING; -import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.DEFAULT_HIERARCHY; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.IS_CHILD; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.IS_PARENT; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A; import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B; +import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING; +import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED; import static org.eclipse.osee.framework.jdk.core.util.Conditions.checkNotNull; import static org.eclipse.osee.framework.jdk.core.util.Strings.emptyString; import static org.eclipse.osee.orcs.core.internal.util.OrcsConditions.checkBranch; @@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; @@ -49,7 +50,6 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.graph.GraphData; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.Relation; import org.eclipse.osee.orcs.core.internal.relation.RelationFactory; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; @@ -62,6 +62,7 @@ import org.eclipse.osee.orcs.core.internal.relation.order.OrderManager; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; import org.eclipse.osee.orcs.core.internal.search.QueryModule.QueryModuleProvider; import org.eclipse.osee.orcs.data.ArtifactReadable; +import org.eclipse.osee.orcs.data.RelationTypes; /** * @author Andrew M. Finkbeiner @@ -75,17 +76,16 @@ public class RelationManagerImpl implements RelationManager { private final RelationFactory relationFactory; private final OrderManagerFactory orderFactory; private final QueryModuleProvider provider; - private final ProxyProvider proxy; + private final RelationTypes relationTypes; - public RelationManagerImpl(Log logger, RelationTypeValidity validity, RelationResolver resolver, RelationFactory relationFactory, OrderManagerFactory orderFactory, QueryModuleProvider queryProvider, ProxyProvider proxyProvider) { - super(); + public RelationManagerImpl(Log logger, RelationTypeValidity validity, RelationResolver resolver, RelationFactory relationFactory, OrderManagerFactory orderFactory, QueryModuleProvider queryProvider, RelationTypes relationTypes) { this.logger = logger; this.validity = validity; this.resolver = resolver; this.relationFactory = relationFactory; this.orderFactory = orderFactory; this.provider = queryProvider; - this.proxy = proxyProvider; + this.relationTypes = relationTypes; } @Override @@ -131,7 +131,7 @@ public class RelationManagerImpl implements RelationManager { toReturn = container.getExistingTypes(DeletionFlag.EXCLUDE_DELETED); } else { logger.warn("Unable to find relation container for [%s]", node.getExceptionString()); - toReturn = Collections.<IRelationType> emptyList(); + toReturn = Collections.emptyList(); } return toReturn; } @@ -179,7 +179,7 @@ public class RelationManagerImpl implements RelationManager { result = resolver.resolve(session, graph, links, otherSide); if (result.size() > 1) { OrderManager orderManager = orderFactory.createOrderManager(node); - RelationTypeSide key = RelationTypeSide.create(type, otherSide); + RelationTypeSide key = RelationTypeSide.create(relationTypes.get(type), otherSide); orderManager.sort(key, result); } } @@ -269,16 +269,16 @@ public class RelationManagerImpl implements RelationManager { int bSideMax = validity.getMaximumRelationsAllowed(type, bNode.getArtifactType(), SIDE_B); if (bSideCount >= bSideMax) { - throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type.getName(), - SIDE_B, aNode.getExceptionString()); + throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type, SIDE_B, + aNode.getExceptionString()); } int aSideCount = getRelations(session, type, bNode, SIDE_B, EXCLUDE_DELETED).size(); int aSideMax = validity.getMaximumRelationsAllowed(type, aNode.getArtifactType(), SIDE_A); if (aSideCount >= aSideMax) { - throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type.getName(), - SIDE_A, bNode.getExceptionString()); + throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type, SIDE_A, + bNode.getExceptionString()); } } @@ -340,10 +340,10 @@ public class RelationManagerImpl implements RelationManager { node.delete(); if (relations != null && !relations.isEmpty()) { - Map<IRelationType, RelationSide> typesToRemove = new HashMap<>(); + Map<RelationTypeToken, RelationSide> typesToRemove = new HashMap<>(); for (Relation relation : relations) { relation.delete(); - IRelationType type = relation.getRelationType(); + RelationTypeToken type = relation.getRelationType(); RelationSide otherSide = relation.getLocalIdForSide(SIDE_A) == node.getLocalId() ? SIDE_B : SIDE_A; typesToRemove.put(type, otherSide); } @@ -351,8 +351,8 @@ public class RelationManagerImpl implements RelationManager { if (!typesToRemove.isEmpty()) { OrderManager orderManager = orderFactory.createOrderManager(node); - for (Entry<IRelationType, RelationSide> entry : typesToRemove.entrySet()) { - IRelationType type = entry.getKey(); + for (Entry<RelationTypeToken, RelationSide> entry : typesToRemove.entrySet()) { + RelationTypeToken type = entry.getKey(); RelationSide side = entry.getValue(); List<Relation> sideLinks = getRelations(session, type, node, side, EXCLUDE_DELETED); @@ -434,7 +434,7 @@ public class RelationManagerImpl implements RelationManager { OrderManager orderManager = orderFactory.createOrderManager(node1); RelationSide orderSide = side.oppositeSide(); - RelationTypeSide key = RelationTypeSide.create(type, orderSide); + RelationTypeSide key = RelationTypeSide.create(relationTypes.get(type), orderSide); RelationSorter sorterIdToUse = sorterId; if (sorterIdToUse == PREEXISTING) { sorterIdToUse = orderManager.getSorterId(key); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java index 66852b5c57f..2cdac7f1ef5 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java @@ -26,8 +26,8 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -110,9 +110,9 @@ public class OrderParser { } // TODO don't store relation type by name - use type UUID - IRelationType type = Iterables.find(relationCache.getAll(), new Predicate<IRelationType>() { + RelationTypeToken type = Iterables.find(relationCache.getAll(), new Predicate<RelationTypeToken>() { @Override - public boolean apply(IRelationType type) { + public boolean apply(RelationTypeToken type) { return type.getName().equalsIgnoreCase(relationTypeName); } }); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java index b74178e5dda..59c0877c857 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -139,9 +140,9 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } } - private IRelationType getRelationType(String name) { - IRelationType toReturn = null; - for (IRelationType type : orcsTypes.getRelationTypes().getAll()) { + private RelationTypeToken getRelationType(String name) { + RelationTypeToken toReturn = null; + for (RelationTypeToken type : orcsTypes.getRelationTypes().getAll()) { if (type.getName().equals(name)) { toReturn = type; break; @@ -693,7 +694,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { Class<?> clazz = resolver.resolveTypeSingle(expression); if (clazz.isAssignableFrom(String.class)) { String name = resolver.resolveSingle(String.class, expression); - IRelationType type = getRelationType(name); + RelationTypeToken type = getRelationType(name); toReturn = RelationTypeSide.create(type, asSide(side)); } else { long typeId = resolver.resolveSingle(Long.class, expression); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java index 2cb67699a60..e1188896222 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java @@ -21,10 +21,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.eclipse.emf.common.util.EList; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.OseeDslResource; import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil; @@ -147,8 +148,7 @@ public class OrcsTypesIndexer { } private void indexAttributes(ArtifactTypeIndex artifactTypeIndex, AttributeTypeIndex attributeTypeIndex, XArtifactType dslType) throws OseeCoreException { - Map<BranchId, Collection<IAttributeType>> validAttributes = - new HashMap<BranchId, Collection<IAttributeType>>(); + Map<BranchId, Collection<IAttributeType>> validAttributes = new HashMap<BranchId, Collection<IAttributeType>>(); for (XAttributeTypeRef xAttributeTypeRef : dslType.getValidAttributeTypes()) { XAttributeType xAttributeType = xAttributeTypeRef.getValidAttributeType(); BranchId branch = getAttributeBranch(xAttributeTypeRef); @@ -190,7 +190,7 @@ public class OrcsTypesIndexer { } private IRelationType getOrCreateToken(RelationTypeIndex index, XRelationType dslType) throws OseeCoreException { - IRelationType token = index.getTokenByDslType(dslType); + RelationTypeToken token = index.getTokenByDslType(dslType); if (token == null) { long id = HexUtil.toLong(dslType.getUuid()); token = TokenFactory.createRelationType(id, dslType.getName()); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java index e7dd6fbe43b..9bd44f13b4c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java @@ -12,6 +12,7 @@ package org.eclipse.osee.orcs.core.internal.types.impl; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactType; import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -19,7 +20,7 @@ import org.eclipse.osee.framework.core.enums.RelationSide; /** * @author Roberto E. Escobar */ -public class RelationTypeIndex extends TokenTypeIndex<IRelationType, XRelationType> { +public class RelationTypeIndex extends TokenTypeIndex<RelationTypeToken, XRelationType> { private final ArtifactTypeIndex artifactTypeIndex; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java index 2461e53ee41..28b85ba162f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java @@ -13,6 +13,7 @@ package org.eclipse.osee.orcs.core.internal.types.impl; import java.util.Collection; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; @@ -44,17 +45,20 @@ public class RelationTypesImpl implements RelationTypes { } @Override - public Collection<? extends IRelationType> getAll() throws OseeCoreException { + public Collection<? extends RelationTypeToken> getAll() throws OseeCoreException { return provider.getRelationTypeIndex().getAllTokens(); } @Override - public IRelationType get(Id id) { + public RelationTypeToken get(Id id) { + if (id instanceof RelationTypeToken) { + return (RelationTypeToken) id; + } return provider.getRelationTypeIndex().get(id); } @Override - public IRelationType get(Long id) { + public RelationTypeToken get(Long id) { return provider.getRelationTypeIndex().get(id); } |