Attachment 155547 Details for Bug 292691 – Fixes from moving ProvisionException to API package

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fixes from moving ProvisionException to API package

patch.txt (text/plain), 9.72 KB, created by John Arthorne

on 2010-01-07 15:45:46 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2010-01-07 15:45:46 EST

Size: 9.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/META-INF/MANIFEST.MF,v
>retrieving revision 1.37.2.7
>diff -u -r1.37.2.7 MANIFEST.MF
>--- META-INF/MANIFEST.MF	5 Jan 2010 18:46:06 -0000	1.37.2.7
>+++ META-INF/MANIFEST.MF	7 Jan 2010 20:48:43 -0000
>@@ -34,10 +34,10 @@
>  org.eclipse.equinox.internal.p2.metadata,
>  org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,
>  org.eclipse.equinox.internal.provisional.frameworkadmin,
>- org.eclipse.equinox.internal.provisional.p2.core,
>  org.eclipse.equinox.internal.provisional.p2.metadata,
>  org.eclipse.equinox.internal.provisional.p2.metadata.query,
>  org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
>+ org.eclipse.equinox.p2.core,
>  org.eclipse.equinox.p2.metadata,
>  org.eclipse.equinox.p2.metadata.query,
>  org.eclipse.equinox.p2.repository,
>Index: src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java,v
>retrieving revision 1.12.2.10
>diff -u -r1.12.2.10 BrandP2Task.java
>--- src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	4 Jan 2010 19:38:21 -0000	1.12.2.10
>+++ src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	7 Jan 2010 20:48:43 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others. All rights reserved. This
>+ * Copyright (c) 2009, 2010 IBM Corporation 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
>@@ -25,9 +25,9 @@
> import org.eclipse.equinox.internal.p2.engine.phases.Collect;
> import org.eclipse.equinox.internal.p2.engine.phases.Install;
> import org.eclipse.equinox.internal.p2.metadata.*;
>-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;
> import org.eclipse.equinox.p2.internal.repository.tools.tasks.IUDescription;
> import org.eclipse.equinox.p2.internal.repository.tools.tasks.Repo2RunnableTask;
>#P org.eclipse.pde.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.50.4.4
>diff -u -r1.50.4.4 MANIFEST.MF
>--- META-INF/MANIFEST.MF	2 Dec 2009 17:53:53 -0000	1.50.4.4
>+++ META-INF/MANIFEST.MF	7 Jan 2010 20:48:44 -0000
>@@ -58,7 +58,7 @@
>  org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
>  org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
>- org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
>Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v
>retrieving revision 1.5.2.10
>diff -u -r1.5.2.10 IUBundleContainer.java
>--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	4 Jan 2010 19:28:27 -0000	1.5.2.10
>+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	7 Jan 2010 20:48:44 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2010 IBM Corporation 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
>@@ -16,11 +16,11 @@
> import org.eclipse.core.runtime.*;
> import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
> import org.eclipse.equinox.internal.p2.engine.PhaseSet;
>-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
> import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
> import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.engine.*;
> import org.eclipse.equinox.p2.metadata.IArtifactKey;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>#P org.eclipse.pde.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.78.4.5
>diff -u -r1.78.4.5 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Jan 2010 17:01:45 -0000	1.78.4.5
>+++ META-INF/MANIFEST.MF	7 Jan 2010 20:48:44 -0000
>@@ -97,7 +97,7 @@
>  org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
>- org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",
>+ org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",
>Index: src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java,v
>retrieving revision 1.16.2.12
>diff -u -r1.16.2.12 RuntimeInstallJob.java
>--- src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	4 Jan 2010 19:28:26 -0000	1.16.2.12
>+++ src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	7 Jan 2010 20:48:44 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- *  Copyright (c) 2008, 2009 IBM Corporation and others.
>+ *  Copyright (c) 2008, 2010 IBM Corporation 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
>@@ -16,12 +16,12 @@
> import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
>-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> 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.metadata.MetadataFactory.InstallableUnitPatchDescription;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.engine.IProfile;
> import org.eclipse.equinox.p2.engine.IProfileRegistry;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>Index: src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java,v
>retrieving revision 1.9.6.5
>diff -u -r1.9.6.5 EditIUContainerPage.java
>--- src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	8 Dec 2009 15:46:44 -0000	1.9.6.5
>+++ src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java	7 Jan 2010 20:48:44 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2010 IBM Corporation 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
>@@ -341,11 +341,11 @@
> 		IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();
> 		if (selected.length == 1) {
> 			StringBuffer result = new StringBuffer();
>-			String description = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_DESCRIPTION);
>+			String description = selected[0].getProperty(IInstallableUnit.PROP_DESCRIPTION, null);
> 			if (description != null) {
> 				result.append(description);
> 			} else {
>-				String name = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_NAME);
>+				String name = selected[0].getProperty(IInstallableUnit.PROP_NAME, null);
> 				if (name != null)
> 					result.append(name);
> 				else

Actions: View | Diff

Attachments on bug 292691: 152095 | 152205 | 152362 | 152365 | 152504 | 152544 | 152984 | 152986 | 153141 | 153282 | 153349 | 153895 | 153988 | 154541 | 154542 | 154883 | 155120 | 155154 | 155466 | 155547 | 155813 | 155814 | 155879 | 155912 | 155913 | 155979