Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-03-13 22:08:51 -0400
committerPascal Rapicault2013-03-13 22:17:27 -0400
commit8f0bc15dea0bf124b1f56e7da8a64de010c7e285 (patch)
treecabf1c4f17ec36a4ff2b1db7edd968bff5a766a6 /bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
parent48bbc74bc2134718d082411c37f741a965d49a29 (diff)
downloadrt.equinox.p2-8f0bc15dea0bf124b1f56e7da8a64de010c7e285.tar.gz
rt.equinox.p2-8f0bc15dea0bf124b1f56e7da8a64de010c7e285.tar.xz
rt.equinox.p2-8f0bc15dea0bf124b1f56e7da8a64de010c7e285.zip
deal with legacy configuration foldersI20130314-1330
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui.sdk.scheduler')
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
index 09ae0f104..4010af2b9 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/PreviousConfigurationFinder.java
@@ -172,8 +172,8 @@ public class PreviousConfigurationFinder {
}
criteriaMet++;
- if (candidate.getProductId().equals(configToMatch.getProductId()) && //
- candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
+ if (configToMatch.getProductId().equals(candidate.getProductId()) && //
+ configToMatch.getPlatformConfig().equals(candidate.getPlatformConfig()) && //
(!candidate.getVersion().isGreaterEqualTo(configToMatch.getVersion()))) {
//We have a match
criteriaMet++;
@@ -203,11 +203,13 @@ public class PreviousConfigurationFinder {
int numberOfcriteriaMet = 0;
for (ConfigurationDescriptor candidate : configurations) {
int criteriaMet = 0;
- if (!candidate.getProductId().equals(configToMatch.getProductId()))
+ if (!configToMatch.getProductId().equals(candidate.getProductId()))
continue;
- if (candidate.getPlatformConfig().equals(configToMatch.getPlatformConfig()) && //
- (configToMatch.getVersion().isGreaterEqualTo(candidate.getVersion()))) {
+ if (configToMatch.getPlatformConfig().equals(candidate.getPlatformConfig()))
+ criteriaMet++;
+
+ if (configToMatch.getVersion().isGreaterEqualTo(candidate.getVersion())) {
//We have a match
criteriaMet++;
}

Back to the top