Attachment #155547 for bug #292691

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

View | Details | Raw Unified | Return to bug 292691 | Differences between

and this patch

Collapse All | Expand All

Lines 34-43 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
34	org.eclipse.equinox.internal.p2.metadata,	34	org.eclipse.equinox.internal.p2.metadata,
35	org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,	35	org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,
36	org.eclipse.equinox.internal.provisional.frameworkadmin,	36	org.eclipse.equinox.internal.provisional.frameworkadmin,
37	org.eclipse.equinox.internal.provisional.p2.core,
38	org.eclipse.equinox.internal.provisional.p2.metadata,	37	org.eclipse.equinox.internal.provisional.p2.metadata,
39	org.eclipse.equinox.internal.provisional.p2.metadata.query,	38	org.eclipse.equinox.internal.provisional.p2.metadata.query,
40	org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,	39	org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
		40	org.eclipse.equinox.p2.core,
41	org.eclipse.equinox.p2.metadata,	41	org.eclipse.equinox.p2.metadata,
42	org.eclipse.equinox.p2.metadata.query,	42	org.eclipse.equinox.p2.metadata.query,
43	org.eclipse.equinox.p2.repository,	43	org.eclipse.equinox.p2.repository,

Lines 58-64 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
58	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	58	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
59	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",	59	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
60	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",	60	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
61	org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",	61	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
62	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	62	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
63	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",	63	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
64	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",	64	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",




/*******************************************************************************
 * 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

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;

Lines 97-103 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
97	org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",	97	org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",
98	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	98	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
99	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",	99	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
100	org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",	100	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
101	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",	101	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
102	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",	102	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
103	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",	103	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",




/*******************************************************************************
 *  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

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;




/*******************************************************************************
 * 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

		IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();
		if (selected.length == 1) {
			StringBuffer result = new StringBuffer();
			String description = selected[0].getProperty(IInstallableUnit.PROP_DESCRIPTION, null);
			if (description != null) {
				result.append(description);
			} else {
				String name = selected[0].getProperty(IInstallableUnit.PROP_NAME, null);
				if (name != null)
					result.append(name);
				else

Return to bug 292691

Lines 1-5 Link Here

(-)src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others. All rights reserved. This	2	* Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of	3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is	4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html	5	* available at http://www.eclipse.org/legal/epl-v10.html
Lines 25-33 Link Here
25	import org.eclipse.equinox.internal.p2.engine.phases.Collect;	25	import org.eclipse.equinox.internal.p2.engine.phases.Collect;
26	import org.eclipse.equinox.internal.p2.engine.phases.Install;	26	import org.eclipse.equinox.internal.p2.engine.phases.Install;
27	import org.eclipse.equinox.internal.p2.metadata.*;	27	import org.eclipse.equinox.internal.p2.metadata.*;
28	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
		30	import org.eclipse.equinox.p2.core.ProvisionException;
31	import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;	31	import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;
32	import org.eclipse.equinox.p2.internal.repository.tools.tasks.IUDescription;	32	import org.eclipse.equinox.p2.internal.repository.tools.tasks.IUDescription;
33	import org.eclipse.equinox.p2.internal.repository.tools.tasks.Repo2RunnableTask;	33	import org.eclipse.equinox.p2.internal.repository.tools.tasks.Repo2RunnableTask;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/target/IUBundleContainer.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-26 Link Here
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
17	import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;	17	import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
18	import org.eclipse.equinox.internal.p2.engine.PhaseSet;	18	import org.eclipse.equinox.internal.p2.engine.PhaseSet;
19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
20	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;	19	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
21	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	20	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.Version;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
		23	import org.eclipse.equinox.p2.core.ProvisionException;
24	import org.eclipse.equinox.p2.engine.*;	24	import org.eclipse.equinox.p2.engine.*;
25	import org.eclipse.equinox.p2.metadata.IArtifactKey;	25	import org.eclipse.equinox.p2.metadata.IArtifactKey;
26	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	26	import org.eclipse.equinox.p2.metadata.IInstallableUnit;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 IBM Corporation and others.	2	* Copyright (c) 2008, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-27 Link Here
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
17	import org.eclipse.core.runtime.jobs.Job;	17	import org.eclipse.core.runtime.jobs.Job;
18	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;	18	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
19	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.MatchQuery;
		24	import org.eclipse.equinox.p2.core.ProvisionException;
25	import org.eclipse.equinox.p2.engine.IProfile;	25	import org.eclipse.equinox.p2.engine.IProfile;
26	import org.eclipse.equinox.p2.engine.IProfileRegistry;	26	import org.eclipse.equinox.p2.engine.IProfileRegistry;
27	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	27	import org.eclipse.equinox.p2.metadata.IInstallableUnit;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 341-351 Link Here
341	IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();	341	IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();
342	if (selected.length == 1) {	342	if (selected.length == 1) {
343	StringBuffer result = new StringBuffer();	343	StringBuffer result = new StringBuffer();
344	String description = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_DESCRIPTION);	344	String description = selected[0].getProperty(IInstallableUnit.PROP_DESCRIPTION, null);
345	if (description != null) {	345	if (description != null) {
346	result.append(description);	346	result.append(description);
347	} else {	347	} else {
348	String name = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_NAME);	348	String name = selected[0].getProperty(IInstallableUnit.PROP_NAME, null);
349	if (name != null)	349	if (name != null)
350	result.append(name);	350	result.append(name);
351	else	351	else