diff options
2 files changed, 4 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/unsigner/Unsigner.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/unsigner/Unsigner.java index 3d7b49091..ad2e8502d 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/unsigner/Unsigner.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/unsigner/Unsigner.java @@ -42,9 +42,9 @@ public class Unsigner { return true; } } else { - Enumeration entries = jar.entries(); + Enumeration<? extends ZipEntry> entries = jar.entries(); while (entries.hasMoreElements()) { - ZipEntry entry = (ZipEntry) entries.nextElement(); + ZipEntry entry = entries.nextElement(); String entryName = entry.getName(); if (entryName.endsWith(SF_EXT) && entryName.startsWith(META_INF)) return true; diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java index 3904f3249..e6f6b00ec 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java @@ -16,8 +16,7 @@ import java.util.Iterator; import java.util.Properties; import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep; import org.eclipse.equinox.internal.p2.jarprocessor.Utils; -import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessor; -import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.*; public class Verifier extends JarProcessorExecutor { @@ -89,7 +88,7 @@ public class Verifier extends JarProcessorExecutor { final VerifyStep verifyStep = new VerifyStep(properties, false); JarProcessor verifier = new JarProcessor() { public File processJar(File inputFile) throws IOException { - Iterator iterator = getStepIterator(); + Iterator<IProcessStep> iterator = getStepIterator(); if (iterator.hasNext() && iterator.next() instanceof VerifyStep) return verifyStep.postProcess(inputFile, workingDirectory, null); //else we are unpacking, call super |