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 222309 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java (-1 / +2 lines)
Lines 13-18 Link Here
13
13
14
import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
14
import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
16
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
16
import org.eclipse.swt.SWT;
17
import org.eclipse.swt.SWT;
17
import org.eclipse.swt.events.ModifyListener;
18
import org.eclipse.swt.events.ModifyListener;
18
import org.eclipse.swt.layout.GridData;
19
import org.eclipse.swt.layout.GridData;
Lines 66-72 Link Here
66
		String[] userPropNames = new String[] {ProvAdminUIMessages.IUPropertiesGroup_NamePropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_DescriptionPropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_ProviderPropertyLabel};
67
		String[] userPropNames = new String[] {ProvAdminUIMessages.IUPropertiesGroup_NamePropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_DescriptionPropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_ProviderPropertyLabel};
67
		for (int i = 0; i < propNames.length; i++) {
68
		for (int i = 0; i < propNames.length; i++) {
68
			TableItem item = new TableItem(propertiesTable, SWT.NULL);
69
			TableItem item = new TableItem(propertiesTable, SWT.NULL);
69
			String value = getIU().getProperty(propNames[i]);
70
			String value = IUPropertyUtils.getIUProperty(getIU(), propNames[i]);
70
			if (value != null)
71
			if (value != null)
71
				item.setText(new String[] {userPropNames[i], value});
72
				item.setText(new String[] {userPropNames[i], value});
72
		}
73
		}
(-)src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java (-1 / +3 lines)
Lines 25-30 Link Here
25
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
25
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
26
import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
26
import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
27
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProfileModificationOperation;
27
import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProfileModificationOperation;
28
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
28
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*;
29
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*;
29
import org.eclipse.jface.dialogs.Dialog;
30
import org.eclipse.jface.dialogs.Dialog;
30
import org.eclipse.jface.dialogs.IMessageProvider;
31
import org.eclipse.jface.dialogs.IMessageProvider;
Lines 329-335 Link Here
329
	}
330
	}
330
331
331
	protected String getIUDescription(IInstallableUnit iu) {
332
	protected String getIUDescription(IInstallableUnit iu) {
332
		String description = iu.getProperty(IInstallableUnit.PROP_DESCRIPTION);
333
		// Get the iu description in the default locale
334
		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION);
333
		if (description == null)
335
		if (description == null)
334
			description = ""; //$NON-NLS-1$
336
			description = ""; //$NON-NLS-1$
335
		return description;
337
		return description;
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyUtils.java (-6 / +61 lines)
Lines 10-15 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.equinox.internal.provisional.p2.ui.query;
11
package org.eclipse.equinox.internal.provisional.p2.ui.query;
12
12
13
import java.net.URL;
13
import java.util.*;
14
import java.util.*;
14
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
15
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
15
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
16
import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
Lines 24-35 Link Here
24
	static final Locale DEFAULT_LOCALE = new Locale("df", "LT"); //$NON-NLS-1$//$NON-NLS-2$
25
	static final Locale DEFAULT_LOCALE = new Locale("df", "LT"); //$NON-NLS-1$//$NON-NLS-2$
25
	static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$
26
	static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$
26
27
28
	// Get the license in the default locale.
29
	public static License getLicense(IInstallableUnit iu) {
30
		return getLicense(iu, getCurrentLocale());
31
	}
32
33
	// Get the copyright in the default locale.
34
	public static Copyright getCopyright(IInstallableUnit iu) {
35
		return getCopyright(iu, getCurrentLocale());
36
	}
37
38
	// Get a property in the default locale
39
	public static String getIUProperty(IInstallableUnit iu, String propertyKey) {
40
		return getIUProperty(iu, propertyKey, getCurrentLocale());
41
	}
42
43
	public static License getLicense(IInstallableUnit iu, Locale locale) {
44
		License license = iu.getLicense();
45
		String body = (license != null ? license.getBody() : null);
46
		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
47
			return license;
48
		final String actualKey = body.substring(1); // Strip off the %
49
		body = getLocalizedIUProperty(iu, actualKey, locale);
50
		URL url = license.getURL();
51
		return new License((url != null ? url.toExternalForm() : null), body);
52
	}
53
54
	public static Copyright getCopyright(IInstallableUnit iu, Locale locale) {
55
		Copyright copyright = iu.getCopyright();
56
		String body = (copyright != null ? copyright.getBody() : null);
57
		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
58
			return copyright;
59
		final String actualKey = body.substring(1); // Strip off the %
60
		body = getLocalizedIUProperty(iu, actualKey, locale);
61
		URL url = copyright.getURL();
62
		return new Copyright((url != null ? url.toExternalForm() : null), body);
63
	}
64
27
	public static String getIUProperty(IInstallableUnit iu, String propertyKey, Locale locale) {
65
	public static String getIUProperty(IInstallableUnit iu, String propertyKey, Locale locale) {
28
		String value = iu.getProperty(propertyKey);
66
		String value = iu.getProperty(propertyKey);
29
		if (value == null || value.length() <= 1 || value.charAt(0) != '%')
67
		if (value == null || value.length() <= 1 || value.charAt(0) != '%')
30
			return value;
68
			return value;
31
		// else have a localizable property
69
		// else have a localizable property
32
		final String actualKey = value.substring(1); // Strip off the %
70
		final String actualKey = value.substring(1); // Strip off the %
71
		return getLocalizedIUProperty(iu, actualKey, locale);
72
	}
73
74
	private static String getLocalizedIUProperty(IInstallableUnit iu, String actualKey, Locale locale) {
75
		// Short circuit query if iu provides value for matching locale	
76
		String localizedKey = makeLocalizedKey(actualKey, locale.toString());
77
		String localizedValue = iu.getProperty(localizedKey);
78
		if (localizedValue != null)
79
			return localizedValue;
80
33
		final List locales = buildLocaleVariants(locale);
81
		final List locales = buildLocaleVariants(locale);
34
		final IInstallableUnit theUnit = iu;
82
		final IInstallableUnit theUnit = iu;
35
83
Lines 89-100 Link Here
89
			}
137
			}
90
		}
