Attachment 134476 Details for Bug 274695 – New patch adding translation

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

[patch] New patch adding translation

274695.patch (text/plain), 4.71 KB, created by Pascal Rapicault

on 2009-05-05 14:00:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2009-05-05 14:00:57 EDT

Size: 4.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.publisher
>Index: src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java,v
>retrieving revision 1.46
>diff -u -r1.46 FeaturesAction.java
>--- src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java	29 Apr 2009 16:01:59 -0000	1.46
>+++ src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java	5 May 2009 17:57:12 -0000
>@@ -59,17 +59,19 @@
> 		iu.setId(id);
> 		Version version = Version.parseVersion(feature.getVersion());
> 		iu.setVersion(version);
>+
>+		// set properties for other feature attributes
>+		iu.setProperty(IInstallableUnit.PROP_NAME, feature.getLabel());
>+		if (feature.getDescription() != null)
>+			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION, feature.getDescription());
>+		if (feature.getDescriptionURL() != null)
>+			iu.setProperty(IInstallableUnit.PROP_DESCRIPTION_URL, feature.getDescriptionURL());
>+		if (feature.getProviderName() != null)
>+			iu.setProperty(IInstallableUnit.PROP_PROVIDER, feature.getProviderName());
> 		if (feature.getLicense() != null)
> 			iu.setLicense(MetadataFactory.createLicense(toURIOrNull(feature.getLicenseURL()), feature.getLicense()));
> 		if (feature.getCopyright() != null)
> 			iu.setCopyright(MetadataFactory.createCopyright(toURIOrNull(feature.getCopyrightURL()), feature.getCopyright()));
>-
>-		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
>-		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
>-		iu.setFilter(INSTALL_FEATURES_FILTER);
>-		iu.setSingleton(true);
>-
>-		// set properties for other feature attributes
> 		if (feature.getApplication() != null)
> 			iu.setProperty(UPDATE_FEATURE_APPLICATION_PROP, feature.getApplication());
> 		if (feature.getPlugin() != null)
>@@ -79,6 +81,11 @@
> 		if (feature.isPrimary())
> 			iu.setProperty(UPDATE_FEATURE_PRIMARY_PROP, Boolean.TRUE.toString());
> 
>+		// The required capabilities are not specified at this level because we don't want the feature jar to be attractive to install.
>+		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_OSGI);
>+		iu.setFilter(INSTALL_FEATURES_FILTER);
>+		iu.setSingleton(true);
>+
> 		if (feature.getInstallHandler() != null && feature.getInstallHandler().trim().length() > 0) {
> 			String installHandlerProperty = "handler=" + feature.getInstallHandler(); //$NON-NLS-1$
> 
>@@ -91,18 +98,32 @@
> 			iu.setProperty(PublisherHelper.ECLIPSE_INSTALL_HANDLER_PROP, installHandlerProperty);
> 		}
> 
>+		ArrayList providedCapabilities = new ArrayList();
>+		providedCapabilities.add(PublisherHelper.createSelfCapability(id, version));
>+		providedCapabilities.add(PublisherHelper.FEATURE_CAPABILITY);
>+		providedCapabilities.add(MetadataFactory.createProvidedCapability(PublisherHelper.CAPABILITY_NS_UPDATE_FEATURE, feature.getId(), version));
>+
> 		iu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(id, version), PublisherHelper.FEATURE_CAPABILITY, MetadataFactory.createProvidedCapability(PublisherHelper.CAPABILITY_NS_UPDATE_FEATURE, feature.getId(), version)});
> 		iu.setArtifacts(new IArtifactKey[] {createFeatureArtifactKey(feature.getId(), version.toString())});
> 
>-		// TODO its not clear when this would ever be false reasonably.  Features are always
>-		// supposed to be installed unzipped.  It is also not clear what it means to set this prop.
>-		// Anyway, in the future it seems reasonable that features be installed as JARs...
>-		// Note: We have decided to always unzip features when they are installed (regardless of whether they
>-		//were zipped when we found them). https://bugs.eclipse.org/bugs/show_bug.cgi?id=267282
> 		Map touchpointData = new HashMap();
> 		touchpointData.put("zipped", "true"); //$NON-NLS-1$ //$NON-NLS-2$
> 		iu.addTouchpointData(MetadataFactory.createTouchpointData(touchpointData));
> 
>+		Map localizations = feature.getLocalizations();
>+		if (localizations != null) {
>+			for (Iterator iter = localizations.keySet().iterator(); iter.hasNext();) {
>+				Locale locale = (Locale) iter.next();
>+				Properties translatedStrings = (Properties) localizations.get(locale);
>+				Enumeration propertyKeys = translatedStrings.propertyNames();
>+				while (propertyKeys.hasMoreElements()) {
>+					String nextKey = (String) propertyKeys.nextElement();
>+					iu.setProperty(locale.toString() + '.' + nextKey, translatedStrings.getProperty(nextKey));
>+				}
>+				providedCapabilities.add(PublisherHelper.makeTranslationCapability(id, locale));
>+			}
>+		}
>+
> 		processInstallableUnitPropertiesAdvice(iu, info);
> 		return MetadataFactory.createInstallableUnit(iu);
> 	}

Actions: View | Diff

Attachments on bug 274695: 134117 | 134178 | 134456 | 134476 | 134493