diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs')
12 files changed, 84 insertions, 189 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java index 8d4f2655d..e94be5aac 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java @@ -10,13 +10,10 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import java.net.URI; -import org.eclipse.core.runtime.*; -import org.eclipse.equinox.internal.p2.ui.admin.*; -import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog; -import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; -import org.eclipse.equinox.internal.provisional.p2.ui.policy.*; +import org.eclipse.equinox.internal.p2.ui.admin.ArtifactRepositoryTracker; +import org.eclipse.equinox.internal.p2.ui.dialogs.AddRepositoryDialog; +import org.eclipse.equinox.p2.operations.RepositoryTracker; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.swt.widgets.Shell; /** @@ -27,101 +24,17 @@ import org.eclipse.swt.widgets.Shell; */ public class AddArtifactRepositoryDialog extends AddRepositoryDialog { - class ArtifactRepositoryManipulator extends RepositoryManipulator { - RepositoryLocationValidator validator; + RepositoryTracker tracker; - public AddRepositoryOperation getAddOperation(URI location) { - return new AddArtifactRepositoryOperation(ProvAdminUIMessages.AddArtifactRepositoryDialog_OperationLabel, location); - } - - /* (non-Javadoc) - * @see org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryManipulator#getAddOperationLabel() - */ - public String getAddOperationLabel() { - return ProvAdminUIMessages.AddArtifactRepositoryDialog_OperationLabel; - } - - public String getManipulatorButtonLabel() { - // Not used in this dialog - return null; - } - - public String getManipulatorLinkLabel() { - // Not used in this dialog - return null; - } - - public RemoveRepositoryOperation getRemoveOperation(URI[] repoLocations) { - return new RemoveArtifactRepositoryOperation(ProvAdminUIMessages.ArtifactRepositoriesView_RemoveRepositoryOperationLabel, repoLocations); - } - - public String getRemoveOperationLabel() { - return ProvAdminUIMessages.ArtifactRepositoriesView_RemoveRepositoryOperationLabel; - } - - public RepositoryLocationValidator getRepositoryLocationValidator(Shell shell) { - if (validator == null) { - validator = new RepositoryLocationValidator() { - public IStatus validateRepositoryLocation(URI location, boolean contactRepositories, IProgressMonitor monitor) { - IStatus duplicateStatus = Status.OK_STATUS; - URI[] knownRepositories = getKnownRepositories(); - for (int i = 0; i < knownRepositories.length; i++) { - if (knownRepositories[i].equals(location)) { - duplicateStatus = new Status(IStatus.ERROR, ProvAdminUIActivator.PLUGIN_ID, LOCAL_VALIDATION_ERROR, ProvAdminUIMessages.AddArtifactRepositoryDialog_DuplicateURL, null); - break; - } - } - return duplicateStatus; - } - }; - } - return validator; - } - - public boolean manipulateRepositories(Shell shell) { - // Not used in this dialog - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryManipulator#getKnownRepositories() - */ - public URI[] getKnownRepositories() { - try { - return ProvisioningUtil.getArtifactRepositories(ProvAdminUIActivator.getDefault().getPolicy().getQueryContext().getArtifactRepositoryFlags()); - } catch (ProvisionException e) { - return new URI[0]; - } - } - - /* (non-Javadoc) - * @see org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryManipulator#getManipulatorInstructionString() - */ - public String getManipulatorInstructionString() { - // We don't have a manipulator - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.equinox.internal.provisional.p2.ui.policy.RepositoryManipulator#getSiteNotFoundCorrectionString() - */ - public String getRepositoryNotFoundInstructionString() { - return ProvAdminUIMessages.AddArtifactRepositoryDialog_ManipulateRepositoryInstruction; - } - - } - - RepositoryManipulator manipulator; - - public AddArtifactRepositoryDialog(Shell parentShell, Policy policy) { - super(parentShell, policy); + public AddArtifactRepositoryDialog(Shell parentShell, ProvisioningUI ui) { + super(parentShell, ui); } - protected RepositoryManipulator getRepositoryManipulator() { - if (manipulator == null) { - manipulator = new ArtifactRepositoryManipulator(); + protected RepositoryTracker getRepositoryTracker() { + if (tracker == null) { + tracker = new ArtifactRepositoryTracker(getProvisioningUI()); } - return manipulator; + return tracker; } } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java index bbf0d8b0e..8281f22bf 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import java.net.URI; -import org.eclipse.equinox.internal.p2.ui.admin.AddMetadataRepositoryOperation; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog; -import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddRepositoryOperation; -import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy; +import org.eclipse.equinox.internal.p2.ui.admin.MetadataRepositoryTracker; +import org.eclipse.equinox.internal.p2.ui.dialogs.AddRepositoryDialog; +import org.eclipse.equinox.p2.operations.RepositoryTracker; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.swt.widgets.Shell; /** @@ -26,11 +24,16 @@ import org.eclipse.swt.widgets.Shell; */ public class AddMetadataRepositoryDialog extends AddRepositoryDialog { - public AddMetadataRepositoryDialog(Shell parentShell, Policy policy) { - super(parentShell, policy); + RepositoryTracker tracker; + + public AddMetadataRepositoryDialog(Shell parentShell, ProvisioningUI ui) { + super(parentShell, ui); } - protected AddRepositoryOperation getOperation(URI location) { - return new AddMetadataRepositoryOperation(ProvAdminUIMessages.AddMetadataRepositoryDialog_OperationLabel, location); + protected RepositoryTracker getRepositoryTracker() { + if (tracker == null) { + tracker = new MetadataRepositoryTracker(getProvisioningUI()); + } + return tracker; } } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java index 5b215dea5..7d5d88ce2 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java @@ -11,19 +11,15 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import java.util.Map; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddProfileOperation; +import org.eclipse.core.runtime.*; +import org.eclipse.equinox.internal.p2.ui.admin.*; +import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.*; -import org.eclipse.ui.statushandlers.StatusManager; /** * Dialog that allows a profile to be defined and added. @@ -77,8 +73,9 @@ public class AddProfileDialog extends StatusDialog { return; } addedProfileId = profileGroup.getProfileId(); - Map profileProperties = profileGroup.getProfileProperties(); - ProvisioningOperationRunner.run(new AddProfileOperation(ProvAdminUIMessages.AddProfileDialog_OperationLabel, addedProfileId, profileProperties), StatusManager.SHOW | StatusManager.LOG); + Map<String, String> profileProperties = profileGroup.getProfileProperties(); + AddProfileJob job = new AddProfileJob(ProvAdminUIMessages.AddProfileDialog_OperationLabel, ProvisioningUI.getDefaultUI().getSession(), addedProfileId, profileProperties); + job.runModal(new NullProgressMonitor()); } void verifyComplete() { diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java index 61d125416..e3729873a 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.p2.ui.ProvUI; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Composite; @@ -38,7 +38,7 @@ public abstract class IUGroup { } public IInstallableUnit getIU() { - return (IInstallableUnit) ProvUI.getAdapter(iuElement, IInstallableUnit.class); + return ProvUI.getAdapter(iuElement, IInstallableUnit.class); } public void updateIU() { diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java index 158a70ace..9e898e6ee 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java @@ -10,14 +10,19 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import org.eclipse.equinox.internal.provisional.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.*; + +import java.util.Collection; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.IRequirement; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; @@ -154,23 +159,25 @@ public class IUImplementationGroup extends IUGroup { if (type != null) { touchpointType.setText(type.getId()); } - ITouchpointData[] data = iu.getTouchpointData(); - String[] items = new String[data.length]; - for (int i = 0; i < data.length; i++) { - items[i] = data[i].toString(); + java.util.List<ITouchpointData> data = iu.getTouchpointData(); + String[] items = new String[data.size()]; + for (int i = 0; i < data.size(); i++) { + items[i] = data.get(i).toString(); } touchpointData.setItems(items); - IRequiredCapability[] req = iu.getRequiredCapabilities(); - items = new String[req.length]; - for (int i = 0; i < req.length; i++) { - items[i] = req[i].toString(); + Collection<IRequirement> reqs = iu.getRequiredCapabilities(); + items = new String[reqs.size()]; + int j = 0; + for (IRequirement req : reqs) { + items[j++] = req.toString(); } requiredCapabilities.setItems(items); - IProvidedCapability[] prov = iu.getProvidedCapabilities(); - items = new String[prov.length]; - for (int i = 0; i < prov.length; i++) { - items[i] = prov[i].toString(); + Collection<IProvidedCapability> prov = iu.getProvidedCapabilities(); + items = new String[prov.size()]; + int i = 0; + for (IProvidedCapability capability : prov) { + items[i++] = capability.toString(); } providedCapabilities.setItems(items); } @@ -180,10 +187,10 @@ public class IUImplementationGroup extends IUGroup { if (iuElement == null || iuElement instanceof IInstallableUnit) { InstallableUnitDescription unit = new InstallableUnitDescription(); unit.setId(id.getText().trim()); - unit.setVersion(new Version(version.getText().trim())); + unit.setVersion(Version.create(version.getText().trim())); unit.setProperty(IInstallableUnit.NAMESPACE_IU_ID, namespace.getText().trim()); // TODO this is bogus because we don't let user provide a touchpoint type version - unit.setTouchpointType(MetadataFactory.createTouchpointType(touchpointType.getText().trim(), new Version("1.0.0"))); //$NON-NLS-1$ + unit.setTouchpointType(MetadataFactory.createTouchpointType(touchpointType.getText().trim(), Version.create("1.0.0"))); //$NON-NLS-1$ iuElement = MetadataFactory.createInstallableUnit(unit); } } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java index 8a679d479..04a751e26 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java @@ -11,9 +11,9 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.core.runtime.IStatus; +import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -31,7 +31,7 @@ public class IUImplementationPropertyPage extends PropertyPage { private IUImplementationGroup iuGroup; protected Control createContents(Composite parent) { - IInstallableUnit iu = (IInstallableUnit) ProvUI.getAdapter(getElement(), IInstallableUnit.class); + IInstallableUnit iu = ProvUI.getAdapter(getElement(), IInstallableUnit.class); if (iu == null) { Label label = new Label(parent, SWT.DEFAULT); label.setText(ProvAdminUIMessages.No_Property_Item_Selected); diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java index e71fd366e..468b5ed93 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java @@ -11,19 +11,14 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -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.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; -import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; -import org.eclipse.osgi.util.NLS; +import org.eclipse.equinox.internal.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; -import org.eclipse.ui.statushandlers.StatusManager; /** * An IUPropertiesGroup is a reusable UI component that displays and edits the @@ -68,7 +63,7 @@ public class IUProfilePropertiesGroup extends IUGroup { if (iuElement == null || !(iuElement instanceof InstalledIUElement)) { return; } - String[] propNames = new String[] {IInstallableUnit.PROP_PROFILE_ROOT_IU}; + String[] propNames = new String[] {IProfile.PROP_PROFILE_ROOT_IU}; String[] userPropNames = new String[] {ProvAdminUIMessages.ProfileRootPropertyName}; for (int i = 0; i < propNames.length; i++) { TableItem item = new TableItem(propertiesTable, SWT.NULL); @@ -80,11 +75,6 @@ public class IUProfilePropertiesGroup extends IUGroup { } private IProfile getProfile(InstalledIUElement element) { - try { - return ProvisioningUtil.getProfile(element.getProfileId()); - } catch (ProvisionException e) { - ProvUI.handleException(e, NLS.bind(ProvAdminUIMessages.IUProfilePropertiesGroup_InvalidProfileID, element.getProfileId()), StatusManager.LOG); - return null; - } + return ProvisioningUI.getDefaultUI().getSession().getProfileRegistry().getProfile(element.getProfileId()); } } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java index 6c766444b..ac7b80810 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java @@ -12,8 +12,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; @@ -67,7 +66,7 @@ public class IUPropertiesGroup extends IUGroup { String[] userPropNames = new String[] {ProvAdminUIMessages.IUPropertiesGroup_NamePropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_DescriptionPropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_ProviderPropertyLabel}; for (int i = 0; i < propNames.length; i++) { TableItem item = new TableItem(propertiesTable, SWT.NULL); - String value = IUPropertyUtils.getIUProperty(getIU(), propNames[i]); + String value = getIU().getProperty(propNames[i], null); if (value != null) item.setText(new String[] {userPropNames[i], value}); } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java index f9aa001be..7694a0138 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.p2.ui.model.InstalledIUElement; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java index b67f72f14..07f546092 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java @@ -16,10 +16,8 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; -import org.eclipse.equinox.internal.provisional.p2.ui.ProfileFactory; +import org.eclipse.equinox.internal.p2.ui.admin.*; +import org.eclipse.equinox.p2.engine.IProfile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; @@ -42,7 +40,6 @@ public class ProfileGroup { Text cache; Text name; Text description; - Text flavor; Text environments; Text nl; IProfile profile; @@ -122,9 +119,6 @@ public class ProfileGroup { label = new Label(composite, SWT.NONE); label.setText(ProvAdminUIMessages.ProfileGroup_Flavor); - flavor = new Text(composite, SWT.BORDER); - flavor.setLayoutData(gd); - setEditable(flavor, profile == null, listener); label = new Label(composite, SWT.NONE); label.setText(ProvAdminUIMessages.ProfileGroup_Environments); @@ -146,7 +140,6 @@ public class ProfileGroup { location.setText(ProfileFactory.getDefaultLocation()); environments.setText(ProfileFactory.getDefaultEnvironments()); nl.setText(ProfileFactory.getDefaultNL()); - flavor.setText(ProfileFactory.getDefaultFlavor()); } else { String value = profile.getProfileId(); // Should not happen, profiles must have an id, but just in case. @@ -172,8 +165,6 @@ public class ProfileGroup { if (value != null) { description.setText(value); } - value = profile.getProperty(IProfile.PROP_FLAVOR); - flavor.setText(value != null ? value : ProfileFactory.getDefaultFlavor()); value = profile.getProperty(IProfile.PROP_ENVIRONMENTS); if (value != null) { @@ -186,9 +177,9 @@ public class ProfileGroup { } } - public Map getProfileProperties() { + public Map<String, String> getProfileProperties() { if (profile == null) { - Map profileProperties = new HashMap(); + Map<String, String> profileProperties = new HashMap<String, String>(); String value = location.getText().trim(); if (value.length() > 0) { @@ -207,10 +198,6 @@ public class ProfileGroup { if (value.length() > 0) { profileProperties.put(IProfile.PROP_DESCRIPTION, value); } - value = flavor.getText().trim(); - if (value.length() > 0) { - profileProperties.put(IProfile.PROP_FLAVOR, value); - } value = environments.getText().trim(); if (value.length() > 0) { profileProperties.put(IProfile.PROP_ENVIRONMENTS, value); diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java index 374a7f01b..cea15ad83 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; +import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.p2.engine.IProfile; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.*; @@ -28,7 +28,7 @@ public class ProfilePropertyPage extends PropertyPage { private ProfileGroup profileGroup; protected Control createContents(Composite parent) { - IProfile profile = (IProfile) ProvUI.getAdapter(getElement(), IProfile.class); + IProfile profile = ProvUI.getAdapter(getElement(), IProfile.class); if (profile == null) { Label label = new Label(parent, SWT.DEFAULT); label.setText(ProvAdminUIMessages.No_Property_Item_Selected); diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java index 8cd83d6a1..7c28fc184 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java @@ -10,12 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import org.eclipse.equinox.internal.provisional.p2.repository.IRepository; - import java.util.Map; +import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; -import org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement; +import org.eclipse.equinox.internal.p2.ui.model.IRepositoryElement; +import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -28,7 +27,7 @@ import org.eclipse.ui.dialogs.PropertyPage; * @since 3.4 */ public class RepositoryImplementationPropertyPage extends PropertyPage { - private IRepositoryElement repositoryElement; + private IRepositoryElement<?> repositoryElement; private Composite composite; private Text name; private Text location; @@ -106,9 +105,9 @@ public class RepositoryImplementationPropertyPage extends PropertyPage { } private void initializeFields() { - IRepositoryElement element = getRepositoryElement(); + IRepositoryElement<?> element = getRepositoryElement(); if (element != null) { - IRepository repo = getRepositoryElement().getRepository(null); + IRepository<?> repo = getRepositoryElement().getRepository(null); location.setText(repo.getLocation().toString()); String value = repo.getName(); if (value != null) @@ -127,9 +126,9 @@ public class RepositoryImplementationPropertyPage extends PropertyPage { private void initializeTable() { if (getRepositoryElement() != null) { - Map repoProperties = getRepositoryElement().getRepository(null).getProperties(); + Map<String, String> repoProperties = getRepositoryElement().getRepository(null).getProperties(); if (repoProperties != null) { - String[] propNames = (String[]) repoProperties.keySet().toArray(new String[repoProperties.size()]); + String[] propNames = repoProperties.keySet().toArray(new String[repoProperties.size()]); for (int i = 0; i < propNames.length; i++) { TableItem item = new TableItem(propertiesTable, SWT.NULL); item.setText(new String[] {propNames[i], repoProperties.get(propNames[i]).toString()}); @@ -138,9 +137,9 @@ public class RepositoryImplementationPropertyPage extends PropertyPage { } } - private IRepositoryElement getRepositoryElement() { + private IRepositoryElement<?> getRepositoryElement() { if (repositoryElement == null) { - repositoryElement = (IRepositoryElement) ProvUI.getAdapter(getElement(), IRepositoryElement.class); + repositoryElement = ProvUI.getAdapter(getElement(), IRepositoryElement.class); } return repositoryElement; } |