diff options
35 files changed, 72 insertions, 78 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index 67d54b5e2..163a6d3af 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -15,12 +15,11 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.director", - org.eclipse.equinox.internal.provisional.p2.metadata; + org.eclipse.equinox.p2.director", + org.eclipse.equinox.internal.p2.metadata.query; x-friends:="org.eclipse.equinox.p2.artifact.optimizers, org.eclipse.equinox.p2.artifact.processors, org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.console, org.eclipse.equinox.p2.core, org.eclipse.equinox.p2.director, org.eclipse.equinox.p2.director.app, @@ -35,24 +34,28 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.metadata.generator, org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.operations, - org.eclipse.equinox.p2.publisher, org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.reconciler.dropins, org.eclipse.equinox.p2.touchpoint.eclipse, org.eclipse.equinox.p2.touchpoint.natives, org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.ui.admin, + org.eclipse.equinox.p2.ui.admin.rcp, org.eclipse.equinox.p2.ui.sdk, org.eclipse.equinox.p2.ui.sdk.scheduler, org.eclipse.equinox.p2.updatechecker, org.eclipse.equinox.p2.updatesite, + org.eclipse.equinox.p2.console, + org.eclipse.equinox.p2.publisher, org.eclipse.pde.ui, org.eclipse.equinox.p2.repository.tools, org.eclipse.pde.core", - org.eclipse.equinox.internal.provisional.p2.metadata.query; + org.eclipse.equinox.internal.p2.query;x-friends:="org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.ui", + org.eclipse.equinox.internal.provisional.p2.metadata; x-friends:="org.eclipse.equinox.p2.artifact.optimizers, org.eclipse.equinox.p2.artifact.processors, org.eclipse.equinox.p2.artifact.repository, + org.eclipse.equinox.p2.console, org.eclipse.equinox.p2.core, org.eclipse.equinox.p2.director, org.eclipse.equinox.p2.director.app, @@ -67,24 +70,23 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.metadata.generator, org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.operations, + org.eclipse.equinox.p2.publisher, org.eclipse.equinox.p2.ql, org.eclipse.equinox.p2.reconciler.dropins, org.eclipse.equinox.p2.touchpoint.eclipse, org.eclipse.equinox.p2.touchpoint.natives, org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.ui.admin, - org.eclipse.equinox.p2.ui.admin.rcp, org.eclipse.equinox.p2.ui.sdk, org.eclipse.equinox.p2.ui.sdk.scheduler, org.eclipse.equinox.p2.updatechecker, org.eclipse.equinox.p2.updatesite, - org.eclipse.equinox.p2.console, - org.eclipse.equinox.p2.publisher, org.eclipse.pde.ui, org.eclipse.equinox.p2.repository.tools, org.eclipse.pde.core", org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query + org.eclipse.equinox.p2.metadata.query, + org.eclipse.equinox.p2.query Import-Package: org.eclipse.osgi.service.localization;version="1.0.0", org.eclipse.osgi.util, org.osgi.framework;version="1.3.0" diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Copyright.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Copyright.java index e4dc99ad0..b56578830 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Copyright.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Copyright.java @@ -10,9 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import org.eclipse.equinox.p2.metadata.ICopyright; - import java.net.URI; +import org.eclipse.equinox.p2.metadata.ICopyright; /** * The <code>Copyright</code> class represents a software copyright. A copyright has diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/IRequiredCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/IRequiredCapability.java index ba6a5425f..6bdff18a5 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/IRequiredCapability.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/IRequiredCapability.java @@ -11,9 +11,9 @@ package org.eclipse.equinox.internal.p2.metadata; import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability; import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IMatchQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IRequirement; +import org.eclipse.equinox.p2.query.IMatchQuery; /** * A required capability represents some external constraint on an {@link IInstallableUnit}. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java index 3d815a727..b1c62fd0d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java @@ -11,15 +11,12 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import java.util.Collection; -import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense; - import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; public class InstallableUnit implements IInstallableUnit { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/LDAPQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/LDAPQuery.java index 6596b4fff..c6c14bfae 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/LDAPQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/LDAPQuery.java @@ -1,8 +1,8 @@ package org.eclipse.equinox.internal.p2.metadata; import java.util.Iterator; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.p2.query.IQuery; +import org.eclipse.equinox.p2.query.IQueryResult; public class LDAPQuery implements IQuery<Boolean> { private String filter; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/RequiredCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/RequiredCapability.java index 9f6068ac6..c17f9dd3d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/RequiredCapability.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/RequiredCapability.java @@ -14,10 +14,10 @@ package org.eclipse.equinox.internal.p2.metadata; import org.eclipse.core.runtime.Assert; import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability; import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IRequirement; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A required capability represents some external constraint on an {@link IInstallableUnit}. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java index 6ac399e15..76207d795 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java @@ -11,14 +11,11 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import java.util.Collection; -import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense; - import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; public class ResolvedInstallableUnit implements IInstallableUnit { private static IInstallableUnitFragment[] NO_IU = new IInstallableUnitFragment[0]; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointData.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointData.java index 6c3ed7ce6..2bb12e79e 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointData.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointData.java @@ -11,7 +11,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import java.util.*; +import java.util.Collections; +import java.util.Map; import java.util.Map.Entry; import org.eclipse.equinox.internal.provisional.p2.metadata.*; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TranslationSupport.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TranslationSupport.java index 76148b18d..d9b19ea66 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TranslationSupport.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TranslationSupport.java @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.provisional.p2.metadata.*; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.*; import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.*; +import org.eclipse.equinox.p2.metadata.query.FragmentQuery; +import org.eclipse.equinox.p2.query.*; import org.eclipse.osgi.service.localization.LocaleProvider; /** diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IUPropertyQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/IUPropertyQuery.java index dfd02c4b0..95f3f3375 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IUPropertyQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/IUPropertyQuery.java @@ -8,9 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.internal.p2.metadata.query; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query that searches for {@link IInstallableUnit} instances that have diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/LatestIUVersionQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/LatestIUVersionQuery.java index 1a6f66b48..fe79d9404 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/LatestIUVersionQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/LatestIUVersionQuery.java @@ -7,11 +7,11 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.internal.p2.metadata.query; import java.util.*; import org.eclipse.equinox.p2.metadata.IVersionedId; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.p2.query.*; /** * This query returns the latest version for each unique VersionedID. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ObjectMatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/ObjectMatchQuery.java index 9fe833156..f48e50aac 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ObjectMatchQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/ObjectMatchQuery.java @@ -8,7 +8,9 @@ * Contributors: * Cloudsmith Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.internal.p2.metadata.query; + +import org.eclipse.equinox.p2.query.MatchQuery; /** * Special implementation for use without generic support diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/UpdateQuery.java index 2d5a2095f..2a58b8bf9 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/query/UpdateQuery.java @@ -8,12 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.internal.p2.metadata.query; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnitPatch; import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IRequirement; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query that finds all IUs that are considered an "Update" of the diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/query/QueryHelpers.java index 06579fa57..794ceff2b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/QueryHelpers.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/query/QueryHelpers.java @@ -7,11 +7,12 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.internal.p2.query; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; /** * Static helper methods for the Query API. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java index e27c1e946..dfeeca879 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.metadata.*; import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; /** * A factory class for instantiating various p2 metadata objects. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java index 5111f0635..9dd0dd64b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.p2.metadata; import java.util.*; import org.eclipse.equinox.internal.provisional.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; /** * An installable unit represents an atomic, indivisible unit of installable functionality diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java index e1fa2ee06..39619541b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.equinox.p2.metadata; -import org.eclipse.equinox.p2.metadata.query.IQuery; +import org.eclipse.equinox.p2.query.IQuery; /** * @noimplement This interface is not intended to be implemented by clients. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryMemberQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryMemberQuery.java index b90fb46a3..d6324d360 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryMemberQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryMemberQuery.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.p2.metadata.query; import java.util.Collection; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IRequirement; +import org.eclipse.equinox.p2.query.MatchQuery; /** /** diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryQuery.java index 92cfc143d..d1d86f912 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CategoryQuery.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.p2.metadata.query; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; +import org.eclipse.equinox.internal.p2.metadata.query.IUPropertyQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query matching every {@link IInstallableUnit} that is a category. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/FragmentQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/FragmentQuery.java index 4c77258ec..5fca2b13b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/FragmentQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/FragmentQuery.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.equinox.p2.metadata.query; +import org.eclipse.equinox.internal.p2.metadata.query.IUPropertyQuery; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnitFragment; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query matching every {@link IInstallableUnit} that is a category. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/GroupQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/GroupQuery.java index 84c2854e0..298b04a2f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/GroupQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/GroupQuery.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.p2.metadata.query; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; +import org.eclipse.equinox.internal.p2.metadata.query.IUPropertyQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query matching every {@link IInstallableUnit} that is a group. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/InstallableUnitQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/InstallableUnitQuery.java index ee3fcff71..67be63c11 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/InstallableUnitQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/InstallableUnitQuery.java @@ -8,12 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.metadata.query; import org.eclipse.equinox.internal.provisional.p2.metadata.Version; import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IVersionedId; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query that matches on the id and version of an {@link IInstallableUnit}. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/PatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/PatchQuery.java index 0b8290b05..d066db376 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/PatchQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/PatchQuery.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.p2.metadata.query; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery; +import org.eclipse.equinox.internal.p2.metadata.query.IUPropertyQuery; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.query.MatchQuery; /** * A query matching every {@link IInstallableUnit} that is a patch. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/Collector.java index 5c9a07ded..9a9237bf2 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/Collector.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/Collector.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation * EclipseSource - ongoing development *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.lang.reflect.Array; import java.util.*; @@ -17,8 +17,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.metadata.Messages; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; /** * A collector is a generic visitor that collects objects passed to it, diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundQuery.java index ae5d360f6..0fa69fb88 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundQuery.java @@ -9,13 +9,12 @@ * IBM Corporation - initial API and implementation * EclipseSource - ongoing development *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.lang.reflect.Array; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.internal.p2.query.QueryHelpers; /** * A query that combines a group of sub-queries.<P> diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundQueryable.java index 1952f2403..926776d2f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CompoundQueryable.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundQueryable.java @@ -7,14 +7,15 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; + + + import java.lang.reflect.Array; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; /** * A queryable that holds a number of other IQueryables and provides diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/ContextQuery.java index 420c3f97e..df9d8ede4 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ContextQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/ContextQuery.java @@ -7,11 +7,12 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; + + import java.util.Iterator; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.internal.p2.query.QueryHelpers; /** * ContextQuery is the abstract superclass for Queries that require the entire diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ICompositeQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/ICompositeQuery.java index 8547b020b..6b06733dc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/ICompositeQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/ICompositeQuery.java @@ -7,10 +7,10 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; + import java.util.List; -import org.eclipse.equinox.p2.metadata.query.IQuery; /** * A query that contains a number of sub queries. All queries that support sub-queries diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java index 87f0d613b..517dc1799 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IMatchQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java @@ -7,9 +7,8 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; -import org.eclipse.equinox.p2.metadata.query.IQuery; /** * A query in which the elements can be evaluated by calling isMatch on. Each diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/IQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQuery.java index e3d3f044b..9c61de05f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/IQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQuery.java @@ -9,10 +9,10 @@ * IBM Corporation - initial API and implementation * EclipseSource - ongoing development *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.query; +package org.eclipse.equinox.p2.query; + import java.util.Iterator; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQueryable; /** * The superclass of all queries that can be performed on an {@link IQueryable}. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/IQueryResult.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryResult.java index 79cf9b952..12e0cbf1c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/IQueryResult.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryResult.java @@ -7,11 +7,10 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.util.Iterator; import java.util.Set; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.IQueryable; /** * An IQueryResult represents the results of a query. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryable.java index e43a54a97..e033e993c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/IQueryable.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryable.java @@ -8,11 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; /** * An IQueryable contains objects, and is able to perform queries on those objects. diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/LimitQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/LimitQuery.java index 867994c90..daba0a360 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/LimitQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/LimitQuery.java @@ -7,11 +7,9 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.util.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; /** * A limit query can be used to limit the number of query results returned. Once diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/MatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java index ec211b916..234df5072 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/MatchQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/MatchQuery.java @@ -8,10 +8,10 @@ * EclipseSource - initial API and implementation * IBM Corporation - ongoing development ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.util.Iterator; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.internal.p2.query.QueryHelpers; /** * This class represents the superclass of most of p2's queries. Every element diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/PipedQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/PipedQuery.java index 429e83e46..8b23a4ddc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/PipedQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/PipedQuery.java @@ -7,11 +7,10 @@ * Contributors: * EclipseSource - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata.query; +package org.eclipse.equinox.p2.query; import java.util.*; -import org.eclipse.equinox.p2.metadata.query.IQuery; -import org.eclipse.equinox.p2.metadata.query.IQueryResult; +import org.eclipse.equinox.internal.p2.query.QueryHelpers; /** * A PipedQuery is an aggregate query in which each sub-query |