summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2012-11-27 16:10:26 (EST)
committerPascal Rapicault2012-11-27 16:10:26 (EST)
commitccb680b7d85ddb274cd8cf719a2c8f185a624c26 (patch)
tree288764eb8e06f80726d110bb4fbdd1e9cacd1528
parent80b65a35e35a12d7855e767a4bfa45e7d6d538fe (diff)
downloadrt.equinox.p2-ccb680b7d85ddb274cd8cf719a2c8f185a624c26.zip
rt.equinox.p2-ccb680b7d85ddb274cd8cf719a2c8f185a624c26.tar.gz
rt.equinox.p2-ccb680b7d85ddb274cd8cf719a2c8f185a624c26.tar.bz2
Cleanup warningsv20121127-211026
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/AntBasedProcessorExecutor.java10
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java2
3 files changed, 10 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java
index 9f413f0..1d951fb 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java
@@ -138,12 +138,12 @@ public class ZipProcessor {
Utils.close(entryStream);
if (options.verbose) {
e.printStackTrace();
- System.out.println("Warning: Problem reading " + modifiedFile.getPath() + ".");
+ System.out.println("Warning: Problem reading " + modifiedFile.getPath() + "."); //$NON-NLS-1$//$NON-NLS-2$
}
}
entryStream = null;
} else if (options.verbose) {
- System.out.println("Warning: " + modifiedFile.getPath() + " not found.");
+ System.out.println("Warning: " + modifiedFile.getPath() + " not found."); //$NON-NLS-1$//$NON-NLS-2$
}
}
}
@@ -153,7 +153,7 @@ public class ZipProcessor {
} catch (IOException e) {
if (options.verbose) {
e.printStackTrace();
- System.out.println("Warning: Problem reading " + extractedFile.getPath() + ".");
+ System.out.println("Warning: Problem reading " + extractedFile.getPath() + "."); //$NON-NLS-1$//$NON-NLS-2$
}
}
}
@@ -171,7 +171,7 @@ public class ZipProcessor {
zipOut.closeEntry();
} catch (ZipException e) {
if (options.verbose) {
- System.out.println("Warning: " + name + " already exists in " + outputFile.getName() + ". Skipping.");
+ System.out.println("Warning: " + name + " already exists in " + outputFile.getName() + ". Skipping."); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
}
}
entryStream.close();
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/AntBasedProcessorExecutor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/AntBasedProcessorExecutor.java
index 7639262..959c74e 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/AntBasedProcessorExecutor.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/org/eclipse/equinox/internal/p2/jarprocessor/ant/AntBasedProcessorExecutor.java
@@ -31,8 +31,8 @@ public class AntBasedProcessorExecutor extends JarProcessorExecutor {
this.antTaskName = antTaskName;
}
- protected FileFilter createFileFilter(Options options) {
- baseFilter = super.createFileFilter(options);
+ protected FileFilter createFileFilter(Options opt) {
+ baseFilter = super.createFileFilter(opt);
if (inputFiles == null || inputFiles.size() == 0)
return baseFilter;
@@ -60,11 +60,11 @@ public class AntBasedProcessorExecutor extends JarProcessorExecutor {
super.processDirectory(input, filter, verbose, processor, packProperties);
}
- public void addSignStep(JarProcessor processor, Properties properties, Options options) {
+ public void addSignStep(JarProcessor processor, Properties properties, Options opt) {
if (signArguments.get(JarProcessorTask.UNSIGN) != null)
- processor.addProcessStep(new UnsignCommand(properties, options.signCommand, options.verbose));
+ processor.addProcessStep(new UnsignCommand(properties, opt.signCommand, opt.verbose));
if (signArguments.get(JarProcessorTask.SIGN) != null)
- processor.addProcessStep(new AntSignCommand(properties, signArguments, project, antTaskName, options.signCommand, options.verbose));
+ processor.addProcessStep(new AntSignCommand(properties, signArguments, project, antTaskName, opt.signCommand, opt.verbose));
}
public void setInputFiles(List inputFiles) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java
index 4d3caf5..27c1fd9 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java
@@ -192,7 +192,7 @@ public class AdviceFileParser {
if (match != null) {
//When update.match is specified, versionRange and id are ignored
IExpression expr = ExpressionUtil.parse(substituteVersionAndQualifier(match));
- IMatchExpression matchExpression = ExpressionUtil.getFactory().matchExpression(expr);
+ IMatchExpression<IInstallableUnit> matchExpression = ExpressionUtil.getFactory().matchExpression(expr);
Collection<IMatchExpression<IInstallableUnit>> descriptors = new ArrayList<IMatchExpression<IInstallableUnit>>(1);
descriptors.add(matchExpression);
return MetadataFactory.createUpdateDescriptor(descriptors, Integer.valueOf(severity), description, (URI) null);