Attachment #102779 for bug #234154

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

Lines 40-45 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteModel.java (-1 / +56 lines)
40	private String type;	40	private String type;
41	private URLEntry[] associateSites;	41	private URLEntry[] associateSites;
42	private String digestURLString;	42	private String digestURLString;
		43	private List messageKeys;
		44	private Map localizations;
43		45
44	/**	46	/**
45	* Creates an uninitialized site model object.	47	* Creates an uninitialized site model object.
Lines 72-79 Link Here
72	public void addCategory(SiteCategory category) {	74	public void addCategory(SiteCategory category) {
73	if (categories == null)	75	if (categories == null)
74	categories = new HashMap();	76	categories = new HashMap();
75	if (!categories.containsKey(category.getName()))	77	if (!categories.containsKey(category.getName())) {
76	categories.put(category.getName(), category);	78	categories.put(category.getName(), category);
		79	if (localizations != null && !localizations.isEmpty())
		80	category.setLocalizations(localizations);
		81	}
77	}	82	}
78		83
79	/**	84	/**
Lines 167-172 Link Here
167	}	172	}
168		173
169	/**	174	/**
		175	* Gets the localizations for the site as a map from locale
		176	* to the set of translated properties for that locale.
		177	*
		178	* @return a map from locale to property set
		179	* @since 3.4
		180	*/
		181	public Map getLocalizations() {
		182	return this.localizations;
		183	}
		184
		185	/**
170	* Returns the resolved URL for the site.	186	* Returns the resolved URL for the site.
171	*	187	*
172	* @return url, or <code>null</code>	188	* @return url, or <code>null</code>
Lines 192-197 Link Here
192	}	208	}
193		209
194	/**	210	/**
		211	* Return the keys for translatable strings
		212	*
		213	* @return the list of keys for translatable strings; may be null
		214	* @since 3.4
		215	*/
		216	public List getMessageKeys() {
		217	return messageKeys;
		218	}
		219
		220	/**
195	* Return an array of update site mirrors	221	* Return an array of update site mirrors
196	*	222	*
197	* @return an array of mirror entries, or an empty array.	223	* @return an array of mirror entries, or an empty array.
Lines 278-283 Link Here
278	}	304	}
279		305
280	/**	306	/**
		307	* Sets the localizations for the site as a map from locale
		308	* to the set of translated properties for that locale.
		309	*
		310	* @param localizations as a map from locale to property set
		311	* @since 3.4
		312	*/
		313	public void setLocalizations(Map localizations) {
		314	this.localizations = localizations;
		315	if (localizations != null && !localizations.isEmpty() && //
		316	categories != null && !categories.isEmpty()) {
		317	for (Iterator catIter = categories.entrySet().iterator(); catIter.hasNext();) {
		318	Map.Entry entry = (Map.Entry) catIter.next();
		319	SiteCategory category = (SiteCategory) entry.getValue();
		320	category.setLocalizations(localizations);
		321	}
		322	}
		323	}
		324
		325	/**
281	* Sets the unresolved URL for the site.	326	* Sets the unresolved URL for the site.
282	*	327	*
283	* @param locationURLString url for the site (as a string)	328	* @param locationURLString url for the site (as a string)
Lines 288-293 Link Here
288	}	333	}
289		334
290	/**	335	/**
		336	* Sets keys for translatable strings
		337	*
		338	* @param keys for translatable strings
		339	* @since 3.4
		340	*/
		341	public void setMessageKeys(List keys) {
		342	this.messageKeys = keys;
		343	}
		344
		345	/**
291	* Sets additional mirror sites	346	* Sets additional mirror sites
292	*	347	*
293	* @param mirrors additional update site mirrors	348	* @param mirrors additional update site mirrors

Lines 66-71 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/features/DefaultSiteParser.java (-2 / +15 lines)
66	// Current State Information	66	// Current State Information
67	Stack stateStack = new Stack();	67	Stack stateStack = new Stack();
68		68
		69	// List of string keys for translated strings
		70	private final List messageKeys = new ArrayList(4);
		71
69	private MultiStatus status;	72	private MultiStatus status;
70		73
71	/*	74	/*
Lines 548-554 Link Here
548	if (objectStack.isEmpty())	551	if (objectStack.isEmpty())
549	throw new SAXException(Messages.DefaultSiteParser_NoSiteTag);	552	throw new SAXException(Messages.DefaultSiteParser_NoSiteTag);
550	if (objectStack.peek() instanceof SiteModel) {	553	if (objectStack.peek() instanceof SiteModel) {
551	return (SiteModel) objectStack.pop();	554	SiteModel site = (SiteModel) objectStack.pop();
		555	site.setMessageKeys(messageKeys);
		556	return site;
552	}	557	}
553	String stack = ""; //$NON-NLS-1$	558	String stack = ""; //$NON-NLS-1$
554	Iterator iter = objectStack.iterator();	559	Iterator iter = objectStack.iterator();
Lines 603-608 Link Here
603	SiteCategory category = new SiteCategory();	608	SiteCategory category = new SiteCategory();
604	String name = attributes.getValue("name"); //$NON-NLS-1$	609	String name = attributes.getValue("name"); //$NON-NLS-1$
605	String label = attributes.getValue("label"); //$NON-NLS-1$	610	String label = attributes.getValue("label"); //$NON-NLS-1$
		611	checkTranslated(label);
606	category.setName(name);	612	category.setName(name);
607	category.setLabel(label);	613	category.setLabel(label);
608		614
Lines 658-663 Link Here
658	if (label != null) {	664	if (label != null) {
659	if ("".equals(label.trim())) //$NON-NLS-1$	665	if ("".equals(label.trim())) //$NON-NLS-1$
660	label = null;	666	label = null;
		667	checkTranslated(label);
661	}	668	}
662	feature.setLabel(label);	669	feature.setLabel(label);
663		670
Lines 753-759 Link Here
753	site.setSupportsPack200(true);	760	site.setSupportsPack200(true);
754	}	761	}
755		762
756	String digestURL = attributes.getValue("digestURL");	763	String digestURL = attributes.getValue("digestURL"); //$NON-NLS-1$
757	if (digestURL != null)	764	if (digestURL != null)
758	site.setDigestURLString(digestURL);	765	site.setDigestURLString(digestURL);
759		766
Lines 844-847 Link Here
844	return Character.isWhitespace(str.charAt(str.length() - 1));	851	return Character.isWhitespace(str.charAt(str.length() - 1));
845	}	852	}
846		853
		854	// Add translatable strings from the site.xml
		855	// to the list of message keys.
		856	private void checkTranslated(String value) {
		857	if (value != null && value.length() > 1 && value.startsWith("%")) //$NON-NLS-1$
		858	messageKeys.add(value.substring(1));
		859	}
847	}	860	}




import java.net.MalformedURLException;
import java.net.URL;
import java.util.Comparator;
import java.util.Map;

/**
 * A category in an update site.

	private String description;
	private String label;
	private String name;
	private Map localizations;

	/**
	 * Returns a comparator for category models.

	}

	/**
	 * Gets the localizations for the site as a map from locale
	 * to the set of translated properties for that locale.
	 * 
	 * @return a map from locale to property set
	 * @since 3.4
	 */
	public Map getLocalizations() {
		return this.localizations;
	}

	/**
	 * Retrieve the name of the category.
	 * 
	 * @return category name, or <code>null</code>.

	}

	/**
	 * Sets the localizations for the site as a map from locale
	 * to the set of translated properties for that locale.
	 * 
	 * @param localizations as a map from locale to property set
	 * @since 3.4
	 */
	public void setLocalizations(Map localizations) {
		this.localizations = localizations;
	}

	/**
	 * Sets the category name.
	 * Throws a runtime exception if this object is marked read-only.
	 * 

Lines 106-111 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java (+18 lines)
106		106
107	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$	107	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$
108		108
		109	private static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$
		110
109	protected final IGeneratorInfo info;	111	protected final IGeneratorInfo info;
110		112
111	private GeneratorResult incrementalResult = null;	113	private GeneratorResult incrementalResult = null;
Lines 1152-1157 Link Here
1152	for (int i = 0; i < associatedSites.length; i++)	1154	for (int i = 0; i < associatedSites.length; i++)
1153	generateSiteReference(associatedSites[i].getURL(), null, true);	1155	generateSiteReference(associatedSites[i].getURL(), null, true);
1154		1156
		1157	if (PROTOCOL_FILE.equals(siteLocation.getProtocol())) {
		1158	File siteFile = new File(siteLocation.getFile());
		1159	if (siteFile.exists()) {
		1160	File siteParent = siteFile.getParentFile();
		1161
		1162	List messageKeys = site.getMessageKeys();
		1163	if (siteParent.isDirectory()) {
		1164	String[] keyStrings = (String[]) messageKeys.toArray(new String[messageKeys.size()]);
		1165	site.setLocalizations(LocalizationHelper.getDirPropertyLocalizations(siteParent, "site", null, keyStrings)); //$NON-NLS-1$
		1166	} else if (siteFile.getName().endsWith(".jar")) { //$NON-NLS-1$
		1167	String[] keyStrings = (String[]) messageKeys.toArray(new String[messageKeys.size()]);
		1168	site.setLocalizations(LocalizationHelper.getJarPropertyLocalizations(siteParent, "feature", null, keyStrings)); //$NON-NLS-1$
		1169	}
		1170	}
		1171	}
		1172
1155	SiteFeature[] features = site.getFeatures();	1173	SiteFeature[] features = site.getFeatures();
1156	for (int i = 0; i < features.length; i++) {	1174	for (int i = 0; i < features.length; i++) {
1157	//add a mapping for each category this feature belongs to	1175	//add a mapping for each category this feature belongs to




	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory) {
		InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();
		cat.setSingleton(true);
		String categoryId = category.getName();
		cat.setId(categoryId);
		cat.setVersion(Version.emptyVersion);
		cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());
		cat.setProperty(IInstallableUnit.PROP_DESCRIPTION, category.getDescription());

			reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));
		}
		cat.setRequiredCapabilities((RequiredCapability[]) reqsConfigurationUnits.toArray(new RequiredCapability[reqsConfigurationUnits.size()]));

		// Create set of provided capabilities
		ArrayList providedCapabilities = new ArrayList();
		providedCapabilities.add(createSelfCapability(categoryId, Version.emptyVersion));

		Map localizations = category.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();
					cat.setProperty(locale.toString() + '.' + nextKey, translatedStrings.getProperty(nextKey));
				}
				providedCapabilities.add(makeTranslationCapability(categoryId, locale));
			}
		}

		cat.setCapabilities((ProvidedCapability[]) providedCapabilities.toArray(new ProvidedCapability[providedCapabilities.size()]));

		cat.setArtifacts(new IArtifactKey[0]);
		cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$
		return MetadataFactory.createInstallableUnit(cat);

Return to bug 234154

Lines 404-410 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java (-2 / +23 lines)
404	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory) {	404	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory) {
405	InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();	405	InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();
406	cat.setSingleton(true);	406	cat.setSingleton(true);
407	cat.setId(category.getName());	407	String categoryId = category.getName();
		408	cat.setId(categoryId);
408	cat.setVersion(Version.emptyVersion);	409	cat.setVersion(Version.emptyVersion);
409	cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());	410	cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());
410	cat.setProperty(IInstallableUnit.PROP_DESCRIPTION, category.getDescription());	411	cat.setProperty(IInstallableUnit.PROP_DESCRIPTION, category.getDescription());
Lines 420-426 Link Here
420	reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));	421	reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));
421	}	422	}
422	cat.setRequiredCapabilities((RequiredCapability[]) reqsConfigurationUnits.toArray(new RequiredCapability[reqsConfigurationUnits.size()]));	423	cat.setRequiredCapabilities((RequiredCapability[]) reqsConfigurationUnits.toArray(new RequiredCapability[reqsConfigurationUnits.size()]));
423	cat.setCapabilities(new ProvidedCapability[] {MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, category.getName(), Version.emptyVersion)});	424
		425	// Create set of provided capabilities
		426	ArrayList providedCapabilities = new ArrayList();
		427	providedCapabilities.add(createSelfCapability(categoryId, Version.emptyVersion));
		428
		429	Map localizations = category.getLocalizations();
		430	if (localizations != null) {
		431	for (Iterator iter = localizations.keySet().iterator(); iter.hasNext();) {
		432	Locale locale = (Locale) iter.next();
		433	Properties translatedStrings = (Properties) localizations.get(locale);
		434	Enumeration propertyKeys = translatedStrings.propertyNames();
		435	while (propertyKeys.hasMoreElements()) {
		436	String nextKey = (String) propertyKeys.nextElement();
		437	cat.setProperty(locale.toString() + '.' + nextKey, translatedStrings.getProperty(nextKey));
		438	}
		439	providedCapabilities.add(makeTranslationCapability(categoryId, locale));
		440	}
		441	}
		442
		443	cat.setCapabilities((ProvidedCapability[]) providedCapabilities.toArray(new ProvidedCapability[providedCapabilities.size()]));
		444
424	cat.setArtifacts(new IArtifactKey[0]);	445	cat.setArtifacts(new IArtifactKey[0]);
425	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$	446	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$
426	return MetadataFactory.createInstallableUnit(cat);	447	return MetadataFactory.createInstallableUnit(cat);

Lines 13-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteCategory.java (+24 lines)
13	import java.net.MalformedURLException;	13	import java.net.MalformedURLException;
14	import java.net.URL;	14	import java.net.URL;
15	import java.util.Comparator;	15	import java.util.Comparator;
		16	import java.util.Map;
16		17
17	/**	18	/**
18	* A category in an update site.	19	* A category in an update site.
Lines 25-30 Link Here
25	private String description;	26	private String description;
26	private String label;	27	private String label;
27	private String name;	28	private String name;
		29	private Map localizations;
28		30
29	/**	31	/**
30	* Returns a comparator for category models.	32	* Returns a comparator for category models.
Lines 100-105 Link Here
100	}	102	}
101		103
102	/**	104	/**
		105	* Gets the localizations for the site as a map from locale
		106	* to the set of translated properties for that locale.
		107	*
		108	* @return a map from locale to property set
		109	* @since 3.4
		110	*/
		111	public Map getLocalizations() {
		112	return this.localizations;
		113	}
		114
		115	/**
103	* Retrieve the name of the category.	116	* Retrieve the name of the category.
104	*	117	*
105	* @return category name, or <code>null</code>.	118	* @return category name, or <code>null</code>.
Lines 162-167 Link Here
162	}	175	}
163		176
164	/**	177	/**
		178	* Sets the localizations for the site as a map from locale
		179	* to the set of translated properties for that locale.
		180	*
		181	* @param localizations as a map from locale to property set
		182	* @since 3.4
		183	*/
		184	public void setLocalizations(Map localizations) {
		185	this.localizations = localizations;
		186	}
		187
		188	/**
165	* Sets the category name.	189	* Sets the category name.
166	* Throws a runtime exception if this object is marked read-only.	190	* Throws a runtime exception if this object is marked read-only.
167	*	191	*