Add type information to generic types
Resolve raw type warnings.
Change-Id: I8b9019245f5f02e54b1de25d747b98a26e9f49d3
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java
index 1253c72..898e905 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/help/WorkbenchHelpSystem.java
@@ -156,7 +156,7 @@
* purposes.
*
*/
- private Hashtable registeredIDTable;
+ private Hashtable<String, StackTraceElement> registeredIDTable;
/**
* Handles dynamic removal of the help system.
@@ -855,12 +855,12 @@
}
if (registeredIDTable == null)
- registeredIDTable = new Hashtable();
+ registeredIDTable = new Hashtable<>();
if (!registeredIDTable.containsKey(contextId))
registeredIDTable.put(contextId, currentElement);
else if (!registeredIDTable.get(contextId).equals(currentElement)) {
- StackTraceElement initialElement = (StackTraceElement) registeredIDTable.get(contextId);
+ StackTraceElement initialElement = registeredIDTable.get(contextId);
String error = "UI Duplicate Context ID found: '" + contextId + "'\n" + //$NON-NLS-1$ //$NON-NLS-2$
" 1 at " + initialElement + '\n' + //$NON-NLS-1$
" 2 at " + currentElement; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java
index c44a6be..d7f8200 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/intro/IntroRegistry.java
@@ -56,7 +56,7 @@
IExtension[] extensions = point.getExtensions();
extensions = RegistryReader.orderExtensions(extensions);
- ArrayList list = new ArrayList(extensions.length);
+ ArrayList<IIntroDescriptor> list = new ArrayList<>(extensions.length);
for (IExtension extension : extensions) {
IConfigurationElement[] elements = extension.getConfigurationElements();
for (IConfigurationElement element : elements) {
@@ -72,7 +72,7 @@
}
}
- return (IIntroDescriptor[]) list.toArray(new IIntroDescriptor[list.size()]);
+ return list.toArray(new IIntroDescriptor[list.size()]);
}
@Override
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java
index 391c3b5..3741d36 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java
@@ -19,7 +19,6 @@
import java.util.ResourceBundle;
import java.util.SortedSet;
import java.util.TreeSet;
-
import org.eclipse.ui.internal.util.Util;
import org.eclipse.ui.keys.IKeyFormatter;
import org.eclipse.ui.keys.Key;
@@ -69,9 +68,9 @@
public String format(KeySequence keySequence) {
StringBuilder stringBuffer = new StringBuilder();
- Iterator keyStrokeItr = keySequence.getKeyStrokes().iterator();
+ Iterator<KeyStroke> keyStrokeItr = keySequence.getKeyStrokes().iterator();
while (keyStrokeItr.hasNext()) {
- stringBuffer.append(format((KeyStroke) keyStrokeItr.next()));
+ stringBuffer.append(format(keyStrokeItr.next()));
if (keyStrokeItr.hasNext()) {
stringBuffer.append(getKeyStrokeDelimiter());
@@ -86,12 +85,12 @@
String keyDelimiter = getKeyDelimiter();
// Format the modifier keys, in sorted order.
- SortedSet modifierKeys = new TreeSet(getModifierKeyComparator());
+ SortedSet<ModifierKey> modifierKeys = new TreeSet<>(getModifierKeyComparator());
modifierKeys.addAll(keyStroke.getModifierKeys());
StringBuilder stringBuffer = new StringBuilder();
- Iterator modifierKeyItr = modifierKeys.iterator();
+ Iterator<ModifierKey> modifierKeyItr = modifierKeys.iterator();
while (modifierKeyItr.hasNext()) {
- stringBuffer.append(format((ModifierKey) modifierKeyItr.next()));
+ stringBuffer.append(format(modifierKeyItr.next()));
stringBuffer.append(keyDelimiter);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java
index 66d7d2e..1e9d200 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java
@@ -16,12 +16,10 @@
import java.util.Comparator;
import org.eclipse.ui.keys.ModifierKey;
-abstract class AbstractModifierKeyComparator implements Comparator {
+abstract class AbstractModifierKeyComparator implements Comparator<ModifierKey> {
@Override
- public int compare(Object left, Object right) {
- ModifierKey modifierKeyLeft = (ModifierKey) left;
- ModifierKey modifierKeyRight = (ModifierKey) right;
+ public int compare(ModifierKey modifierKeyLeft, ModifierKey modifierKeyRight) {
int modifierKeyLeftRank = rank(modifierKeyLeft);
int modifierKeyRightRank = rank(modifierKeyRight);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java
index 5cedd84..d87bd33 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java
@@ -15,7 +15,6 @@
package org.eclipse.ui.internal.keys;
import java.util.Comparator;
-
import org.eclipse.ui.keys.ModifierKey;
/**
@@ -23,12 +22,10 @@
*
* @since 3.0
*/
-public class AlphabeticModifierKeyComparator implements Comparator {
+public class AlphabeticModifierKeyComparator implements Comparator<ModifierKey> {
@Override
- public int compare(Object left, Object right) {
- ModifierKey modifierKeyLeft = (ModifierKey) left;
- ModifierKey modifierKeyRight = (ModifierKey) right;
+ public int compare(ModifierKey modifierKeyLeft, ModifierKey modifierKeyRight) {
return modifierKeyLeft.toString().compareTo(modifierKeyRight.toString());
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
index 77c7374..72369d3 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
@@ -1084,7 +1084,7 @@
keyController.getBindingModel().setSelectedElement((ModelElement) data);
}
if (data instanceof Binding && fFilteredTree != null) {
- BindingElement be = (BindingElement) keyController.getBindingModel().getBindingToElement().get(data);
+ BindingElement be = keyController.getBindingModel().getBindingToElement().get(data);
fFilteredTree.getViewer().setSelection(new StructuredSelection(be), true);
}
if (data instanceof ParameterizedCommand) {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java
index 06ca895..aa251d5 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/WorkbenchKeyboard.java
@@ -17,6 +17,7 @@
import java.util.List;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher;
+import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
@@ -80,7 +81,7 @@
* @see org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher#press(java.util.List,
* org.eclipse.swt.widgets.Event)
*/
- public boolean press(List potentialKeyStrokes, Event event) {
+ public boolean press(List<KeyStroke> potentialKeyStrokes, Event event) {
return delegate.press(potentialKeyStrokes, event);
}
@@ -100,7 +101,7 @@
* @param ctrlShiftT
* @return
*/
- public static List generatePossibleKeyStrokes(Event event) {
+ public static List<KeyStroke> generatePossibleKeyStrokes(Event event) {
return KeyBindingDispatcher.generatePossibleKeyStrokes(event);
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/BindingModel.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/BindingModel.java
index 4884a4d..6651c00 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/BindingModel.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/BindingModel.java
@@ -126,14 +126,14 @@
/**
* @return Returns the bindingToElement.
*/
- public Map getBindingToElement() {
+ public Map<Binding, BindingElement> getBindingToElement() {
return bindingToElement;
}
/**
* @return Returns the commandToElement.
*/
- public Map getCommandToElement() {
+ public Map<ParameterizedCommand, BindingElement> getCommandToElement() {
return commandToElement;
}
@@ -435,7 +435,7 @@
* @param bindingToElement The bindingToElement to set.
*/
public void setBindingToElement(Map<Binding, BindingElement> bindingToElement) {
- Map old = this.bindingToElement;
+ Map<Binding, BindingElement> old = this.bindingToElement;
this.bindingToElement = bindingToElement;
controller.firePropertyChange(this, PROP_BINDING_ELEMENT_MAP, old, bindingToElement);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java
index 98c3310..0899466 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/ConflictModel.java
@@ -158,7 +158,7 @@
Binding b = (Binding) i.next();
if (binding != b && b.getContextId().equals(binding.getContextId())
&& b.getSchemeId().equals(binding.getSchemeId())) {
- BindingElement element = (BindingElement) bindingModel.getBindingToElement().get(b);
+ BindingElement element = bindingModel.getBindingToElement().get(b);
if (element != null) {
localConflicts.add(element);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
index 6f8cc74..8eab97e 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
@@ -328,7 +328,7 @@
: selectedElement.getId();
final KeyBinding binding = new KeyBinding(keySequence, keyBinding.getParameterizedCommand(),
activeSchemeId, activeContextId, null, null, null, Binding.USER);
- Map<KeyBinding, BindingElement> bindingToElement = bindingModel.getBindingToElement();
+ Map<Binding, BindingElement> bindingToElement = bindingModel.getBindingToElement();
bindingToElement.remove(keyBinding);
if (keyBinding.getType() == Binding.USER) {
fBindingManager.removeBinding(keyBinding);
