diff options
| author | Thomas Hallgren | 2010-02-24 20:35:37 +0000 |
|---|---|---|
| committer | Thomas Hallgren | 2010-02-24 20:35:37 +0000 |
| commit | e659d374347a03d5662203090fa7e38a53bc2ff6 (patch) | |
| tree | 34acb0905b37c66e9c6bb3687fb81096583f31d0 /bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox | |
| parent | 67b79f8bfb9a919c49424b660d53f37240374bed (diff) | |
| download | rt.equinox.p2-e659d374347a03d5662203090fa7e38a53bc2ff6.tar.gz rt.equinox.p2-e659d374347a03d5662203090fa7e38a53bc2ff6.tar.xz rt.equinox.p2-e659d374347a03d5662203090fa7e38a53bc2ff6.zip | |
302201 : Unify the two query approaches used in p2, step 6.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java index db332331b..6088c3873 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java @@ -27,6 +27,7 @@ import org.eclipse.equinox.internal.p2.artifact.repository.Messages; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.metadata.expression.CompoundIterator; +import org.eclipse.equinox.internal.p2.metadata.index.IndexProvider; import org.eclipse.equinox.internal.p2.repository.RepositoryTransport; import org.eclipse.equinox.internal.p2.repository.Transport; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; @@ -34,7 +35,8 @@ import org.eclipse.equinox.internal.provisional.p2.repository.IStateful; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.ProvisionException; import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.index.*; +import org.eclipse.equinox.p2.metadata.index.IIndex; +import org.eclipse.equinox.p2.metadata.index.IIndexProvider; import org.eclipse.equinox.p2.query.*; import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.equinox.p2.repository.artifact.*; @@ -1002,7 +1004,7 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme } public synchronized IQueryResult<IArtifactKey> query(IQuery<IArtifactKey> query, IProgressMonitor monitor) { - return query instanceof IQueryWithIndex<?> ? ((IQueryWithIndex<IArtifactKey>) query).perform(this) : query.perform(artifactMap.keySet().iterator()); + return IndexProvider.query(this, query, monitor); } public Iterator<IArtifactKey> everything() { |