Attachment 166030 Details for Bug 270668 – Improved message and minimized impact on Projector class.

[patch] Improved message and minimized impact on Projector class.

betterExplanationForRootIU.txt (text/plain), 7.01 KB, created by Daniel Le Berre

on 2010-04-25 16:53:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Le Berre

Created: 2010-04-25 16:53:10 EDT

Size: 7.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/Explanation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Explanation.java,v
>retrieving revision 1.10
>diff -u -r1.10 Explanation.java
>--- src/org/eclipse/equinox/internal/p2/director/Explanation.java	19 Apr 2010 06:18:19 -0000	1.10
>+++ src/org/eclipse/equinox/internal/p2/director/Explanation.java	25 Apr 2010 20:51:44 -0000
>@@ -119,10 +119,12 @@
> 	public static class MissingIU extends Explanation {
> 		public final IInstallableUnit iu;
> 		public final IRequirement req;
>+		public boolean rootIu;
> 
>-		public MissingIU(IInstallableUnit iu, IRequirement req) {
>+		public MissingIU(IInstallableUnit iu, IRequirement req, boolean rootIU) {
> 			this.iu = iu;
> 			this.req = req;
>+			this.rootIu = rootIu;
> 		}
> 
> 		public int orderValue() {
>@@ -134,6 +136,9 @@
> 		}
> 
> 		public String toString() {
>+			if (rootIu) {
>+				return NLS.bind(Messages.Explanation_missingRootRequired, req);
>+			}
> 			if (req.getFilter() == null) {
> 				return NLS.bind(Messages.Explanation_missingRequired, iu, req);
> 			}
>Index: src/org/eclipse/equinox/internal/p2/director/Messages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java,v
>retrieving revision 1.23
>diff -u -r1.23 Messages.java
>--- src/org/eclipse/equinox/internal/p2/director/Messages.java	22 Apr 2010 20:13:59 -0000	1.23
>+++ src/org/eclipse/equinox/internal/p2/director/Messages.java	25 Apr 2010 20:51:44 -0000
>@@ -39,8 +39,10 @@
> 	public static String Explanation_hardDependency;
> 	public static String Explanation_patchedHardDependency;
> 	public static String Explanation_missingRequired;
>+	public static String Explanation_missingRootRequired;
> 	public static String Explanation_missingNonGreedyRequired;
> 	public static String Explanation_missingRequiredFilter;
>+	public static String Explanation_missingRootFilter;
> 	public static String Explanation_optionalDependency;
> 	public static String Explanation_rootMissing;
> 	public static String Explanation_rootSingleton;
>Index: src/org/eclipse/equinox/internal/p2/director/Projector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java,v
>retrieving revision 1.62
>diff -u -r1.62 Projector.java
>--- src/org/eclipse/equinox/internal/p2/director/Projector.java	21 Apr 2010 01:00:53 -0000	1.62
>+++ src/org/eclipse/equinox/internal/p2/director/Projector.java	25 Apr 2010 20:51:44 -0000
>@@ -368,7 +368,7 @@
> 		if (DEBUG) {
> 			Tracing.debug(iu + "=0"); //$NON-NLS-1$
> 		}
>-		dependencyHelper.setFalse(iu, new Explanation.MissingIU(iu, req));
>+		dependencyHelper.setFalse(iu, new Explanation.MissingIU(iu, req, iu == this.entryPoint));
> 	}
> 
> 	// Check whether the requirement is applicable
>Index: src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java,v
>retrieving revision 1.120
>diff -u -r1.120 SimplePlanner.java
>--- src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	22 Apr 2010 20:13:59 -0000	1.120
>+++ src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	25 Apr 2010 20:51:45 -0000
>@@ -316,8 +316,11 @@
> 			IInstallableUnit[] availableIUs = gatherAvailableInstallableUnits(extraIUs.toArray(new IInstallableUnit[extraIUs.size()]), context, sub.newChild(ExpandWork / 4));
> 
> 			Slicer slicer = new Slicer(new QueryableArray(availableIUs), newSelectionContext, satisfyMetaRequirements(profileChangeRequest.getProfileProperties()));
>-			IQueryable<IInstallableUnit> slice = slicer.slice(new IInstallableUnit[] {(IInstallableUnit) updatedPlan[0]}, sub.newChild(ExpandWork / 4));
>-			slicer.getNonGreedyIUs();
>+			IInstallableUnit[] rootIus = new IInstallableUnit[profileChangeRequest.getAdditions().size() + 1];
>+			profileChangeRequest.getAdditions().toArray(rootIus);
>+			rootIus[rootIus.length - 1] = (IInstallableUnit) updatedPlan[0];
>+			IQueryable<IInstallableUnit> slice = slicer.slice(rootIus, sub.newChild(ExpandWork / 4));
>+
> 			if (slice == null) {
> 				IProvisioningPlan plan = engine.createPlan(profile, context);
> 				plan.setStatus(slicer.getStatus());
>Index: src/org/eclipse/equinox/internal/p2/director/Slicer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java,v
>retrieving revision 1.25
>diff -u -r1.25 Slicer.java
>--- src/org/eclipse/equinox/internal/p2/director/Slicer.java	19 Apr 2010 06:18:19 -0000	1.25
>+++ src/org/eclipse/equinox/internal/p2/director/Slicer.java	25 Apr 2010 20:51:45 -0000
>@@ -85,7 +85,7 @@
> 	private void validateInput(IInstallableUnit[] ius) {
> 		for (int i = 0; i < ius.length; i++) {
> 			if (!isApplicable(ius[i]))
>-				throw new IllegalStateException("The IU " + ius[i] + " can't be installed in this environment because its filter does not match."); //$NON-NLS-1$//$NON-NLS-2$
>+				throw new IllegalStateException(NLS.bind(Messages.Explanation_missingRootFilter, ius[i]));
> 		}
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/director/messages.properties
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties,v
>retrieving revision 1.29
>diff -u -r1.29 messages.properties
>--- src/org/eclipse/equinox/internal/p2/director/messages.properties	23 Apr 2010 19:16:52 -0000	1.29
>+++ src/org/eclipse/equinox/internal/p2/director/messages.properties	25 Apr 2010 20:51:45 -0000
>@@ -25,8 +25,10 @@
> Explanation_hardDependency=Cannot satisfy dependency: {0} depends on: {1}
> Explanation_patchedHardDependency=Cannot satisfy patched ({0}) dependency: {1} depends on: {2}
> Explanation_missingRequired=Missing requirement: {0} requires ''{1}'' but it could not be found
>+Explanation_missingRootRequired=You requested to install ''{0}'' but it could not be found
> Explanation_missingNonGreedyRequired=Missing non greedy requirement: ''{0}'' is required non greedily but it could not be found
> Explanation_missingRequiredFilter=Missing requirement for filter {0}: {1} requires ''{2}'' but it could not be found
>+Explanation_missingRootFilter={0} can't be installed in this environment because its filter is not applicable.
> Explanation_optionalDependency=Optional dependency
> Explanation_rootMissing=Cannot complete the install because one or more required items could not be found.
> Explanation_rootSingleton=Cannot complete the install because of a conflicting dependency.

Actions: View | Diff

Attachments on bug 270668: 165851 | 166030 | 166038 | 166082