Fix warning that fails the build with Tycho 2.1.0.
It uses jdt.core 3.23.0 which gives the false positive warning:
Compiling 48 source files to
/home/jenkins/agent/workspace/rt.equinox.bundles-Gerrit/bundles/org.eclipse.equinox.preferences/target/classes
[WARNING]
/home/jenkins/agent/workspace/rt.equinox.bundles-Gerrit/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/SortedProperties.java:[18]
import java.util.Map.Entry;
^^^^^^^^^^^^^^^^^^^
The import java.util.Map.Entry is never used
1 problem (1 warning)
error: warnings found and -failOnWarning specified
Not reporting ecj bug as 4.18 stream version no longer shows the issue
so it seems fixed.
Change-Id: Idc38378e56f45e88e6eec20985c07c84d96c84c5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
index 681e530..82eb1bf 100644
--- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true
-Bundle-Version: 3.8.0.qualifier
+Bundle-Version: 3.8.100.qualifier
Bundle-Activator: org.eclipse.core.internal.preferences.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.preferences/pom.xml b/bundles/org.eclipse.equinox.preferences/pom.xml
index 19ee38c..16cdd09 100644
--- a/bundles/org.eclipse.equinox.preferences/pom.xml
+++ b/bundles/org.eclipse.equinox.preferences/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.preferences</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/SortedProperties.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/SortedProperties.java
index bffe300..37ad44b 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/SortedProperties.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/SortedProperties.java
@@ -15,7 +15,6 @@
package org.eclipse.core.internal.preferences;
import java.util.*;
-import java.util.Map.Entry;
/**
* A {@link Properties} class whose entries are sorted by key; can <strong>only</strong> be used in limited scenarios
@@ -43,13 +42,13 @@
}
@Override
- public Set<Entry<Object, Object>> entrySet() {
- TreeSet<Entry<Object, Object>> set = new TreeSet<>((Entry<Object, Object> e1, Entry<Object, Object> e2) -> {
+ public Set<Map.Entry<Object, Object>> entrySet() {
+ TreeSet<Map.Entry<Object, Object>> set = new TreeSet<>((Map.Entry<Object, Object> e1, Map.Entry<Object, Object> e2) -> {
String s1 = (String) e1.getKey();
String s2 = (String) e2.getKey();
return s1.compareTo(s2);
});
- for (java.util.Map.Entry<Object, Object> entry : super.entrySet()) {
+ for (Map.Entry<Object, Object> entry : super.entrySet()) {
set.add(entry);
}
return set;
