fixed compiler warnings
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/KeyedHashSet.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/KeyedHashSet.java
index f5c7d48..e84299a 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/KeyedHashSet.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/KeyedHashSet.java
@@ -65,11 +65,9 @@
return true;
}
if (elements[i].compare(element)) {
- if (replace) {
+ if (replace)
elements[i] = element;
- return true;
- } else
- return false;
+ return replace;
}
}
@@ -84,11 +82,9 @@
return true;
}
if (elements[i].compare(element)) {
- if (replace) {
+ if (replace)
elements[i] = element;
- return true;
- } else
- return false;
+ return replace;
}
}
@@ -97,9 +93,9 @@
return add(element);
}
- public void addAll(KeyedElement[] elements) {
- for (int i = 0; i < elements.length; i++)
- add(elements[i]);
+ public void addAll(KeyedElement[] toAdd) {
+ for (int i = 0; i < toAdd.length; i++)
+ add(toAdd[i]);
}
public boolean contains(KeyedElement element) {
@@ -311,9 +307,9 @@
return Math.abs(key.hashCode()) % elements.length;
}
- public void removeAll(KeyedElement[] elements) {
- for (int i = 0; i < elements.length; i++)
- remove(elements[i]);
+ public void removeAll(KeyedElement[] toRemove) {
+ for (int i = 0; i < toRemove.length; i++)
+ remove(toRemove[i]);
}
private boolean shouldGrow() {