diff options
4 files changed, 5 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java index d2fc576b8..4997b4692 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.equinox.internal.provisional.p2.directorywatcher; -import org.eclipse.equinox.p2.query.QueryUtil; - import java.io.File; import java.net.URI; import java.util.*; @@ -25,8 +23,7 @@ import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.publisher.*; import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction; import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction; -import org.eclipse.equinox.p2.query.IQuery; -import org.eclipse.equinox.p2.query.IQueryResult; +import org.eclipse.equinox.p2.query.*; import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.equinox.p2.repository.artifact.*; import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; @@ -220,7 +217,7 @@ public class RepositoryListener extends DirectoryChangeListener { IQuery<IInstallableUnit> removeQuery = QueryUtil.createMatchQuery( // "$1.exists(x | properties[$0] == x)", FILE_NAME, removedFiles); //$NON-NLS-1$ IQueryResult<IInstallableUnit> toRemove = metadataRepository.query(removeQuery, null); - metadataRepository.removeInstallableUnits(toRemove.toSet()); + metadataRepository.removeInstallableUnits(toRemove.unmodifiableSet()); } // Then add all the new IUs as well as the new copies of the ones that have changed Collection<IInstallableUnit> additions = iusToAdd.getIUs(null, null); diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java index ddce58730..f59487367 100644 --- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java +++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java @@ -112,7 +112,7 @@ public class InstallUpdateProductOperation implements IInstallOperation { } else { monitor.setTaskName(NLS.bind(Messages.Op_Updating, installDescription.getProductName())); IQueryResult<IInstallableUnit> toUninstall = computeUnitsToUninstall(p); - request.removeAll(toUninstall.toSet()); + request.removeAll(toUninstall.unmodifiableSet()); request.addAll(toInstall); s = director.provision(request, null, monitor.newChild(90)); } diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProvisioningSession.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProvisioningSession.java index b71e1dad6..8aab6e746 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProvisioningSession.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProvisioningSession.java @@ -12,8 +12,6 @@ package org.eclipse.equinox.p2.operations; -import org.eclipse.equinox.p2.query.QueryUtil; - import java.io.IOException; import java.util.*; import org.eclipse.core.runtime.*; @@ -313,6 +311,6 @@ public class ProvisioningSession { else query = new UserVisibleRootQuery(); IQueryResult<IInstallableUnit> queryResult = profile.query(query, null); - return queryResult.toSet(); + return queryResult.unmodifiableSet(); } } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java index 6fa0d1629..e5a724487 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java @@ -239,7 +239,7 @@ public class MirrorApplication extends AbstractApplication implements IApplicati private void mirrorMetadata(IQueryable<IInstallableUnit> slice, IProgressMonitor monitor) { IQueryResult<IInstallableUnit> allIUs = slice.query(QueryUtil.createIUAnyQuery(), monitor); - destinationMetadataRepository.addInstallableUnits(allIUs.toSet()); + destinationMetadataRepository.addInstallableUnits(allIUs.unmodifiableSet()); } /* |