Bug 529425 - [sonar] Resolve "instanceof will always return true"
Change-Id: I8ae0af3452dd8e6d6e14b5b79d6c31687906b5fe
Signed-off-by: René Purrio <rpurrio@itemis.de>
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/util/ProductPreferences.java b/org.eclipse.help/src/org/eclipse/help/internal/util/ProductPreferences.java
index 6ac8a72..e073e96 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/util/ProductPreferences.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/util/ProductPreferences.java
@@ -233,15 +233,15 @@
@Override
public int compare(String o1, String o2) {
- Object name1 = tocNames.get(o1);
- Object name2 = tocNames.get(o2);
- if (!(name1 instanceof String)) {
- return (name2 instanceof String) ? -1 : 0;
+ String name1 = tocNames.get(o1);
+ String name2 = tocNames.get(o2);
+ if (name1 == null) {
+ return (name2 != null) ? -1 : 0;
}
- if (!(name2 instanceof String)) {
+ if (name2 == null) {
return 1;
}
- return Collator.getInstance().compare((String)name1, (String)name2);
+ return Collator.getInstance().compare(name1, name2);
}
}
