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

Collapse All | Expand All

(-)a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java (-1 / +6 lines)
Lines 28-33 Link Here
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
				unitUpdateLocation = new URI(currentValue());
372
				next();
368
			} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))
373
			} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))
369
				parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);
374
				parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);
370
			else if (token.startsWith(ARTIFACTS_PREFIX))
375
			else if (token.startsWith(ARTIFACTS_PREFIX))
Lines 404-410 Link Here
404
			description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));
409
			description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));
405
410
406
		if (unitUpdateId != null)
411
		if (unitUpdateId != null)
407
			description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription));
412
			description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription, unitUpdateLocation));
408
413
409
		if (!unitLicenses.isEmpty())
414
		if (!unitLicenses.isEmpty())
410
			description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));
415
			description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));

Return to bug 354260