Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-01-09 18:29:17 +0000
committerDavid W. Miller2017-01-09 18:29:17 +0000
commit23bbaa62d49a7061811b86e7a7487d320784134e (patch)
tree358b2f9dbb930ed4d6bc056299ea86aeb3b419ce /plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee
parent5f076c76978c551fe717c0f7e1fe76de8040cdc9 (diff)
downloadorg.eclipse.osee-23bbaa62d49a7061811b86e7a7487d320784134e.tar.gz
org.eclipse.osee-23bbaa62d49a7061811b86e7a7487d320784134e.tar.xz
org.eclipse.osee-23bbaa62d49a7061811b86e7a7487d320784134e.zip
refactor: Remove IAttributeType usage from AttributeTypes
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee')
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/QueryEngineIndexerImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/QueryEngineIndexerImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/QueryEngineIndexerImpl.java
index 09ae2a3e00b..dfae521f172 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/QueryEngineIndexerImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/QueryEngineIndexerImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.AttributeTypeId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.jdbc.JdbcClient;
import org.eclipse.osee.jdbc.JdbcConstants;
@@ -72,7 +72,7 @@ public class QueryEngineIndexerImpl implements QueryEngineIndexer {
}
@Override
- public CancellableCallable<Integer> indexBranches(OrcsSession session, AttributeTypes types, Collection<? extends IAttributeType> typeToTag, Set<BranchReadable> branches, boolean indexOnlyMissing, IndexerCollector... collector) {
+ public CancellableCallable<Integer> indexBranches(OrcsSession session, AttributeTypes types, Collection<? extends AttributeTypeId> typeToTag, Set<BranchReadable> branches, boolean indexOnlyMissing, IndexerCollector... collector) {
return new IndexBranchesDatabaseCallable(logger, session, jdbcClient, joinFactory, types, consumer,
merge(collector), typeToTag, branches, indexOnlyMissing);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
index b98de0a13f2..02416e83268 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/producer/IndexBranchesDatabaseCallable.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
-import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.AttributeTypeId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Triplet;
import org.eclipse.osee.jdbc.JdbcClient;
@@ -64,10 +64,10 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
private final IndexingTaskConsumer consumer;
private final IndexerCollector collector;
private final Collection<BranchReadable> branches;
- private final Collection<? extends IAttributeType> typesToTag;
+ private final Collection<? extends AttributeTypeId> typesToTag;
private final boolean tagOnlyMissingGammas;
- public IndexBranchesDatabaseCallable(Log logger, OrcsSession session, JdbcClient service, SqlJoinFactory joinFactory, AttributeTypes types, IndexingTaskConsumer consumer, IndexerCollector collector, Collection<? extends IAttributeType> typesToTag, Collection<BranchReadable> branches, boolean tagOnlyMissingGammas) {
+ public IndexBranchesDatabaseCallable(Log logger, OrcsSession session, JdbcClient service, SqlJoinFactory joinFactory, AttributeTypes types, IndexingTaskConsumer consumer, IndexerCollector collector, Collection<? extends AttributeTypeId> typesToTag, Collection<BranchReadable> branches, boolean tagOnlyMissingGammas) {
super(logger, session, service);
this.joinFactory = joinFactory;
this.types = types;
@@ -95,7 +95,7 @@ public final class IndexBranchesDatabaseCallable extends AbstractDatastoreCallab
String searchQuery = data.getSecond();
Object[] params = data.getThird();
- for (IAttributeType attributeType : typesToTag) {
+ for (AttributeTypeId attributeType : typesToTag) {
if (types.isTaggable(attributeType)) {
typeJoin.add(attributeType);
}

Back to the top