summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-04-27 22:30:58 (EDT)
committerPascal Rapicault2013-04-27 22:30:58 (EDT)
commit835ef11107cc31e0a28dadc6ad5afbb43c655334 (patch)
treeab697333559dc2718ef85695987f4781f42fda28
parented8286b4e552a81ac0b19a0ea0ec264424f2d1ae (diff)
downloadrt.equinox.p2-835ef11107cc31e0a28dadc6ad5afbb43c655334.zip
rt.equinox.p2-835ef11107cc31e0a28dadc6ad5afbb43c655334.tar.gz
rt.equinox.p2-835ef11107cc31e0a28dadc6ad5afbb43c655334.tar.bz2
Check that the requirement has 3 segment before obtaining the name
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
index 7c57293..21e8f71 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
@@ -140,7 +140,7 @@ public class SimplePlanner implements IPlanner {
for (Explanation next : explanations) {
if (next instanceof Explanation.MissingIU) {
Explanation.MissingIU missingIU = (MissingIU) next;
- if (missingIU.req instanceof IRequiredCapability && "A.PDE.Target.Platform".equals(((IRequiredCapability) missingIU.req).getNamespace())) //$NON-NLS-1$
+ if (missingIU.req instanceof IRequiredCapability && missingIU.req.getMatches().getParameters().length == 3 && "A.PDE.Target.Platform".equals(((IRequiredCapability) missingIU.req).getNamespace())) //$NON-NLS-1$
forTargets.add(new Status(IStatus.ERROR, DirectorActivator.PI_DIRECTOR, missingIU.getUserReadableName(missingIU.iu)));
}
}
@@ -162,6 +162,9 @@ public class SimplePlanner implements IPlanner {
} else if (specificMessage == null && next instanceof Explanation.Singleton) {
specificMessage = Messages.Explanation_rootSingleton;
errorCode = 10054;
+ } else if (specificMessage == null && next instanceof Explanation.NotInstallableRoot) {
+ specificMessage = "The selected element is not installable for this platform";
+ errorCode = 10055;
}
}
//use a more specific root message if available