summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2012-12-11 11:07:35 (EST)
committerPascal Rapicault2012-12-11 11:12:36 (EST)
commit188e4e9f1a2020ef78f8c589acd9943046ff11b5 (patch)
treea3c7691850656375bc50f0ef55fe2e9be5d71550
parent28632eb3a322c556da1dd74c6329bf9d22b31b64 (diff)
downloadrt.equinox.p2-188e4e9f1a2020ef78f8c589acd9943046ff11b5.zip
rt.equinox.p2-188e4e9f1a2020ef78f8c589acd9943046ff11b5.tar.gz
rt.equinox.p2-188e4e9f1a2020ef78f8c589acd9943046ff11b5.tar.bz2
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/unsigner/Unsigner.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java5
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 3d7b490..ad2e850 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 3904f32..e6f6b00 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