Attachment 100028 Details for Bug 222309 – UI patch with additional changes suggested by Susan

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

[patch] UI patch with additional changes suggested by Susan

222309Patch5.txt (text/plain), 19.40 KB, created by Dave Stevenson

on 2008-05-13 15:40:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Stevenson

Created: 2008-05-13 15:40:57 EDT

Size: 19.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.ui.admin
>Index: src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUPropertiesGroup.java
>--- src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java	12 Feb 2008 19:21:43 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java	13 May 2008 19:26:23 -0000
>@@ -13,6 +13,7 @@
> 
> import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.layout.GridData;
>@@ -66,7 +67,7 @@
> 		String[] userPropNames = new String[] {ProvAdminUIMessages.IUPropertiesGroup_NamePropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_DescriptionPropertyLabel, ProvAdminUIMessages.IUPropertiesGroup_ProviderPropertyLabel};
> 		for (int i = 0; i < propNames.length; i++) {
> 			TableItem item = new TableItem(propertiesTable, SWT.NULL);
>-			String value = getIU().getProperty(propNames[i]);
>+			String value = IUPropertyUtils.getIUProperty(getIU(), propNames[i]);
> 			if (value != null)
> 				item.setText(new String[] {userPropNames[i], value});
> 		}
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java,v
>retrieving revision 1.25
>diff -u -r1.25 ProfileModificationWizardPage.java
>--- src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java	7 May 2008 15:18:20 -0000	1.25
>+++ src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java	13 May 2008 19:26:25 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner;
> import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProfileModificationOperation;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IMessageProvider;
>@@ -329,7 +330,8 @@
> 	}
> 
> 	protected String getIUDescription(IInstallableUnit iu) {
>-		String description = iu.getProperty(IInstallableUnit.PROP_DESCRIPTION);
>+		// Get the iu description in the default locale
>+		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION);
> 		if (description == null)
> 			description = ""; //$NON-NLS-1$
> 		return description;
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyUtils.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyUtils.java,v
>retrieving revision 1.3
>diff -u -r1.3 IUPropertyUtils.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyUtils.java	1 Apr 2008 00:48:07 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyUtils.java	13 May 2008 19:26:25 -0000
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.provisional.p2.ui.query;
> 
>+import java.net.URL;
> import java.util.*;
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
>@@ -24,12 +25,59 @@
> 	static final Locale DEFAULT_LOCALE = new Locale("df", "LT"); //$NON-NLS-1$//$NON-NLS-2$
> 	static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$
> 
>+	// Get the license in the default locale.
>+	public static License getLicense(IInstallableUnit iu) {
>+		return getLicense(iu, getCurrentLocale());
>+	}
>+
>+	// Get the copyright in the default locale.
>+	public static Copyright getCopyright(IInstallableUnit iu) {
>+		return getCopyright(iu, getCurrentLocale());
>+	}
>+
>+	// Get a property in the default locale
>+	public static String getIUProperty(IInstallableUnit iu, String propertyKey) {
>+		return getIUProperty(iu, propertyKey, getCurrentLocale());
>+	}
>+
>+	public static License getLicense(IInstallableUnit iu, Locale locale) {
>+		License license = iu.getLicense();
>+		String body = (license != null ? license.getBody() : null);
>+		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
>+			return license;
>+		final String actualKey = body.substring(1); // Strip off the %
>+		body = getLocalizedIUProperty(iu, actualKey, locale);
>+		URL url = license.getURL();
>+		return new License((url != null ? url.toExternalForm() : null), body);
>+	}
>+
>+	public static Copyright getCopyright(IInstallableUnit iu, Locale locale) {
>+		Copyright copyright = iu.getCopyright();
>+		String body = (copyright != null ? copyright.getBody() : null);
>+		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
>+			return copyright;
>+		final String actualKey = body.substring(1); // Strip off the %
>+		body = getLocalizedIUProperty(iu, actualKey, locale);
>+		URL url = copyright.getURL();
>+		return new Copyright((url != null ? url.toExternalForm() : null), body);
>+	}
>+
> 	public static String getIUProperty(IInstallableUnit iu, String propertyKey, Locale locale) {
> 		String value = iu.getProperty(propertyKey);
> 		if (value == null || value.length() <= 1 || value.charAt(0) != '%')
> 			return value;
> 		// else have a localizable property
> 		final String actualKey = value.substring(1); // Strip off the %
>+		return getLocalizedIUProperty(iu, actualKey, locale);
>+	}
>+
>+	private static String getLocalizedIUProperty(IInstallableUnit iu, String actualKey, Locale locale) {
>+		// Short circuit query if iu provides value for matching locale	
>+		String localizedKey = makeLocalizedKey(actualKey, locale.toString());
>+		String localizedValue = iu.getProperty(localizedKey);
>+		if (localizedValue != null)
>+			return localizedValue;
>+
> 		final List locales = buildLocaleVariants(locale);
> 		final IInstallableUnit theUnit = iu;
> 
>@@ -89,12 +137,15 @@
> 			}
> 		}
> 
>-		String defaultKey = makeLocalizedKey(actualKey, DEFAULT_LOCALE.toString());
>-		String defaultValue = iu.getProperty(defaultKey);
>-		if (defaultValue != null)
>-			return defaultValue;
>+		for (Iterator iter = locales.iterator(); iter.hasNext();) {
>+			String nextLocale = (String) iter.next();
>+			String localeKey = makeLocalizedKey(actualKey, nextLocale);
>+			String nextValue = iu.getProperty(localeKey);
>+			if (nextValue != null)
>+				return nextValue;
>+		}
> 
>-		return value;
>+		return actualKey;
> 	}
> 
> 	/**
>@@ -111,7 +162,7 @@
> 			nl = nl.substring(0, lastSeparator);
> 		}
> 		// Add the default locale (most general)
>-		result.add(DEFAULT_LOCALE);
>+		result.add(DEFAULT_LOCALE.toString());
> 		return result;
> 	}
> 
>@@ -119,4 +170,8 @@
> 		return localeImage + '.' + actualKey;
> 	}
> 
>+	private static Locale getCurrentLocale() {
>+		return Locale.getDefault();
>+	}
>+
> }
>Index: src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java,v
>retrieving revision 1.7
>diff -u -r1.7 IUDetailsLabelProvider.java
>--- src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java	8 Apr 2008 19:58:10 -0000	1.7
>+++ src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java	13 May 2008 19:26:25 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
> import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
> import org.eclipse.jface.viewers.*;
> import org.eclipse.osgi.util.NLS;
>@@ -88,7 +89,8 @@
> 			case IUColumnConfig.COLUMN_ID :
> 				return iu.getId();
> 			case IUColumnConfig.COLUMN_NAME :
>-				String name = iu.getProperty(IInstallableUnit.PROP_NAME);
>+				// Get the iu name in the current locale
>+				String name = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
> 				if (name != null)
> 					return name;
> 				return BLANK;
>@@ -193,7 +195,7 @@
> 		IInstallableUnit iu = (IInstallableUnit) ProvUI.getAdapter(element, IInstallableUnit.class);
> 		if (iu == null || toolTipProperty == null)
> 			return null;
>-		return iu.getProperty(toolTipProperty);
>+		return IUPropertyUtils.getIUProperty(iu, toolTipProperty);
> 	}
> 
> 	/* (non-Javadoc)
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java,v
>retrieving revision 1.5
>diff -u -r1.5 IULicensePropertyPage.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java	29 Feb 2008 00:47:38 -0000	1.5
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java	13 May 2008 19:26:25 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.metadata.License;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -30,8 +31,8 @@
> public class IULicensePropertyPage extends IUPropertyPage {
> 
> 	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
>-
>-		final License license = iu.getLicense();
>+		// Get the license in the default locale
>+		final License license = IUPropertyUtils.getLicense(iu);
> 		if (license != null && license.getBody().length() > 0) {
> 			Composite composite = new Composite(parent, SWT.NONE);
> 			GridLayout layout = new GridLayout();
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUPatternFilter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUPatternFilter.java,v
>retrieving revision 1.1
>diff -u -r1.1 AvailableIUPatternFilter.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUPatternFilter.java	9 Apr 2008 17:52:06 -0000	1.1
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUPatternFilter.java	13 May 2008 19:26:25 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.ui.model.CategoryElement;
> import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.ui.dialogs.PatternFilter;
>@@ -89,7 +90,8 @@
> 		if (element instanceof IUElement) {
> 			IInstallableUnit iu = ((IUElement) element).getIU();
> 			if (checkName) {
>-				text = iu.getProperty(IInstallableUnit.PROP_NAME);
>+				// Get the iu name in the default locale
>+				text = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
> 				if (text != null && wordMatches(text))
> 					return true;
> 			}
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUCopyrightPropertyPage.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java	14 Feb 2008 08:30:37 -0000	1.4
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java	13 May 2008 19:26:25 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
> import org.eclipse.equinox.internal.provisional.p2.metadata.Copyright;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -30,7 +31,8 @@
> public class IUCopyrightPropertyPage extends IUPropertyPage {
> 
> 	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
>-		final Copyright copyright = iu.getCopyright();
>+		// Get the copyright in the current locale
>+		final Copyright copyright = IUPropertyUtils.getCopyright(iu);
> 		if (copyright != null && copyright.getBody().length() > 0) {
> 			Composite composite = new Composite(parent, SWT.NONE);
> 			GridLayout layout = new GridLayout();
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 IUGeneralInfoPropertyPage.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java	1 Apr 2008 00:48:08 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java	13 May 2008 19:26:25 -0000
>@@ -12,7 +12,6 @@
> 
> import java.net.MalformedURLException;
> import java.net.URL;
>-import java.util.Locale;
> import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
> import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>@@ -54,18 +53,18 @@
> 		layout.marginHeight = 0;
> 		composite.setLayout(layout);
> 		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-		Locale currentLocale = Locale.getDefault();
>-		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_NameLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME, currentLocale));
>+		// Get general info in the default locale
>+		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_NameLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME));
> 		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_IdentifierLabel, iu.getId());
> 		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_VersionLabel, iu.getVersion().toString());
>-		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ProviderLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_PROVIDER, currentLocale));
>-		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ContactLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_CONTACT, currentLocale));
>+		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ProviderLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_PROVIDER));
>+		addField(composite, ProvUIMessages.IUGeneralInfoPropertyPage_ContactLabel, IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_CONTACT));
> 
> 	}
> 
> 	private void createDescriptionSection(Composite parent, IInstallableUnit iu) {
>-		Locale currentLocale = Locale.getDefault();
>-		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION, currentLocale);
>+		// Get the iu description in the default locale
>+		String description = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_DESCRIPTION);
> 		if (description != null && description.length() > 0) {
> 			Group group = new Group(parent, SWT.NONE);
> 			group.setText(ProvUIMessages.IUGeneralInfoPropertyPage_DescriptionLabel);
>Index: src/org/eclipse/equinox/internal/p2/ui/PlanStatusHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/PlanStatusHelper.java,v
>retrieving revision 1.1
>diff -u -r1.1 PlanStatusHelper.java
>--- src/org/eclipse/equinox/internal/p2/ui/PlanStatusHelper.java	7 May 2008 15:18:20 -0000	1.1
>+++ src/org/eclipse/equinox/internal/p2/ui/PlanStatusHelper.java	13 May 2008 19:26:25 -0000
>@@ -17,6 +17,7 @@
> import org.eclipse.equinox.internal.provisional.p2.engine.Operand;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.ui.IStatusCodes;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.osgi.util.NLS;
> 
> /**
>@@ -83,7 +84,8 @@
> 	private static String getIUString(IInstallableUnit iu) {
> 		if (iu == null)
> 			return ProvUIMessages.PlanStatusHelper_Items;
>-		String name = iu.getProperty(IInstallableUnit.PROP_NAME);
>+		// Get the iu name in the default locale
>+		String name = IUPropertyUtils.getIUProperty(iu, IInstallableUnit.PROP_NAME);
> 		if (name != null)
> 			return name;
> 		return iu.getId();
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUComparator.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java	25 Feb 2008 18:35:34 -0000	1.4
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java	13 May 2008 19:26:25 -0000
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
>+import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerComparator;
> 
>@@ -33,10 +34,11 @@
> 
> 		String key1, key2;
> 		if (key == IU_NAME) {
>-			key1 = iu1.getProperty(IInstallableUnit.PROP_NAME);
>+			// Compare the iu names in the default locale
>+			key1 = IUPropertyUtils.getIUProperty(iu1, IInstallableUnit.PROP_NAME);
> 			if (key1 == null)
> 				key1 = ""; //$NON-NLS-1$
>-			key2 = iu2.getProperty(IInstallableUnit.PROP_NAME);
>+			key2 = IUPropertyUtils.getIUProperty(iu2, IInstallableUnit.PROP_NAME);
> 			if (key2 == null)
> 				key2 = ""; //$NON-NLS-1$
> 		} else {

Actions: View | Diff

Attachments on bug 222309: 93829 | 94301 | 99221 | 99406 | 100028 | 100281