summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2012-05-15 12:10:48 (EDT)
committerIan Bull2012-05-15 12:10:48 (EDT)
commit94ce7f80072142e392b024a108525f7310c904a8 (patch)
tree3bd34acac92d938da23b1051d99314b6cea061ad
parent8a16090df20423751452e26b96863507dfd20514 (diff)
downloadrt.equinox.p2-94ce7f80072142e392b024a108525f7310c904a8.zip
rt.equinox.p2-94ce7f80072142e392b024a108525f7310c904a8.tar.gz
rt.equinox.p2-94ce7f80072142e392b024a108525f7310c904a8.tar.bz2
Revert "Bug 349628 - No update proposed when there are repository with errors"
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LoadMetadataRepositoryJob.java15
2 files changed, 0 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
index aaa3e1f..f2ce43a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
@@ -11,7 +11,6 @@
package org.eclipse.equinox.internal.p2.ui.sdk;
import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.p2.operations.RepositoryTracker;
import org.eclipse.equinox.p2.operations.UpdateOperation;
import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
@@ -63,12 +62,6 @@ public class UpdateHandler extends PreloadingRepositoryHandler {
}
@Override
- protected void setLoadJobProperties(Job loadJob) {
- super.setLoadJobProperties(loadJob);
- loadJob.setProperty(LoadMetadataRepositoryJob.SUPPRESS_REPOSITORY_ERRORS, Boolean.toString(true));
- }
-
- @Override
protected String getProgressTaskName() {
return ProvSDKMessages.UpdateHandler_ProgressTaskName;
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LoadMetadataRepositoryJob.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LoadMetadataRepositoryJob.java
index 4d21f90..bae1955 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LoadMetadataRepositoryJob.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LoadMetadataRepositoryJob.java
@@ -68,15 +68,6 @@ public class LoadMetadataRepositoryJob extends ProvisioningJob {
*/
public static final QualifiedName ACCUMULATE_LOAD_ERRORS = new QualifiedName(ProvUIActivator.PLUGIN_ID, "ACCUMULATE_LOAD_ERRORS"); //$NON-NLS-1$
- /**
- * The key that should be used to set a property on a repository load job to indicate
- * that load errors should be suppressed. This is useful if repositories
- * are being loaded in the background as part of a check for update.
- *
- * @since 2.2
- */
- public static final QualifiedName SUPPRESS_REPOSITORY_ERRORS = new QualifiedName(ProvUIActivator.PLUGIN_ID, "SUPPRESS_REPOSITORY_ERRORS"); //$NON-NLS-1$
-
private List<IMetadataRepository> repoCache = new ArrayList<IMetadataRepository>();
private RepositoryTracker tracker;
private MultiStatus accumulatedStatus;
@@ -134,8 +125,6 @@ public class LoadMetadataRepositoryJob extends ProvisioningJob {
}
private void handleLoadFailure(ProvisionException e, URI location) {
- if (shouldSuppressErrors()) // If we should suppress errors, just skip this
- return;
if (shouldAccumulateFailures()) {
// Some ProvisionExceptions include an empty multi status with a message.
// Since empty multi statuses have a severity OK, The platform status handler doesn't handle
@@ -157,10 +146,6 @@ public class LoadMetadataRepositoryJob extends ProvisioningJob {
}
}
- private boolean shouldSuppressErrors() {
- return getProperty(LoadMetadataRepositoryJob.SUPPRESS_REPOSITORY_ERRORS) != null;
- }
-
private boolean shouldAccumulateFailures() {
return getProperty(LoadMetadataRepositoryJob.ACCUMULATE_LOAD_ERRORS) != null;
}