Attachment 201150 Details for Bug 354260 – Patch

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

[patch] Patch

AdviceFileParser.diff (text/plain), 2.34 KB, created by Maia Kozheva

on 2011-08-09 10:59:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maia Kozheva

Created: 2011-08-09 10:59:29 EDT

Size: 2.34 KB

patch

obsolete

>diff -urN a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java
>--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java	2011-08-09 21:49:26.732039430 +0700
>+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java	2011-08-09 21:55:20.182033867 +0700
>@@ -28,6 +28,7 @@
> 	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$
>@@ -316,6 +317,7 @@
> 		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>();
>@@ -365,6 +367,9 @@
> 			} else if (token.equals(UPDATE_DESCRIPTION)) {
> 				unitUpdateDescription = currentValue();
> 				next();
>+			} else if (token.equals(UPDATE_URL)) {
>+				unitUpdateLocation = new URI(currentValue());
>+				next();
> 			} else if (token.startsWith(HOST_REQUIREMENTS_PREFIX))
> 				parseRequires(prefix + HOST_REQUIREMENTS_PREFIX, unitHostRequirements);
> 			else if (token.startsWith(ARTIFACTS_PREFIX))
>@@ -404,7 +409,7 @@
> 			description.setTouchpointType(MetadataFactory.createTouchpointType(unitTouchpointId, unitTouchpointVersion));
> 
> 		if (unitUpdateId != null)
>-			description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription));
>+			description.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(unitUpdateId, unitUpdateRange, unitUpdateSeverity, unitUpdateDescription, unitUpdateLocation));
> 
> 		if (!unitLicenses.isEmpty())
> 			description.setLicenses(unitLicenses.toArray(new ILicense[unitLicenses.size()]));

Actions: View | Diff

Attachments on bug 354260: 201150 | 202231 | 213724