NEW - bug 313436: end support for Eclipse 3.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=313436
diff --git a/org.eclipse.mylyn.discovery.ui/.classpath b/org.eclipse.mylyn.discovery.ui/.classpath
index fc828f1..12b9034 100644
--- a/org.eclipse.mylyn.discovery.ui/.classpath
+++ b/org.eclipse.mylyn.discovery.ui/.classpath
@@ -7,6 +7,7 @@
</accessrules>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib"/>
+ <classpathentry exported="true" kind="lib" path="lib-e3.5" sourcepath="src-e3.5"/>
+ <classpathentry exported="true" kind="lib" path="lib-e3.6" sourcepath="src-e3.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.mylyn.discovery.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.discovery.ui/META-INF/MANIFEST.MF
index 235ae58..c8978b3 100644
--- a/org.eclipse.mylyn.discovery.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.discovery.ui/META-INF/MANIFEST.MF
@@ -25,5 +25,6 @@
org.eclipse.mylyn.internal.discovery.ui.util;x-internal:=true,
org.eclipse.mylyn.internal.discovery.ui.wizards;x-internal:=true
Import-Package: com.ibm.icu.text
-Bundle-ClassPath: lib/,
- .
+Bundle-ClassPath: .,
+ lib-e3.5/,
+ lib-e3.6/
diff --git a/org.eclipse.mylyn.discovery.ui/build.properties b/org.eclipse.mylyn.discovery.ui/build.properties
index 6103b66..167a042 100644
--- a/org.eclipse.mylyn.discovery.ui/build.properties
+++ b/org.eclipse.mylyn.discovery.ui/build.properties
@@ -15,9 +15,12 @@
plugin.xml,\
about.html,\
icons/,\
- lib/,\
+ lib-e3.5/,\
+ lib-e3.6/,\
OSGI-INF/,\
OSGI-INF/l10n/
-src.includes = about.html
+src.includes = about.html,\
+ src-e3.5/,\
+ src-e3.6/
customBuildCallbacks=customBuildCallbacks.xml
customBuildCallbacks.failonerror=true
diff --git a/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml b/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml
index c76e7ed..003b95d 100644
--- a/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml
+++ b/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml
@@ -27,10 +27,14 @@
<!-- build.result.folder - folder to contain the build results -->
<!-- ===================================================================== -->
<target name="pre.build.jars">
- <uptodate property="isUpToDate"
- srcfile="src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob.java"
- targetfile="lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class"/>
- <fail unless="isUpToDate"/>
+ <uptodate property="isUpToDate-e3.5"
+ srcfile="src-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.java"
+ targetfile="lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class"/>
+ <fail unless="isUpToDate-e3.5"/>
+ <uptodate property="isUpToDate-e3.6"
+ srcfile="src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java"
+ targetfile="lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class"/>
+ <fail unless="isUpToDate-e3.6"/>
</target>
<!-- ===================================================================== -->
diff --git a/org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$1.class b/org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$1.class
similarity index 100%
rename from org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$1.class
rename to org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$1.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$2.class b/org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$2.class
similarity index 100%
rename from org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$2.class
rename to org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$2.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$3.class b/org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$3.class
similarity index 100%
rename from org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$3.class
rename to org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$3.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$4.class b/org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$4.class
similarity index 100%
rename from org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$4.class
rename to org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5$4.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class b/org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class
similarity index 100%
rename from org.eclipse.mylyn.discovery.ui/lib/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class
rename to org.eclipse.mylyn.discovery.ui/lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class
new file mode 100644
index 0000000..7bfb03e
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$1.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class
new file mode 100644
index 0000000..70bccaf
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6$2.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class
new file mode 100644
index 0000000..9d0e5c5
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.ui/lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.ui/src-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.java b/org.eclipse.mylyn.discovery.ui/src-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.java
new file mode 100644
index 0000000..22c8a36
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.ui/src-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.java
@@ -0,0 +1,433 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.discovery.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IBundleGroup;
+import org.eclipse.core.runtime.IBundleGroupProvider;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
+import org.eclipse.equinox.internal.provisional.p2.core.Version;
+import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
+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.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
+import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.internal.provisional.p2.query.Collector;
+import org.eclipse.equinox.internal.provisional.p2.query.MatchQuery;
+import org.eclipse.equinox.internal.provisional.p2.query.Query;
+import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds;
+import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRepositoryManager;
+import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction;
+import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.PreselectedIUInstallWizard;
+import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.ProvisioningWizardDialog;
+import org.eclipse.equinox.internal.provisional.p2.ui.operations.PlannerResolutionOperation;
+import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
+import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
+import org.eclipse.mylyn.internal.discovery.ui.util.DiscoveryUiUtil;
+import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A job that configures a p2 {@link #getInstallAction() install action} for installing one or more
+ * {@link ConnectorDescriptor connectors}. The bulk of the installation work is done by p2; this class just sets up the
+ * p2 repository metadata and selects the appropriate features to install. After running the job the
+ * {@link #getInstallAction() install action} must be run to perform the installation.
+ *
+ * @author David Green
+ */
+@SuppressWarnings("restriction")
+class PrepareInstallProfileJob_e_3_5 extends AbstractInstallJob {
+
+ private static final String P2_FEATURE_GROUP_SUFFIX = ".feature.group"; //$NON-NLS-1$
+
+ private final List<ConnectorDescriptor> installableConnectors;
+
+ private PlannerResolutionOperation plannerResolutionOperation;
+
+ private String profileId;
+
+ private IInstallableUnit[] ius;
+
+ public PrepareInstallProfileJob_e_3_5(List<ConnectorDescriptor> installableConnectors) {
+ if (installableConnectors == null) {
+ throw new IllegalArgumentException();
+ }
+ this.installableConnectors = new ArrayList<ConnectorDescriptor>(installableConnectors);
+ }
+
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ if (installableConnectors.isEmpty()) {
+ throw new IllegalArgumentException();
+ }
+ try {
+ doRun(monitor);
+ if (monitor.isCanceled()) {
+ throw new OperationCanceledException();
+ }
+ doInstall();
+ } catch (OperationCanceledException e) {
+ throw new InterruptedException();
+ } catch (Exception e) {
+ throw new InvocationTargetException(e);
+ }
+ }
+
+ private void doInstall() {
+ if (getPlannerResolutionOperation() != null && getPlannerResolutionOperation().getProvisioningPlan() != null) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ PreselectedIUInstallWizard wizard = new PreselectedIUInstallWizard(Policy.getDefault(),
+ getProfileId(), getIUs(), getPlannerResolutionOperation(),
+ new QueryableMetadataRepositoryManager(Policy.getDefault().getQueryContext(), false));
+ WizardDialog dialog = new ProvisioningWizardDialog(DiscoveryUiUtil.getShell(), wizard);
+ dialog.create();
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
+ IProvHelpContextIds.INSTALL_WIZARD);
+
+ dialog.open();
+ }
+ });
+ }
+ }
+
+ public void doRun(IProgressMonitor monitor) throws CoreException {
+ final int totalWork = installableConnectors.size() * 6;
+ monitor.beginTask(Messages.InstallConnectorsJob_task_configuring, totalWork);
+ try {
+ profileId = computeProfileId();
+
+ // Tell p2 that it's okay to use these repositories
+ Set<URL> repositoryURLs = new HashSet<URL>();
+ for (ConnectorDescriptor descriptor : installableConnectors) {
+ URL url = new URL(descriptor.getSiteUrl());
+ if (repositoryURLs.add(url)) {
+ if (monitor.isCanceled()) {
+ return;
+ }
+ ProvisioningUtil.addMetadataRepository(url.toURI(), true);
+ ProvisioningUtil.addArtifactRepository(url.toURI(), true);
+ ProvisioningUtil.setColocatedRepositoryEnablement(url.toURI(), true);
+
+ }
+ monitor.worked(1);
+ }
+ if (repositoryURLs.isEmpty()) {
+ // should never happen
+ throw new IllegalStateException();
+ }
+ // Fetch p2's metadata for these repositories
+ List<IMetadataRepository> repositories = new ArrayList<IMetadataRepository>();
+ final Map<IMetadataRepository, URL> repositoryToURL = new HashMap<IMetadataRepository, URL>();
+ {
+ int unit = installableConnectors.size() / repositoryURLs.size();
+ for (URL updateSiteUrl : repositoryURLs) {
+ if (monitor.isCanceled()) {
+ return;
+ }
+ IMetadataRepository repository = ProvisioningUtil.loadMetadataRepository(updateSiteUrl.toURI(),
+ new SubProgressMonitor(monitor, unit));
+ repositories.add(repository);
+ repositoryToURL.put(repository, updateSiteUrl);
+ }
+ }
+ // Perform a query to get the installable units. This causes p2 to determine what features are available
+ // in each repository. We select installable units by matching both the feature id and the repository; it
+ // is possible though unlikely that the same feature id is available from more than one of the selected
+ // repositories, and we must ensure that the user gets the one that they asked for.
+ final List<IInstallableUnit> installableUnits = new ArrayList<IInstallableUnit>();
+ {
+ int unit = installableConnectors.size() / repositories.size();
+
+ for (final IMetadataRepository repository : repositories) {
+ if (monitor.isCanceled()) {
+ return;
+ }
+ URL repositoryUrl = repositoryToURL.get(repository);
+ final Set<String> installableUnitIdsThisRepository = new HashSet<String>();
+ // determine all installable units for this repository
+ for (ConnectorDescriptor descriptor : installableConnectors) {
+ try {
+ if (repositoryUrl.equals(new URL(descriptor.getSiteUrl()))) {
+ installableUnitIdsThisRepository.addAll(descriptor.getInstallableUnits());
+ }
+ } catch (MalformedURLException e) {
+ // will never happen, ignore
+ }
+ }
+ Collector collector = new Collector();
+ Query query = new MatchQuery() {
+ @Override
+ public boolean isMatch(Object object) {
+ if (!(object instanceof IInstallableUnit)) {
+ return false;
+ }
+ IInstallableUnit candidate = (IInstallableUnit) object;
+
+ if ("true".equalsIgnoreCase(candidate.getProperty("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$ //$NON-NLS-2$
+ String id = candidate.getId();
+ if (isQualifyingFeature(installableUnitIdsThisRepository, id)) {
+ IProvidedCapability[] providedCapabilities = candidate.getProvidedCapabilities();
+ if (providedCapabilities != null && providedCapabilities.length > 0) {
+ for (IProvidedCapability capability : providedCapabilities) {
+ if ("org.eclipse.equinox.p2.iu".equals(capability.getNamespace())) { //$NON-NLS-1$
+ String name = capability.getName();
+ if (isQualifyingFeature(installableUnitIdsThisRepository, name)) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean isQualifyingFeature(final Set<String> installableUnitIdsThisRepository,
+ String id) {
+ return id.endsWith(P2_FEATURE_GROUP_SUFFIX)
+ && installableUnitIdsThisRepository.contains(id);
+ }
+ };
+ repository.query(query, collector, new SubProgressMonitor(monitor, unit));
+
+ addAll(installableUnits, collector);
+ }
+ }
+
+ // filter those installable units that have a duplicate in the list with a higher version number.
+ // it's possible that some repositories will host multiple versions of a particular feature. we assume
+ // that the user wants the highest version.
+ {
+ Map<String, Version> symbolicNameToVersion = new HashMap<String, Version>();
+ for (IInstallableUnit unit : installableUnits) {
+ Version version = symbolicNameToVersion.get(unit.getId());
+ if (version == null || version.compareTo(unit.getVersion()) < 0) {
+ symbolicNameToVersion.put(unit.getId(), unit.getVersion());
+ }
+ }
+ if (symbolicNameToVersion.size() != installableUnits.size()) {
+ for (IInstallableUnit unit : new ArrayList<IInstallableUnit>(installableUnits)) {
+ Version version = symbolicNameToVersion.get(unit.getId());
+ if (!version.equals(unit.getVersion())) {
+ installableUnits.remove(unit);
+ }
+ }
+ }
+ }
+
+ checkForUnavailable(installableUnits);
+
+ MultiStatus status = new MultiStatus(DiscoveryUi.ID_PLUGIN, 0, Messages.PrepareInstallProfileJob_ok, null);
+ ius = installableUnits.toArray(new IInstallableUnit[installableUnits.size()]);
+ ProfileChangeRequest profileChangeRequest = InstallAction.computeProfileChangeRequest(ius, profileId,
+ status, new SubProgressMonitor(monitor, installableConnectors.size()));
+ if (status.getSeverity() > IStatus.WARNING) {
+ throw new CoreException(status);
+ }
+ if (profileChangeRequest == null) {
+ // failed but no indication as to why
+ throw new CoreException(new Status(IStatus.ERROR, DiscoveryUi.ID_PLUGIN,
+ Messages.PrepareInstallProfileJob_computeProfileChangeRequestFailed, null));
+ }
+ PlannerResolutionOperation operation = new PlannerResolutionOperation(
+ Messages.PrepareInstallProfileJob_calculatingRequirements, profileId, profileChangeRequest, null,
+ status, true);
+ IStatus operationStatus = operation.execute(new SubProgressMonitor(monitor, installableConnectors.size()));
+ if (operationStatus.getSeverity() > IStatus.WARNING) {
+ throw new CoreException(operationStatus);
+ }
+
+ plannerResolutionOperation = operation;
+
+ } catch (URISyntaxException e) {
+ // should never happen, since we already validated URLs.
+ throw new CoreException(new Status(IStatus.ERROR, DiscoveryUi.ID_PLUGIN,
+ Messages.InstallConnectorsJob_unexpectedError_url, e));
+ } catch (MalformedURLException e) {
+ // should never happen, since we already validated URLs.
+ throw new CoreException(new Status(IStatus.ERROR, DiscoveryUi.ID_PLUGIN,
+ Messages.InstallConnectorsJob_unexpectedError_url, e));
+ } finally {
+ monitor.done();
+ }
+ }
+
+ /**
+ * Verifies that we found what we were looking for: it's possible that we have connector descriptors that are no
+ * longer available on their respective sites. In that case we must inform the user. Unfortunately this is the
+ * earliest point at which we can know.
+ */
+ private void checkForUnavailable(final List<IInstallableUnit> installableUnits) throws CoreException {
+ // at least one selected connector could not be found in a repository
+ Set<String> foundIds = new HashSet<String>();
+ for (IInstallableUnit unit : installableUnits) {
+ foundIds.add(unit.getId());
+ }
+
+ String message = ""; //$NON-NLS-1$
+ String detailedMessage = ""; //$NON-NLS-1$
+ for (ConnectorDescriptor descriptor : installableConnectors) {
+ StringBuilder unavailableIds = null;
+ for (String id : descriptor.getInstallableUnits()) {
+ if (!foundIds.contains(id)) {
+ if (unavailableIds == null) {
+ unavailableIds = new StringBuilder();
+ } else {
+ unavailableIds.append(Messages.InstallConnectorsJob_commaSeparator);
+ }
+ unavailableIds.append(id);
+ }
+ }
+ if (unavailableIds != null) {
+ if (message.length() > 0) {
+ message += Messages.InstallConnectorsJob_commaSeparator;
+ }
+ message += descriptor.getName();
+
+ if (detailedMessage.length() > 0) {
+ detailedMessage += Messages.InstallConnectorsJob_commaSeparator;
+ }
+ detailedMessage += NLS.bind(Messages.PrepareInstallProfileJob_notFoundDescriptorDetail, new Object[] {
+ descriptor.getName(), unavailableIds.toString(), descriptor.getSiteUrl() });
+ }
+ }
+
+ if (message.length() > 0) {
+ // instead of aborting here we ask the user if they wish to proceed anyways
+ final boolean[] okayToProceed = new boolean[1];
+ final String finalMessage = message;
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ okayToProceed[0] = MessageDialog.openQuestion(DiscoveryUiUtil.getShell(),
+ Messages.InstallConnectorsJob_questionProceed, NLS.bind(
+ Messages.InstallConnectorsJob_questionProceed_long, new Object[] { finalMessage }));
+ }
+ });
+ if (!okayToProceed[0]) {
+ throw new CoreException(new Status(IStatus.ERROR, DiscoveryUi.ID_PLUGIN, NLS.bind(
+ Messages.InstallConnectorsJob_connectorsNotAvailable, detailedMessage), null));
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private boolean addAll(final List<IInstallableUnit> installableUnits, Collector collector) {
+ return installableUnits.addAll(collector.toCollection());
+ }
+
+ private String computeProfileId() throws CoreException {
+ IProfile profile = ProvisioningUtil.getProfile(IProfileRegistry.SELF);
+ if (profile != null) {
+ return profile.getProfileId();
+ }
+ IProfile[] profiles = ProvisioningUtil.getProfiles();
+ if (profiles.length > 0) {
+ return profiles[0].getProfileId();
+ }
+ throw new CoreException(new Status(IStatus.ERROR, DiscoveryUi.ID_PLUGIN,
+ Messages.InstallConnectorsJob_profileProblem, null));
+ }
+
+ public PlannerResolutionOperation getPlannerResolutionOperation() {
+ return plannerResolutionOperation;
+ }
+
+ public String getProfileId() {
+ return profileId;
+ }
+
+ public IInstallableUnit[] getIUs() {
+ return ius;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Set<String> getInstalledFeatures(IProgressMonitor monitor) {
+ Set<String> features = new HashSet<String>();
+ profileId = Policy.getDefault().getProfileChooser().getProfileId(null);
+ IProfile profile;
+ try {
+ profile = ProvisioningUtil.getProfile(profileId);
+ } catch (ProvisionException e) {
+ return getInstalledFeaturesFromPlatform(monitor);
+ }
+ if (profile != null) {
+ Query query = new MatchQuery() {
+ @Override
+ public boolean isMatch(Object object) {
+ if (!(object instanceof IInstallableUnit)) {
+ return false;
+ }
+ IInstallableUnit candidate = (IInstallableUnit) object;
+ if ("true".equalsIgnoreCase(candidate.getProperty("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$ //$NON-NLS-2$
+ String id = candidate.getId();
+ if (id.endsWith(P2_FEATURE_GROUP_SUFFIX)) {
+ IProvidedCapability[] providedCapabilities = candidate.getProvidedCapabilities();
+ if (providedCapabilities != null && providedCapabilities.length > 0) {
+ for (IProvidedCapability capability : providedCapabilities) {
+ if ("org.eclipse.equinox.p2.iu".equals(capability.getNamespace())) { //$NON-NLS-1$
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+ };
+ Collector collector = new Collector();
+ profile.available(query, collector, monitor);
+ for (Iterator<IInstallableUnit> it = collector.iterator(); it.hasNext();) {
+ IInstallableUnit unit = it.next();
+ features.add(unit.getId());
+ }
+ }
+ return features;
+ }
+
+ private Set<String> getInstalledFeaturesFromPlatform(IProgressMonitor monitor) {
+ Set<String> installedFeatures = new HashSet<String>();
+ IBundleGroupProvider[] bundleGroupProviders = Platform.getBundleGroupProviders();
+ for (IBundleGroupProvider provider : bundleGroupProviders) {
+ IBundleGroup[] bundleGroups = provider.getBundleGroups();
+ for (IBundleGroup group : bundleGroups) {
+ installedFeatures.add(group.getIdentifier());
+ }
+ }
+ return installedFeatures;
+ }
+
+}
diff --git a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob.java b/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
similarity index 98%
rename from org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob.java
rename to org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
index d521b88..5f09b46 100644
--- a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob.java
+++ b/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
@@ -61,7 +61,7 @@
* @author David Green
* @author Steffen Pingel
*/
-class PrepareInstallProfileJob extends AbstractInstallJob {
+class PrepareInstallProfileJob_e_3_6 extends AbstractInstallJob {
private final List<ConnectorDescriptor> installableConnectors;
@@ -69,7 +69,7 @@
private Set<URI> repositoryLocations;
- public PrepareInstallProfileJob(List<ConnectorDescriptor> installableConnectors) {
+ public PrepareInstallProfileJob_e_3_6(List<ConnectorDescriptor> installableConnectors) {
if (installableConnectors == null) {
throw new IllegalArgumentException();
}
diff --git a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
index 88e493d..51ddc0a 100644
--- a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
+++ b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.mylyn.internal.discovery.ui;
-import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.List;
@@ -20,7 +19,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
import org.eclipse.osgi.service.resolver.VersionRange;
@@ -48,20 +46,10 @@
Bundle bundle = Platform.getBundle("org.eclipse.equinox.p2.engine"); //$NON-NLS-1$
if (bundle != null && new VersionRange("[1.0.0,1.1.0)").isIncluded(bundle.getVersion())) { //$NON-NLS-1$
// load class for Eclipse 3.5
- try {
- Class<?> clazz = Class.forName("org.eclipse.mylyn.internal.discovery.ui.PrepareInstallProfileJob_e_3_5"); //$NON-NLS-1$
- Constructor<?> c = clazz.getConstructor(List.class);
- runner = (AbstractInstallJob) c.newInstance(descriptors);
- } catch (Throwable t) {
- StatusHandler.log(new Status(
- IStatus.ERROR,
- DiscoveryUi.ID_PLUGIN,
- "Errors occured while initializing provisioning framework, falling back to default implementation. This make cause discovery install to fail.", //$NON-NLS-1$
- t));
- }
+ runner = new PrepareInstallProfileJob_e_3_5(descriptors);
}
if (runner == null) {
- runner = new PrepareInstallProfileJob(descriptors);
+ runner = new PrepareInstallProfileJob_e_3_6(descriptors);
}
return runner;
}
diff --git a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizard.java b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizard.java
index 0000fcd..eaa48ec 100644
--- a/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizard.java
+++ b/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/wizards/ConnectorDiscoveryWizard.java
@@ -28,7 +28,7 @@
* A wizard for performing discovery of connectors and selecting connectors to install. When finish is pressed, selected
* connectors are downloaded and installed.
*
- * @see PrepareInstallProfileJob
+ * @see PrepareInstallProfileJob_e_3_6
* @see ConnectorDiscoveryWizardMainPage
* @author David Green
*/
