Bug 579230 - fix miscellaneous warnings and enable warnings in build/IDE
Change-Id: I80506e8ebcc9a5a7f6ec5976f6e2afb2d4d014a8
Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/191978
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
index 51d0ca2..9d74d43 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -106,7 +106,7 @@
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
diff --git a/apitools/org.eclipse.pde.api.tools.tests/build.properties b/apitools/org.eclipse.pde.api.tools.tests/build.properties
index 7ff7f2c..d2e5174 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/build.properties
@@ -35,4 +35,3 @@
test-anttasks/,\
test-apiusescan/,\
OSGI-INF/
-javacWarnings..=-unchecked,-raw
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/FileUtils.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/FileUtils.java
index 0e51340..cbb8735 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/FileUtils.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/FileUtils.java
@@ -348,7 +348,7 @@
path = path.substring(rootPathLength);
ZipEntry entry = new ZipEntry(path.replace('\\', '/'));
zip.putNextEntry(entry);
- zip.write(org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(file));
+ zip.write(Files.readAllBytes(file.toPath()));
zip.closeEntry();
} else {
zip(file, zip, rootPathLength);
@@ -394,13 +394,11 @@
* given destination (a directory that must exists).
*/
public static void copyFile(String sourcePath, String destPath) {
- sourcePath = Util.toNativePath(sourcePath);
- destPath = Util.toNativePath(destPath);
- File source = new File(sourcePath);
+ File source = new File(Util.toNativePath(sourcePath));
if (!source.exists()) {
return;
}
- File dest = new File(destPath);
+ File dest = new File(Util.toNativePath(destPath));
if (!dest.exists()) {
return;
}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/build.properties b/apitools/org.eclipse.pde.api.tools.ui/build.properties
index e7a0509..1ac88dc 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.ui/build.properties
@@ -20,4 +20,3 @@
plugin.properties,\
icons/
src.includes = about.html
-javacWarnings..=-warningToken
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
index 3f8aa87..71c4b84 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/TargetBasedApiBaselineWizardPage.java
@@ -133,12 +133,12 @@
cell.setText(styledString.toString());
cell.setStyleRanges(styledString.getStyleRanges());
- cell.setImage(getImage(targetDef));
+ cell.setImage(getImage());
super.update(cell);
}
@SuppressWarnings("restriction")
- public Image getImage(Object e) {
+ public Image getImage() {
return pdeLabelProvider.get(org.eclipse.pde.internal.ui.PDEPluginImages.DESC_TARGET_DEFINITION);
}
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
index 30a0d75..9001075 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
@@ -260,8 +260,8 @@
private static Properties getPropertiesFromURL(URL profileURL) {
InputStream is = null;
try {
- profileURL = FileLocator.resolve(profileURL);
- URLConnection openConnection = profileURL.openConnection();
+ URL resolvedURL = FileLocator.resolve(profileURL);
+ URLConnection openConnection = resolvedURL.openConnection();
openConnection.setUseCaches(false);
is = openConnection.getInputStream();
if (is != null) {
diff --git a/tests-pom/pom.xml b/tests-pom/pom.xml
index 51c628f..804f031 100644
--- a/tests-pom/pom.xml
+++ b/tests-pom/pom.xml
@@ -19,7 +19,7 @@
<artifactId>tests-pom</artifactId>
<packaging>pom</packaging>
<properties>
- <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
+ <code.ignoredWarnings>-warn:-discouraged</code.ignoredWarnings>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
</properties>
</project>
diff --git a/ua/org.eclipse.pde.ua.core/pom.xml b/ua/org.eclipse.pde.ua.core/pom.xml
index 6d1b1dc..24fa72a 100644
--- a/ua/org.eclipse.pde.ua.core/pom.xml
+++ b/ua/org.eclipse.pde.ua.core/pom.xml
@@ -21,7 +21,4 @@
<artifactId>org.eclipse.pde.ua.core</artifactId>
<version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
- <properties>
- <code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
- </properties>
</project>
diff --git a/ua/org.eclipse.pde.ua.ui/pom.xml b/ua/org.eclipse.pde.ua.ui/pom.xml
index f7b6a4d..353beda 100644
--- a/ua/org.eclipse.pde.ua.ui/pom.xml
+++ b/ua/org.eclipse.pde.ua.ui/pom.xml
@@ -22,8 +22,4 @@
<artifactId>org.eclipse.pde.ua.ui</artifactId>
<version>1.2.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-
- <properties>
- <code.ignoredWarnings>-warn:-deprecation,raw,unchecked</code.ignoredWarnings>
- </properties>
</project>
diff --git a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
index 61fe5b0..50e5b21 100755
--- a/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
+++ b/ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
@@ -198,7 +198,7 @@
ParameterizedCommand result = getParameterizedCommand(serialization);
if (result != null) {
- updateCommandTable(result.getParameterMap());
+ updateCommandTable(getResultParameter(result));
}
}
} else {
@@ -389,7 +389,7 @@
// Select it
fCommandCombo.setText(nameToUse);
// Update the command table parameters
- updateCommandTable(result.getParameterMap());
+ updateCommandTable(getResultParameter(result));
} else {
// No serialization, something bad happened
fCommandCombo.setText(F_NO_COMMAND);
@@ -397,6 +397,11 @@
}
+ @SuppressWarnings("unchecked")
+ private static Map<String, String> getResultParameter(ParameterizedCommand result) {
+ return result.getParameterMap();
+ }
+
private ParameterizedCommand getParameterizedCommand(String serialization) {
if (PDETextHelper.isDefined(serialization)) {
ICommandService service = getCommandService();
@@ -423,12 +428,12 @@
return null;
}
- private void updateCommandTable(Map<Object, Object> parameters) {
+ private void updateCommandTable(Map<String, String> parameters) {
// Clear the table contents
fCommandTable.clearAll();
if (parameters != null && !parameters.isEmpty()) {
int rowCount = 0;
- for (Entry<Object, Object> entry : parameters.entrySet()) {
+ for (Entry<String, String> entry : parameters.entrySet()) {
// Track number of keys / rows processed
TableItem item = null;
// Determine if there is an existing row already at that index
@@ -439,24 +444,20 @@
// There isn't, create a new one
item = new TableItem(fCommandTable, SWT.NONE);
}
- if (entry.getKey() instanceof String) {
- String keyString = (String) entry.getKey();
- // If present, remove the fully qualified ID from the
- // paramater key
- // i.e. "org.eclipse.ui.perspective" becomes just
- // "perspective"
- int dotIndex = keyString.lastIndexOf('.');
- if ((dotIndex != -1) && (dotIndex != (keyString.length() - 1))) {
- keyString = keyString.substring(dotIndex + 1);
- }
- // Set parameter key in first column
- item.setText(0, keyString);
+ String keyString = entry.getKey();
+ // If present, remove the fully qualified ID from the
+ // paramater key
+ // i.e. "org.eclipse.ui.perspective" becomes just
+ // "perspective"
+ int dotIndex = keyString.lastIndexOf('.');
+ if ((dotIndex != -1) && (dotIndex != (keyString.length() - 1))) {
+ keyString = keyString.substring(dotIndex + 1);
}
- Object value = entry.getValue();
- if (value instanceof String) {
- // Set parameter value in second column
- item.setText(1, (String) value);
- }
+ // Set parameter key in first column
+ item.setText(0, keyString);
+
+ // Set parameter value in second column
+ item.setText(1, entry.getValue());
rowCount++;
}
// Pack the columns with the new data
diff --git a/ui/org.eclipse.pde.launching/pom.xml b/ui/org.eclipse.pde.launching/pom.xml
index a9cc63b..e801eb2 100644
--- a/ui/org.eclipse.pde.launching/pom.xml
+++ b/ui/org.eclipse.pde.launching/pom.xml
@@ -20,7 +20,4 @@
<artifactId>org.eclipse.pde.launching</artifactId>
<version>3.9.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
- <properties>
- <code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
- </properties>
</project>
diff --git a/ui/org.eclipse.pde.runtime/pom.xml b/ui/org.eclipse.pde.runtime/pom.xml
index 77c4b04..19691c9 100644
--- a/ui/org.eclipse.pde.runtime/pom.xml
+++ b/ui/org.eclipse.pde.runtime/pom.xml
@@ -21,9 +21,4 @@
<artifactId>org.eclipse.pde.runtime</artifactId>
<version>3.7.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-
- <properties>
- <code.ignoredWarnings>-warn:-deprecation,raw,unchecked</code.ignoredWarnings>
- </properties>
-
</project>
diff --git a/ui/org.eclipse.pde.unittest.junit/build.properties b/ui/org.eclipse.pde.unittest.junit/build.properties
index 5105873..7b99aee 100644
--- a/ui/org.eclipse.pde.unittest.junit/build.properties
+++ b/ui/org.eclipse.pde.unittest.junit/build.properties
@@ -21,5 +21,3 @@
source.. = src/
src.includes = about.html
-
-javacWarnings..=-unavoidableGenericProblems
