Attachment #152544 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 95-100 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
95	org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",	95	org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
96	org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)",	96	org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)",
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.common;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.metadata;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.engine;bundle-version="[2.0.0,3.0.0)",
100	org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",	101	org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",




import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.operations.IUPropertyUtils;
import org.eclipse.equinox.p2.ui.Policy;
import org.eclipse.equinox.p2.ui.ProvisioningUI;
import org.eclipse.jface.action.IAction;

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




 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import org.eclipse.equinox.p2.operations.IUPropertyUtils;

import com.ibm.icu.text.MessageFormat;
import java.net.URI;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.common.TranslationSupport;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.internal.core.target.*;


	private boolean fShowVersion = true;
	private boolean fAppendResolvedVariables = false;
	private TranslationSupport fTranslations;

	/**
	 * Creates a label provider.

		PDEPlugin.getDefault().getLabelProvider().connect(this);
		fShowVersion = showVersion;
		fAppendResolvedVariables = appendResolvedVariables;
		fTranslations = new TranslationSupport();
	}

	/* (non-Javadoc)

			appendIncludedBundles(styledString, container);
		} else if (element instanceof IInstallableUnit) {
			IInstallableUnit iu = (IInstallableUnit) element;
			String name = fTranslations.getIUProperty(iu, IInstallableUnit.PROP_NAME);
			if (name == null) {
				name = iu.getId();
			}

Return to bug 292691

Lines 19-25 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditIUContainerPage.java (-3 / +2 lines)
19	import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;	19	import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
20	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	20	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
22	import org.eclipse.equinox.p2.operations.IUPropertyUtils;
23	import org.eclipse.equinox.p2.ui.Policy;	22	import org.eclipse.equinox.p2.ui.Policy;
24	import org.eclipse.equinox.p2.ui.ProvisioningUI;	23	import org.eclipse.equinox.p2.ui.ProvisioningUI;
25	import org.eclipse.jface.action.IAction;	24	import org.eclipse.jface.action.IAction;
Lines 342-352 Link Here
342	IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();	341	IInstallableUnit[] selected = fAvailableIUGroup.getSelectedIUs();
343	if (selected.length == 1) {	342	if (selected.length == 1) {
344	StringBuffer result = new StringBuffer();	343	StringBuffer result = new StringBuffer();
345	String description = IUPropertyUtils.getIUProperty(selected[0], IInstallableUnit.PROP_DESCRIPTION);	344	String description = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_DESCRIPTION);
346	if (description != null) {	345	if (description != null) {
347	result.append(description);	346	result.append(description);
348	} else {	347	} else {
349	String name = IUPropertyUtils.getIUProperty(selected[0], IInstallableUnit.PROP_NAME);	348	String name = profileUI.getTranslationSupport().getIUProperty(selected[0], IInstallableUnit.PROP_NAME);
350	if (name != null)	349	if (name != null)
351	result.append(name);	350	result.append(name);
352	else	351	else

Lines 10-22 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java (-3 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.shared.target;	11	package org.eclipse.pde.internal.ui.shared.target;
12		12
13	import org.eclipse.equinox.p2.operations.IUPropertyUtils;
14
15	import com.ibm.icu.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
16	import java.net.URI;	14	import java.net.URI;
17	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
18	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
		18	import org.eclipse.equinox.p2.common.TranslationSupport;
20	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
21	import org.eclipse.jface.viewers.*;	20	import org.eclipse.jface.viewers.*;
22	import org.eclipse.pde.internal.core.target.*;	21	import org.eclipse.pde.internal.core.target.*;
Lines 38-43 Link Here
38		37
39	private boolean fShowVersion = true;	38	private boolean fShowVersion = true;
40	private boolean fAppendResolvedVariables = false;	39	private boolean fAppendResolvedVariables = false;
		40	private TranslationSupport fTranslations;
41		41
42	/**	42	/**
43	* Creates a label provider.	43	* Creates a label provider.
Lines 50-55 Link Here
50	PDEPlugin.getDefault().getLabelProvider().connect(this);	50	PDEPlugin.getDefault().getLabelProvider().connect(this);
51	fShowVersion = showVersion;	51	fShowVersion = showVersion;
52	fAppendResolvedVariables = appendResolvedVariables;	52	fAppendResolvedVariables = appendResolvedVariables;
		53	fTranslations = new TranslationSupport();
53	}	54	}
54		55
55	/* (non-Javadoc)	56	/* (non-Javadoc)
Lines 136-142 Link Here
136	appendIncludedBundles(styledString, container);	137	appendIncludedBundles(styledString, container);
137	} else if (element instanceof IInstallableUnit) {	138	} else if (element instanceof IInstallableUnit) {
138	IInstallableUnit iu = (IInstallableUnit) element;	139	IInstallableUnit iu = (IInstallableUnit) element;
139	String name = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);	140	String name = fTranslations.getIUProperty(iu, IInstallableUnit.PROP_NAME);
140	if (name == null) {	141	if (name == null) {
141	name = iu.getId();	142	name = iu.getId();
142	}	143	}