Attachment 202231 Details for Bug 354260 – Patch v2

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

[patch] Patch v2

v2.diff (text/plain), 2.70 KB, created by Maia Kozheva

on 2011-08-26 09:45:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maia Kozheva

Created: 2011-08-26 09:45:52 EDT

Size: 2.70 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-26 20:39:28.961920766 +0700
>+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java	2011-08-26 20:42:17.191920816 +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,14 @@
> 			} 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))
>@@ -404,7 +414,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()]));
>@@ -589,4 +599,4 @@
> 
> 		return adviceMetaRequires.toArray(new IRequirement[adviceMetaRequires.size()]);
> 	}
>-}
>\ Ð ÐºÐ¾Ð½ÑÐµ ÑÐ°Ð¹Ð»Ð° Ð½ÐµÑ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸
>+}

Flags:

sikon: review?

Actions: View | Diff

Attachments on bug 354260: 201150 | 202231 | 213724