138
		}
91
139
92
		String defaultKey = makeLocalizedKey(actualKey, DEFAULT_LOCALE.toString());
140
		for (Iterator iter = locales.iterator(); iter.hasNext();) {
93
		String defaultValue = iu.getProperty(defaultKey);
141
			String nextLocale = (String) iter.next();
94
		if (defaultValue != null)
142
			String localeKey = makeLocalizedKey(actualKey, nextLocale);
95
			return defaultValue;
143
			String nextValue = iu.getProperty(localeKey);
144
			if (nextValue != null)
145
				return nextValue;
146
		}
96
147
97
		return value;
148
		return actualKey;
98
	}
149
	}
99
150
100
	/**
151
	/**
Lines 111-117 Link Here
111
			nl = nl.substring(0, lastSeparator);
162
			nl = nl.substring(0, lastSeparator);
112
		}
163
		}
113
		// Add the default locale (most general)
164
		// Add the default locale (most general)
114
		result.add(DEFAULT_LOCALE);
165
		result.add(DEFAULT_LOCALE.toString());
115
		return result;
166
		return result;
116
	}
167
	}
117
168
Lines 119-122 Link Here
119
		return localeImage + '.' + actualKey;
170
		return localeImage + '.' + actualKey;
120
	}
171
	}
121
172
173
	private static Locale getCurrentLocale() {
174
		return Locale.getDefault();
175
	}
176
122
}
177
}
(-)src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java (-2 / +4 lines)
Lines 22-27 Link Here
22
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
22
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
23
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
23
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
24
import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
24
import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
25
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
25
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
26
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
26
import org.eclipse.jface.viewers.*;
27
import org.eclipse.jface.viewers.*;
27
import org.eclipse.osgi.util.NLS;
28
import org.eclipse.osgi.util.NLS;
Lines 88-94 Link Here
88
			case IUColumnConfig.COLUMN_ID :
89
			case IUColumnConfig.COLUMN_ID :
89
				return iu.getId();
90
				return iu.getId();
90
			case IUColumnConfig.COLUMN_NAME :
91
			case IUColumnConfig.COLUMN_NAME :
91
				String name = iu.getProperty(IInstallableUnit.PROP_NAME);
92
				// Get the iu name in the current locale
93
				String name = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
92
				if (name != null)
94
				if (name != null)
93
					return name;
95
					return name;
94
				return BLANK;
96
				return BLANK;
Lines 193-199 Link Here
193
		IInstallableUnit iu = (IInstallableUnit) ProvUI.getAdapter(element, IInstallableUnit.class);
195
		IInstallableUnit iu = (IInstallableUnit) ProvUI.getAdapter(element, IInstallableUnit.class);
194
		if (iu == null || toolTipProperty == null)
196
		if (iu == null || toolTipProperty == null)
195
			return null;
197
			return null;
196
		return iu.getProperty(toolTipProperty);
198
		return IUPropertyUtils.getIUProperty(iu, toolTipProperty);
197
	}
199
	}
198
200
199
	/* (non-Javadoc)
201
	/* (non-Javadoc)
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java (-2 / +3 lines)
Lines 14-19 Link Here
14
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
14
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
16
import org.eclipse.equinox.internal.provisional.p2.metadata.License;
16
import org.eclipse.equinox.internal.provisional.p2.metadata.License;
17
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
17
import org.eclipse.osgi.util.NLS;
18
import org.eclipse.osgi.util.NLS;
18
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.events.SelectionAdapter;
20
import org.eclipse.swt.events.SelectionAdapter;
Lines 30-37 Link Here
30
public class IULicensePropertyPage extends IUPropertyPage {
31
public class IULicensePropertyPage extends IUPropertyPage {
31
32
32
	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
33
	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
33
34
		// Get the license in the default locale
34
		final License license = iu.getLicense();
35
		final License license = IUPropertyUtils.getLicense(iu);
35
		if (license != null && license.getBody().length() > 0) {
36
		if (license != null && license.getBody().length() > 0) {
36
			Composite composite = new Composite(parent, SWT.NONE);
37
			Composite composite = new Composite(parent, SWT.NONE);
37
			GridLayout layout = new GridLayout();
38
			GridLayout layout = new GridLayout();
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUPatternFilter.java (-1 / +3 lines)
Lines 13-18 Link Here
13
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
13
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
14
import org.eclipse.equinox.internal.provisional.p2.ui.model.CategoryElement;
14
import org.eclipse.equinox.internal.provisional.p2.ui.model.CategoryElement;
15
import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
15
import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
16
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
16
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
17
import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
17
import org.eclipse.jface.viewers.Viewer;
18
import org.eclipse.jface.viewers.Viewer;
18
import org.eclipse.ui.dialogs.PatternFilter;
19
import org.eclipse.ui.dialogs.PatternFilter;
Lines 89-95 Link Here
89
		if (element instanceof IUElement) {
90
		if (element instanceof IUElement) {
90
			IInstallableUnit iu = ((IUElement) element).getIU();
91
			IInstallableUnit iu = ((IUElement) element).getIU();
91
			if (checkName) {
92
			if (checkName) {
92
				text = iu.getProperty(IInstallableUnit.PROP_NAME);
93
				// Get the iu name in the default locale
94
				text = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
93
				if (text != null && wordMatches(text))
95
				if (text != null && wordMatches(text))
94
					return true;
96
					return true;
95
			}
97
			}
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java (-1 / +3 lines)
Lines 14-19 Link Here
14
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
14
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.Copyright;
15
import org.eclipse.equinox.internal.provisional.p2.metadata.Copyright;
16
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
16
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
17
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
17
import org.eclipse.osgi.util.NLS;
18
import org.eclipse.osgi.util.NLS;
18
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.SWT;
19
import org.eclipse.swt.events.SelectionAdapter;
20
import org.eclipse.swt.events.SelectionAdapter;
Lines 30-36 Link Here
30
public class IUCopyrightPropertyPage extends IUPropertyPage {
31
public class IUCopyrightPropertyPage extends IUPropertyPage {
31
32
32
	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
33
	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
33
		final Copyright copyright = iu.getCopyright();
34
		// Get the copyright in the current locale
35
		final Copyright copyright = IUPropertyUtils.getCopyright(iu);
34
		if (copyright != null && copyright.getBody().length() > 0) {
36
		if (copyright != null && copyright.getBody().length() > 0) {
35
			Composite composite = new Composite(parent, SWT.NONE);
37
			Composite composite = new Composite(parent, SWT.NONE);
36
			GridLayout layout = new GridLayout();
38
			GridLayout layout = new GridLayout();
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java (-7 / +6 lines)
Lines 12-18 Link Here
12
12
13
import java.net.MalformedURLException;
13
import java.net.MalformedURLException;
14
import java.net.URL;
14
import java.net.URL;
15
import java.util.Locale;
16
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
15
import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
17
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
16
import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
18
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
17
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
Lines 54-71 Link Here
54
		layout.marginHeight = 0;
53
		layout.marginHeight = 0;
55
		composite.setLayout(layout);
54
		composite.setLayout(layout);
56
		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
55
		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
57
		Locale currentLocale = Locale.getDefault();
56
		// Get general info in the default locale
58
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_NameLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME, currentLocale));
57
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_NameLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME));
59
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_IdentifierLabel, iu.getId());
58
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_IdentifierLabel, iu.getId());
60
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_VersionLabel, iu.getVersion().toString());
59
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_VersionLabel, iu.getVersion().toString());
61
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ProviderLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_PROVIDER, currentLocale));
60
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ProviderLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_PROVIDER));
62
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ContactLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_CONTACT, currentLocale));
61
		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ContactLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_CONTACT));
63
62
64
	}
63
	}
65
64
66
	private void createDescriptionSection(Composite parent, IInstallableUnit iu) {
65
	private void createDescriptionSection(Composite parent, IInstallableUnit iu) {
67
		Locale currentLocale = Locale.getDefault();
66
		// Get the iu description in the default locale
68
		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION, currentLocale);
67
		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION);
69
		if (description != null && description.length() > 0) {
68
		if (description != null && description.length() > 0) {
70
			Group group = new Group(parent, SWT.NONE);
69
			Group group = new Group(parent, SWT.NONE);
71
			group.setText(ProvUIMessages.IUGeneralInfoPropertyPage_DescriptionLabel);
70
			group.setText(ProvUIMessages.IUGeneralInfoPropertyPage_DescriptionLabel);
(-)src/org/eclipse/equinox/internal/p2/ui/PlanStatusHelper.java (-1 / +3 lines)
Lines 17-22 Link Here
17
import org.eclipse.equinox.internal.provisional.p2.engine.Operand;
17
import org.eclipse.equinox.internal.provisional.p2.engine.Operand;
18
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
18
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
19
import org.eclipse.equinox.internal.provisional.p2.ui.IStatusCodes;
19
import org.eclipse.equinox.internal.provisional.p2.ui.IStatusCodes;
20
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
20
import org.eclipse.osgi.util.NLS;
21
import org.eclipse.osgi.util.NLS;
21
22
22
/**
23
/**
Lines 83-89 Link Here
83
	private static String getIUString(IInstallableUnit iu) {
84
	private static String getIUString(IInstallableUnit iu) {
84
		if (iu == null)
85
		if (iu == null)
85
			return ProvUIMessages.PlanStatusHelper_Items;
86
			return ProvUIMessages.PlanStatusHelper_Items;
86
		String name = iu.getProperty(IInstallableUnit.PROP_NAME);
87
		// Get the iu name in the default locale
88
		String name = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
87
		if (name != null)
89
		if (name != null)
88
			return name;
90
			return name;
89
		return iu.getId();
91
		return iu.getId();
(-)src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java (-2 / +4 lines)
Lines 12-17 Link Here
12
12
13
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
13
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
14
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
14
import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
15
import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
15
import org.eclipse.jface.viewers.Viewer;
16
import org.eclipse.jface.viewers.Viewer;
16
import org.eclipse.jface.viewers.ViewerComparator;
17
import org.eclipse.jface.viewers.ViewerComparator;
17
18
Lines 33-42 Link Here
33
34
34
		String key1, key2;
35
		String key1, key2;
35
		if (key == IU_NAME) {
36
		if (key == IU_NAME) {
36
			key1 = iu1.getProperty(IInstallableUnit.PROP_NAME);
37
			// Compare the iu names in the default locale
38
			key1 = IUPropertyUtils.getIUProperty(iu1, IInstallableUnit.PROP_NAME);
37
			if (key1 == null)
39
			if (key1 == null)
38
				key1 = ""; //$NON-NLS-1$
40
				key1 = ""; //$NON-NLS-1$
39
			key2 = iu2.getProperty(IInstallableUnit.PROP_NAME);
41
			key2 = IUPropertyUtils.getIUProperty(iu2, IInstallableUnit.PROP_NAME);
40
			if (key2 == null)
42
			if (key2 == null)
41
				key2 = ""; //$NON-NLS-1$
43
				key2 = ""; //$NON-NLS-1$
42
		} else {
44
		} else {

Return to bug 222309