diff options
author | John Arthorne | 2008-02-10 22:46:21 +0000 |
---|---|---|
committer | John Arthorne | 2008-02-10 22:46:21 +0000 |
commit | fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8 (patch) | |
tree | cbc0dd1a91f0f6079e9b8397e6e169c79490e40e /bundles/org.eclipse.equinox.p2.ui/src | |
parent | e615dae2244101e844d0851f3d9c8c754ffaffe0 (diff) | |
download | rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.tar.gz rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.tar.xz rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.zip |
Bug 218451 [prov] Rename API packages to provisional API
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui/src')
105 files changed, 450 insertions, 450 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java index 7750fd2fb..1f79038ca 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; /** * A tagging listener used to distinguish listeners diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java index 8f1123254..b2ca759c0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java @@ -14,14 +14,14 @@ import java.net.URL; import java.util.EventObject; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java index 2933d439e..5f23424e9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java @@ -11,12 +11,12 @@ package org.eclipse.equinox.internal.p2.ui; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * Adapter factory for provisioning elements diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java index 85d97124c..aa7782658 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java @@ -17,9 +17,9 @@ import java.util.List; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ISelectionProvider; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java index 3b1101ff6..433afe5ef 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.*; import org.eclipse.jface.wizard.WizardPage; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java index 0ae86e9bc..24ad43f9e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontMetrics; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java index cc5058fe2..dd0a2d5c7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java @@ -12,12 +12,12 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; public class InstallWizardPage extends UpdateOrInstallWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java index f53b6b183..96e41e4dc 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java @@ -19,17 +19,17 @@ import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.AvailableIUElement; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.operations.ProfileModificationOperation; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProfileModificationOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java index 645cc2836..a9813216a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java @@ -16,16 +16,16 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.model.RollbackProfileElement; -import org.eclipse.equinox.p2.ui.model.RollbackRepositoryElement; -import org.eclipse.equinox.p2.ui.operations.*; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackRepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java index 80e0cc572..88a5c52f8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java @@ -12,10 +12,10 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import java.util.ArrayList; import java.util.List; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java index 425f8b4ef..555d65366 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java @@ -12,12 +12,12 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; public class UninstallWizardPage extends ProfileModificationWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java index 8f0397885..bc8905ad3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.dialogs; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java index 6362d550f..477293da9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java @@ -11,9 +11,9 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; public abstract class UpdateOrInstallWizardPage extends ProfileModificationWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java index e72429e7b..e72187012 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java @@ -14,15 +14,15 @@ import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.AvailableUpdateElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.ElementQueryDescriptor; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.ElementQueryDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.equinox.p2.updatechecker.UpdateEvent; import org.eclipse.swt.widgets.Text; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java index 9b8d45b2a..af5285472 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.model; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * Element wrapper class for an artifact key and its repository @@ -31,7 +31,7 @@ public class ArtifactElement extends ProvElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java index 807231454..ff3c5b095 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java @@ -14,14 +14,14 @@ import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; @@ -104,7 +104,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getURL() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getURL() */ public URL getLocation() { return url; @@ -112,7 +112,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getName() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getName() */ public String getName() { try { @@ -127,7 +127,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getDescription() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getDescription() */ public String getDescription() { try { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java index e430148db..7f2c673f9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java @@ -11,15 +11,15 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.engine.phases.Sizing; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Element wrapper class for IU's that are available for installation. @@ -42,7 +42,7 @@ public class AvailableIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_UNINSTALLED_IU; @@ -58,7 +58,7 @@ public class AvailableIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java index 2214f4e13..a9bbdfa67 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.model; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Element wrapper class for IU's that are available for installation. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java index 5f0e7779a..82847b6dc 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.IWorkbenchAdapter; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java index 226b11038..bc77fb708 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java @@ -12,8 +12,8 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.equinox.p2.ui.query.ElementQueryDescriptor; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.ElementQueryDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java index ad166de06..e2e1b3438 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.jobs.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.RepositoryContentProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.RepositoryContentProvider; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java index e021500eb..f3c2aad39 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; import org.eclipse.jface.viewers.*; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProfileChooser.java index 6deb8db4b..21bcf5168 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProfileChooser.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IRepositoryManipulator.java index 9b2df4f01..56c829817 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IRepositoryManipulator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LicenseManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/LicenseManager.java index 72cdef824..3472a8511 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LicenseManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/LicenseManager.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Abstract class for a manager which tracks which licenses have been accepted. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProfileFactory.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProfileFactory.java index efaa0400f..9ccb5e549 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProfileFactory.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProfileFactory.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.Platform; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.osgi.service.environment.EnvironmentInfo; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java index c25e925fa..bd09699cb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -21,8 +21,8 @@ import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.ApplyProfileChangesDialog; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; -import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java index 96a7b456d..a1b7e30a1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.jface.resource.ImageDescriptor; @@ -16,7 +16,7 @@ import org.eclipse.swt.graphics.Image; /** * ProvUIImages provides convenience methods for accessing shared images - * provided by the <i>org.eclipse.equinox.p2.ui</i> plug-in. + * provided by the <i>org.eclipse.equinox.internal.provisional.p2.ui</i> plug-in. * <p> * This class provides <code>ImageDescriptor</code>s for each named image in * {@link ProvUIImages}. All <code>Image</code> objects created from the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningOperationRunner.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvisioningOperationRunner.java index 1bcbf46a4..f4c6a5914 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningOperationRunner.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvisioningOperationRunner.java @@ -9,14 +9,14 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoableOperation; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.WorkbenchJob; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/SimpleLicenseManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/SimpleLicenseManager.java index 55ecb077d..79f34c0a6 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/SimpleLicenseManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/SimpleLicenseManager.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.io.*; import java.util.HashSet; import java.util.Set; import javax.xml.parsers.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.w3c.dom.*; import org.xml.sax.SAXException; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java index 150c091dc..78cb89a00 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java @@ -9,18 +9,18 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.dialogs.InstallWizard; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstallWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/RevertAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/RevertAction.java index 9985fe1df..c967de07a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/RevertAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/RevertAction.java @@ -9,16 +9,16 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java index 20d429692..0d6462673 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java @@ -9,20 +9,20 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.IProfileChooser; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.dialogs.UninstallWizard; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UninstallWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java index d36dea0fb..67e216d81 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java @@ -9,21 +9,21 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.dialogs.UpdateWizard; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UpdateWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; @@ -78,7 +78,7 @@ public class UpdateAction extends ProfileModificationAction { * a plan until the dialog is launched. The dialog uses preferences * to determine which updates to show and which are selected by default. * (non-Javadoc) - * @see org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction#validatePlan(org.eclipse.equinox.p2.director.ProvisioningPlan) + * @see org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction#validatePlan(org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan) */ protected boolean validatePlan(ProvisioningPlan plan) { if (status != null) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java index 70f4178e7..f757e46b5 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import java.net.MalformedURLException; import java.net.URL; @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AvailableIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUGroup.java index 864c486dd..b78664bb9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AvailableIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUGroup.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.dialogs.StructuredIUGroup; import org.eclipse.equinox.internal.p2.ui.viewers.AvailableIUContentProvider; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.MetadataRepositories; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositories; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUCopyrightPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java index d65c78223..248ed1d20 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUCopyrightPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGeneralInfoPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java index 05c577657..f916345e6 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGeneralInfoPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IULicensePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java index 5da8a6a80..df55dd204 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IULicensePropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstallWizard.java index 0188ff533..effb00f62 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstallWizard.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.*; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * @since 3.4 diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstalledIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstalledIUGroup.java index f84baee23..b4b444549 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstalledIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstalledIUGroup.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.dialogs.StructuredIUGroup; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositoryPropertyPage.java index 5e956703c..3b40e816e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositoryPropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RevertWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RevertWizard.java index 2226e0786..28cc8fd4d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RevertWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RevertWizard.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.RevertProfileWizardPage; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.wizard.Wizard; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UninstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UninstallWizard.java index 20273af62..4e3efd678 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UninstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UninstallWizard.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.UninstallWizardPage; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; import org.eclipse.jface.wizard.Wizard; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateAndInstallGroup.java index 6ae45ed4a..c7135cf2b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateAndInstallGroup.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.core.runtime.Assert; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.PropertyDialogAction; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.actions.*; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.*; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateWizard.java index 8598d0ccc..b531996fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateWizard.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * @since 3.4 diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ArtifactRepositories.java index ac2e5d547..7e240a2a3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositories.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ArtifactRepositories.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of an artifact diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/CategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/CategoryElement.java index 7c4fe6a71..2d55e03ad 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/CategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/CategoryElement.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Element wrapper class for IU's that represent categories of @@ -32,7 +32,7 @@ public class CategoryElement extends RemoteQueriedElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_CATEGORY; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUElement.java index b1a857ff3..e454d45bf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUElement.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Interface for elements that represent IU's. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUVersionsElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUVersionsElement.java index f504aee01..5716bf714 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUVersionsElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUVersionsElement.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.CachedQueryElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Element wrapper class for a particular IU version, whose diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java index e118fdcff..eff87bbf8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * Element wrapper class for installed IU's. Used instead of the plain IU when @@ -33,7 +33,7 @@ public class InstalledIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_IU; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositories.java index d516275df..f31ee5dfa 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositories.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositories.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of a metadata @@ -37,7 +37,7 @@ public class MetadataRepositories extends QueriedElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#getQueryType() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#getQueryType() */ protected int getQueryType() { return IQueryProvider.METADATA_REPOS; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositoryElement.java index 83f9dd000..9c1a3422f 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositoryElement.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.osgi.util.NLS; /** @@ -65,7 +65,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * overridden to lazily fetch repository * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#getQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#getQueryable() */ public IQueryable getQueryable() { if (queryable == null) @@ -92,14 +92,14 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R * overridden to check whether url is specified rather * than loading the repo via getQueryable() * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#knowsQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#knowsQueryable() */ public boolean knowsQueryable() { return url != null; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getURL() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getURL() */ public URL getLocation() { return url; @@ -107,7 +107,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getName() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getName() */ public String getName() { try { @@ -122,7 +122,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getDescription() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getDescription() */ public String getDescription() { try { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ProfileElement.java index 73af862ca..3f2bc457c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ProfileElement.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.osgi.util.NLS; /** @@ -64,7 +64,7 @@ public class ProfileElement extends RemoteQueriedElement { * Overridden to check whether we know the profile id rather * than fetch the profile from the registry using getQueryable() * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#knowsQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#knowsQueryable() */ public boolean knowsQueryable() { return profileId != null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/Profiles.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/Profiles.java index 721689324..df1077e68 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/Profiles.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/Profiles.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of a profile @@ -35,7 +35,7 @@ public class Profiles extends QueriedElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/QueriedElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/QueriedElementCollector.java index 3340e26b7..e756b1193 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/QueriedElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/QueriedElementCollector.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Collector that assigns a query provider and the queryable diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RepositoryElement.java index 83a9ce1ad..bc28597d4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RepositoryElement.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; /** * Interface for elements that represent repositories. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackProfileElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackProfileElement.java index 84bc2cff2..1fcc1a060 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackProfileElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackProfileElement.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.text.DateFormat; import java.util.*; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * Element wrapper class for IU's that represent categories of @@ -34,7 +34,7 @@ public class RollbackProfileElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_PROFILE; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackRepositoryElement.java index 54c5623a5..0695bdfa7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackRepositoryElement.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/UncategorizedCategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/UncategorizedCategoryElement.java index 92e375c1c..f12896d1b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/UncategorizedCategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/UncategorizedCategoryElement.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Element wrapper class for an IU that shows all uncategorized IU's. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddArtifactRepositoryOperation.java index ac4de7e40..50a384671 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddArtifactRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation which adds an artifact repository given its URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java index 69a7119c7..f76d327c3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that adds colocated artifact and metadata repositories diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddMetadataRepositoryOperation.java index cf7d38b48..704f9a3f8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddMetadataRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that adds a metadata repository given its URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddProfileOperation.java index 6ba7fc40b..806c259b0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddProfileOperation.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.util.Map; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Operation that adds the given profile to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/DownloadPhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/DownloadPhaseSet.java index 357ba2af0..3267c2a5e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/DownloadPhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/DownloadPhaseSet.java @@ -11,11 +11,11 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.Collect; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Collect; public class DownloadPhaseSet extends PhaseSet { public DownloadPhaseSet() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallAndConfigurePhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/InstallAndConfigurePhaseSet.java index 89bef7901..8bceb1af2 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallAndConfigurePhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/InstallAndConfigurePhaseSet.java @@ -11,11 +11,11 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.*; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.*; public class InstallAndConfigurePhaseSet extends PhaseSet { public InstallAndConfigurePhaseSet() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileModificationOperation.java index 50ba53504..705030a01 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileModificationOperation.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.engine.*; /** * Class representing a provisioning profile plan diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileOperation.java index 15d1077bf..8b3df312d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Abstract class representing provisioning profile operations diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningOperation.java index fea193b4a..b7a7d549d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningOperation.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.osgi.util.NLS; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningUtil.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java index 5cc6e47a2..0ecf155a1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningUtil.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java @@ -9,22 +9,22 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.*; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.engine.phases.Sizing; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.eclipse.osgi.util.NLS; /** @@ -219,8 +219,8 @@ public class ProvisioningUtil { return getEngine().perform(profile, set, plan.getOperands(), null, monitor); } - private static Engine getEngine() throws ProvisionException { - Engine engine = (Engine) ServiceHelper.getService(ProvUIActivator.getContext(), Engine.class.getName()); + private static IEngine getEngine() throws ProvisionException { + IEngine engine = (IEngine) ServiceHelper.getService(ProvUIActivator.getContext(), IEngine.SERVICE_NAME); if (engine == null) { throw new ProvisionException(ProvUIMessages.ProvisioningUtil_NoEngineFound); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveArtifactRepositoryOperation.java index 14b62f274..ef5645251 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveArtifactRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation which removes the artifact repository with the given URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveColocatedRepositoryOperation.java index 48dd678ea..c7fb1cb26 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveColocatedRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that removes the colocated repositories with the given URLs. * diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveMetadataRepositoryOperation.java index 0ee904176..662e86517 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveMetadataRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that removes the metadata repository with the given URL. * diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveProfilesOperation.java index d3c5e95e6..50323817b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveProfilesOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Operation that removes a profile diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RepositoryOperation.java index 816b7f6fc..f4c637b60 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RepositoryOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/SizingPhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/SizingPhaseSet.java index bec3431f5..ff7a3ee83 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/SizingPhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/SizingPhaseSet.java @@ -11,12 +11,12 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; public class SizingPhaseSet extends PhaseSet { private static Sizing sizing; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UndoableProvisioningOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/UndoableProvisioningOperation.java index 1940d69b1..b427ae485 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UndoableProvisioningOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/UndoableProvisioningOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.util.ArrayList; import java.util.List; @@ -17,8 +17,8 @@ import org.eclipse.core.commands.operations.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.osgi.util.NLS; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AnyRequiredCapabilityQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AnyRequiredCapabilityQuery.java index ebf0bc9db..8ad1df159 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AnyRequiredCapabilityQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AnyRequiredCapabilityQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that searches a repository for all {@link IInstallableUnit} instances that diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AvailableIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AvailableIUCollector.java index 42e900559..aae5e55d9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AvailableIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AvailableIUCollector.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.equinox.internal.p2.ui.model.AvailableIUElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.CategoryElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.CategoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Collector that examines available IU's and wraps them in an diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/CategoryElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/CategoryElementCollector.java index 439caab8c..a048d3b5b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/CategoryElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/CategoryElementCollector.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.*; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.*; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ElementQueryDescriptor.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ElementQueryDescriptor.java index f478dd41b..17c598d26 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ElementQueryDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ElementQueryDescriptor.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.query.*; /** * Data class representing everything needed to run a query, including diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/FilteredRepositoryQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/FilteredRepositoryQuery.java index 8f2c26adc..2d649a01a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/FilteredRepositoryQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/FilteredRepositoryQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that provides flags for filtering out which repositories diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IQueryProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IQueryProvider.java index 603fbd09b..c92d5a6a0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IQueryProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IQueryProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; /** * An interface for an object that provides element queries diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUProfilePropertyQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUProfilePropertyQuery.java index 2b6265451..f40fc46c1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUProfilePropertyQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUProfilePropertyQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * A query that searches for {@link IInstallableUnit} instances that have diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUPropertyQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyQuery.java index 0cc9b5723..cbdf576c8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUPropertyQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that searches for {@link IInstallableUnit} instances that have diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/InstalledIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/InstalledIUCollector.java index ca3a64a4b..1ebe6ad2b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/InstalledIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/InstalledIUCollector.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collectors that accepts the matched IU's and diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionCollector.java index 9de77535b..6a0c1fd94 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.HashMap; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; /** * Collector that only accepts categories or the latest version of each diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionElementCollector.java index 610a96837..08a2b3855 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionElementCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.IUVersionsElement; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUVersionsElement; /** * Collector that only accepts categories or the latest version of each diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/OtherIUVersionsCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/OtherIUVersionsCollector.java index 20fd6706e..1ace2726b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/OtherIUVersionsCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/OtherIUVersionsCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collector that includes only those versions of an IU other than the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ProfileElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ProfileElementCollector.java index 094ede3c0..3a753ecfd 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ProfileElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ProfileElementCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collector that accepts the matched Profiles and diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueriedElement.java index 1080e532f..f0d9edb38 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueriedElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueriedElement.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; /** * Element class that represents an element that gets its children @@ -45,7 +45,7 @@ public abstract class QueriedElement extends ProvElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableArtifactRepositoryManager.java index b7513af9c..cccc9eaa3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableArtifactRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableArtifactRepositoryManager.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.net.URL; import org.eclipse.core.runtime.*; @@ -16,9 +16,9 @@ import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ArtifactRepositoryElement; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to an artifact repository diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableMetadataRepositoryManager.java index 0991a9135..bf859c225 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableMetadataRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableMetadataRepositoryManager.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.net.URL; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.MetadataRepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositoryElement; /** * An object that adds queryable support to a metadata repository diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableProfileRegistry.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableProfileRegistry.java index 941520dca..77842ca1e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableProfileRegistry.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableUpdates.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableUpdates.java index fe0985585..1e58f50fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableUpdates.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableUpdates.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.IPlanner; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/RollbackIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/RollbackIUCollector.java index 15a666957..068af5f5c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/RollbackIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/RollbackIUCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.RollbackProfileElement; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackProfileElement; /** * Collector that examines available IU's and wraps them in an diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/DeferredQueryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/DeferredQueryContentProvider.java index 562421be2..359d94c8c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/DeferredQueryContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/DeferredQueryContentProvider.java @@ -9,11 +9,11 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; import org.eclipse.jface.viewers.*; import org.eclipse.ui.progress.DeferredTreeContentManager; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUColumnConfig.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUColumnConfig.java index f022ad5a6..acdbc68db 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUColumnConfig.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUColumnConfig.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; /** * Data structure describing a column to be shown in an IU view. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUComparator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java index 907363761..5b6752c4b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUComparator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java index 7c0997e5f..0f173fcd7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.*; import org.eclipse.swt.dnd.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/InstallIUDropAdapter.java index 585d299f8..5e9eda6fd 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/InstallIUDropAdapter.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.actions.InstallAction; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.*; import org.eclipse.swt.dnd.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementComparer.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementComparer.java index f8687f4a6..9c58f3aa5 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementComparer.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementComparer.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.net.URL; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; import org.eclipse.jface.viewers.IElementComparer; public class ProvElementComparer implements IElementComparer { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java index a2635aaba..9517dfae9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java @@ -9,18 +9,18 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/RepositoryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/RepositoryContentProvider.java index 77eefac79..ac85b9c6a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/RepositoryContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/RepositoryContentProvider.java @@ -9,10 +9,10 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Content provider for provisioning repositories. The repositories are the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/StructuredViewerProvisioningListener.java index 6245d5e77..b81c184e1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/StructuredViewerProvisioningListener.java @@ -9,14 +9,14 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.EventObject; import org.eclipse.equinox.internal.p2.ui.IProvisioningListener; -import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener; -import org.eclipse.equinox.p2.engine.ProfileEvent; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.engine.ProfileEvent; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.widgets.Display; |