diff options
author | Mickael Istria | 2018-10-13 18:49:13 +0000 |
---|---|---|
committer | Mickael Istria | 2018-10-13 18:49:13 +0000 |
commit | 60fdab5de6cbe0487c9fa872d3db2f73625fb280 (patch) | |
tree | 75de65ec11683daea7e287c64ff1749a5d5945cf /bundles | |
parent | 7f2938951c1f39a7707a06259116aee3d9339f58 (diff) | |
download | rt.equinox.p2-60fdab5de6cbe0487c9fa872d3db2f73625fb280.tar.gz rt.equinox.p2-60fdab5de6cbe0487c9fa872d3db2f73625fb280.tar.xz rt.equinox.p2-60fdab5de6cbe0487c9fa872d3db2f73625fb280.zip |
Revert "[RFC] Bug 536282 - Check whether processing step is available"I20181017-1800I20181016-1800I20181015-1800I20181015-0255I20181014-2350I20181014-1800I20181013-1800
This reverts commit 7f2938951c1f39a7707a06259116aee3d9339f58.
Change-Id: I93f8f1f8ce2583a8d241ea7ed7201286bfeea9bb
Diffstat (limited to 'bundles')
3 files changed, 3 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java index 3a1c0d647..7eb071752 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java @@ -47,7 +47,7 @@ public class Pack200ProcessorStep extends AbstractBufferingStep { @Override public void initialize(IProvisioningAgent agent, IProcessingStepDescriptor descriptor, IArtifactDescriptor context) { super.initialize(agent, descriptor, context); - if (!isEnabled()) { + if (!UnpackStep.canUnpack()) { IStatus status = null; if (detailedResult) { status = new Status(IStatus.ERROR, Activator.ID, MirrorRequest.ARTIFACT_PROCESSING_ERROR, "Unpack facility not configured.", null); //$NON-NLS-1$ @@ -103,9 +103,4 @@ public class Pack200ProcessorStep extends AbstractBufferingStep { new JarProcessorExecutor().runJarProcessor(options); return new File(getWorkDir(), incoming.getName().substring(0, incoming.getName().length() - PACKED_SUFFIX.length())); } - - @Override - public boolean isEnabled() { - return UnpackStep.canUnpack(); - } } diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java index 22e407b13..734a5482a 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java @@ -133,8 +133,4 @@ public abstract class ProcessingStep extends OutputStream implements IStateful { public IStatus getStatus(boolean deep) { return ProcessingStepHandler.getStatus(this, deep); } - - public boolean isEnabled() { - return true; - } } diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java index cee06314a..25a099eb6 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java @@ -48,19 +48,9 @@ public class ProcessingStepHandler { if (point == null) return false; IProcessingStepDescriptor[] steps = descriptor.getProcessingSteps(); - for (IProcessingStepDescriptor stepDescriptor : steps) { - String processorId = stepDescriptor.getProcessorId(); - IExtension extension = point.getExtension(processorId); - if (extension == null) + for (int i = 0; i < steps.length; i++) { + if (point.getExtension(steps[i].getProcessorId()) == null) return false; - - IConfigurationElement[] config = extension.getConfigurationElements(); - try { - Object object = config[0].createExecutableExtension("class"); //$NON-NLS-1$ - return ((ProcessingStep) object).isEnabled(); - } catch (CoreException e) { - // noop - } } return true; } |