Attachment #202231 for bug #354260

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




	private static final String UPDATE_DESCRIPTION = "update.description"; //$NON-NLS-1$
	private static final String UPDATE_SEVERITY = "update.severity"; //$NON-NLS-1$
	private static final String UPDATE_RANGE = "update.range"; //$NON-NLS-1$
	private static final String UPDATE_URL = "update.url"; //$NON-NLS-1$
	private static final String UPDATE_ID = "update.id"; //$NON-NLS-1$
	private static final String CLASSIFIER = "classifier"; //$NON-NLS-1$
	private static final String TOUCHPOINT_VERSION = "touchpoint.version"; //$NON-NLS-1$

		VersionRange unitUpdateRange = null;
		int unitUpdateSeverity = 0;
		String unitUpdateDescription = null;
		URI unitUpdateLocation = null;

		List<IArtifactKey> unitArtifacts = new ArrayList<IArtifactKey>();
		Map<String, String> unitProperties = new HashMap<String, String>();

			} else if (token.equals(UPDATE_DESCRIPTION)) {
				unitUpdateDescription = currentValue();
				next();
			} else if (token.equals(UPDATE_URL)) {
				try {
					unitUpdateLocation = new URI(currentValue());
				} catch (URISyntaxException e) {
					throw new IllegalStateException("bad unit update URI at token: " + current + ", " + currentValue()); //$NON-NLS-1$ //$NON-NLS-2$
				}
				
				next();
			} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))
				parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);
			else if (token.startsWith(ARTIFACTS_PREFIX))

			description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));

		if (unitUpdateId != null)
			description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription, unitUpdateLocation));

		if (!unitLicenses.isEmpty())
			description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));


		return adviceMetaRequires.toArray(new IRequirement[adviceMetaRequires.size()]);
	}
}

Return to bug 354260

Lines 28-33 Link Here

(-)a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java (-2 / +12 lines)
28	private static final String UPDATE_DESCRIPTION = "update.description"; //$NON-NLS-1$	28	private static final String UPDATE_DESCRIPTION = "update.description"; //$NON-NLS-1$
29	private static final String UPDATE_SEVERITY = "update.severity"; //$NON-NLS-1$	29	private static final String UPDATE_SEVERITY = "update.severity"; //$NON-NLS-1$
30	private static final String UPDATE_RANGE = "update.range"; //$NON-NLS-1$	30	private static final String UPDATE_RANGE = "update.range"; //$NON-NLS-1$
		31	private static final String UPDATE_URL = "update.url"; //$NON-NLS-1$
31	private static final String UPDATE_ID = "update.id"; //$NON-NLS-1$	32	private static final String UPDATE_ID = "update.id"; //$NON-NLS-1$
32	private static final String CLASSIFIER = "classifier"; //$NON-NLS-1$	33	private static final String CLASSIFIER = "classifier"; //$NON-NLS-1$
33	private static final String TOUCHPOINT_VERSION = "touchpoint.version"; //$NON-NLS-1$	34	private static final String TOUCHPOINT_VERSION = "touchpoint.version"; //$NON-NLS-1$
Lines 316-321 Link Here
316	VersionRange unitUpdateRange = null;	317	VersionRange unitUpdateRange = null;
317	int unitUpdateSeverity = 0;	318	int unitUpdateSeverity = 0;
318	String unitUpdateDescription = null;	319	String unitUpdateDescription = null;
		320	URI unitUpdateLocation = null;
319		321
320	List<IArtifactKey> unitArtifacts = new ArrayList<IArtifactKey>();	322	List<IArtifactKey> unitArtifacts = new ArrayList<IArtifactKey>();
321	Map<String, String> unitProperties = new HashMap<String, String>();	323	Map<String, String> unitProperties = new HashMap<String, String>();
Lines 365-370 Link Here
365	} else if (token.equals(UPDATE_DESCRIPTION)) {	367	} else if (token.equals(UPDATE_DESCRIPTION)) {
366	unitUpdateDescription = currentValue();	368	unitUpdateDescription = currentValue();
367	next();	369	next();
		370	} else if (token.equals(UPDATE_URL)) {
		371	try {
		372	unitUpdateLocation = new URI(currentValue());
		373	} catch (URISyntaxException e) {
		374	throw new IllegalStateException("bad unit update URI at token: " + current + ", " + currentValue()); //$NON-NLS-1$ //$NON-NLS-2$
		375	}
		376
		377	next();
368	} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))	378	} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))
369	parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);	379	parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);
370	else if (token.startsWith(ARTIFACTS_PREFIX))	380	else if (token.startsWith(ARTIFACTS_PREFIX))
Lines 404-410 Link Here
404	description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));	414	description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));
405		415
406	if (unitUpdateId != null)	416	if (unitUpdateId != null)
407	description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription));	417	description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription, unitUpdateLocation));
408		418
409	if (!unitLicenses.isEmpty())	419	if (!unitLicenses.isEmpty())
410	description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));	420	description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));
Lines 589-592 Link Here
589		599
590	return adviceMetaRequires.toArray(new IRequirement[adviceMetaRequires.size()]);	600	return adviceMetaRequires.toArray(new IRequirement[adviceMetaRequires.size()]);
591	}	601	}
592	}	602	}