dltk.ui: generics/@Override annotations
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/BestMatchHover.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/BestMatchHover.java
index 1580fc5..0575eb8 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/BestMatchHover.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/BestMatchHover.java
@@ -10,7 +10,6 @@
package org.eclipse.dltk.internal.ui.text.hover;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
@@ -110,10 +109,7 @@
if (fInstantiatedTextHovers == null)
return null;
- for (Iterator<ITextHover> iterator = fInstantiatedTextHovers.iterator(); iterator
- .hasNext();) {
- ITextHover hover = iterator.next();
-
+ for (ITextHover hover : fInstantiatedTextHovers) {
String s = hover.getHoverInfo(textViewer, hoverRegion);
if (s != null && s.trim().length() > 0) {
fBestHover = hover;
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/EditorTextHoverDescriptor.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/EditorTextHoverDescriptor.java
index a2f0c6c..4af9e8b 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/EditorTextHoverDescriptor.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/text/hover/EditorTextHoverDescriptor.java
@@ -181,6 +181,7 @@
.booleanValue();
}
+ @Override
public boolean equals(Object obj) {
if (obj == null || !obj.getClass().equals(this.getClass())
|| getId() == null)
@@ -188,13 +189,15 @@
return getId().equals(((EditorTextHoverDescriptor) obj).getId());
}
+ @Override
public int hashCode() {
return getId().hashCode();
}
private static EditorTextHoverDescriptor[] createDescriptors(
IConfigurationElement[] elements, String natureId) {
- List result = new ArrayList(elements.length);
+ List<EditorTextHoverDescriptor> result = new ArrayList<EditorTextHoverDescriptor>(
+ elements.length);
for (int i = 0; i < elements.length; i++) {
IConfigurationElement element = elements[i];
if (HOVER_TAG.equals(element.getName())) {
@@ -207,8 +210,7 @@
}
}
}
- return (EditorTextHoverDescriptor[]) result
- .toArray(new EditorTextHoverDescriptor[result.size()]);
+ return result.toArray(new EditorTextHoverDescriptor[result.size()]);
}
private static void initializeFromPreferences(
@@ -217,7 +219,8 @@
.getString(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS);
StringTokenizer tokenizer = new StringTokenizer(
compiledTextHoverModifiers, VALUE_SEPARATOR);
- HashMap idToModifier = new HashMap(tokenizer.countTokens() / 2);
+ HashMap<String, String> idToModifier = new HashMap<String, String>(
+ tokenizer.countTokens() / 2);
while (tokenizer.hasMoreTokens()) {
String id = tokenizer.nextToken();
if (tokenizer.hasMoreTokens())
@@ -227,15 +230,15 @@
.getString(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS);
tokenizer = new StringTokenizer(compiledTextHoverModifierMasks,
VALUE_SEPARATOR);
- HashMap idToModifierMask = new HashMap(tokenizer.countTokens() / 2);
+ HashMap<String, String> idToModifierMask = new HashMap<String, String>(
+ tokenizer.countTokens() / 2);
while (tokenizer.hasMoreTokens()) {
String id = tokenizer.nextToken();
if (tokenizer.hasMoreTokens())
idToModifierMask.put(id, tokenizer.nextToken());
}
for (int i = 0; i < hovers.length; i++) {
- String modifierString = (String) idToModifier
- .get(hovers[i].getId());
+ String modifierString = idToModifier.get(hovers[i].getId());
boolean enabled = true;
if (modifierString == null)
modifierString = DISABLED_TAG;
@@ -251,9 +254,8 @@
if (hovers[i].fStateMask == -1) {
// Fallback: use stored modifier masks
try {
- hovers[i].fStateMask = Integer
- .parseInt((String) idToModifierMask.get(hovers[i]
- .getId()));
+ hovers[i].fStateMask = Integer.parseInt(idToModifierMask
+ .get(hovers[i].getId()));
} catch (NumberFormatException ex) {
hovers[i].fStateMask = -1;
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/DLTKUIPlugin.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/DLTKUIPlugin.java
index 852d01d..b15c0d2 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/DLTKUIPlugin.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/DLTKUIPlugin.java
@@ -553,7 +553,7 @@
return fContentAssistHistory;
}
- private final Map editorTextHoverDescriptorsByNature = new HashMap();
+ private final Map<String, EditorTextHoverDescriptor[]> editorTextHoverDescriptorsByNature = new HashMap<String, EditorTextHoverDescriptor[]>();
/**
* Resets editor text hovers contributed to the workbench.
@@ -610,8 +610,7 @@
IPreferenceStore store, String natureId) {
EditorTextHoverDescriptor[] descriptors;
synchronized (editorTextHoverDescriptorsByNature) {
- descriptors = (EditorTextHoverDescriptor[]) editorTextHoverDescriptorsByNature
- .get(natureId);
+ descriptors = editorTextHoverDescriptorsByNature.get(natureId);
}
if (descriptors == null) {
descriptors = initializeEditorTextHoverDescriprtors(store, natureId);
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptSourceViewerConfiguration.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptSourceViewerConfiguration.java
index 69aff54..4594abd 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptSourceViewerConfiguration.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/ScriptSourceViewerConfiguration.java
@@ -136,6 +136,7 @@
commentColor, tagColor, taskPrefs);
}
+ @Override
public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
if (fDocumentPartitioning != null)
return fDocumentPartitioning;
@@ -157,6 +158,7 @@
return this.fTextEditor;
}
+ @Override
public IReconciler getReconciler(ISourceViewer sourceViewer) {
final ITextEditor editor = getEditor();
if (editor != null && editor.isEditable()) {
@@ -184,10 +186,9 @@
}
/*
- * @see
- * org.eclipse.jface.text.source.SourceViewerConfiguration#getDefaultPrefixes
- * (org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+ * @see SourceViewerConfiguration#getDefaultPrefixes(ISourceViewer,String)
*/
+ @Override
public String[] getDefaultPrefixes(ISourceViewer sourceViewer,
String contentType) {
return new String[] { getCommentPrefix(), "" }; //$NON-NLS-1$
@@ -287,6 +288,7 @@
return settings;
}
+ @Override
public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
if (!fPreferenceStore
.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
@@ -376,6 +378,7 @@
* SourceViewerConfiguration#getConfiguredTextHoverStateMasks(ISourceViewer,
* String)
*/
+ @Override
public int[] getConfiguredTextHoverStateMasks(ISourceViewer sourceViewer,
String contentType) {
final String natureId = getNatureId();
@@ -411,6 +414,7 @@
/*
* @see SourceViewerConfiguration#getTextHover(ISourceViewer, String, int)
*/
+ @Override
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType, int stateMask) {
final String natureId = getNatureId();
@@ -439,6 +443,7 @@
return ((ScriptEditor) editor).getLanguageToolkit().getNatureId();
}
+ @Override
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType) {
return getTextHover(sourceViewer, contentType,
@@ -468,6 +473,7 @@
};
}
+ @Override
public IInformationPresenter getInformationPresenter(
ISourceViewer sourceViewer) {
InformationPresenter presenter = new InformationPresenter(
@@ -483,6 +489,7 @@
return presenter;
}
+ @Override
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
if (getEditor() != null) {
ContentAssistant assistant = new ContentAssistant();
@@ -522,6 +529,7 @@
event);
}
+ @Override
public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
final String natureId = getNatureId();
if (ScriptFormatterManager.hasFormatterFor(natureId)) {
@@ -537,6 +545,7 @@
/*
* @see SourceViewerConfiguration#getIndentPrefixes(ISourceViewer, String)
*/
+ @Override
public String[] getIndentPrefixes(ISourceViewer sourceViewer,
String contentType) {
if (fPreferenceStore == null) {
@@ -566,6 +575,7 @@
return TabStyle.TAB;
}
+ @Override
public int getTabWidth(ISourceViewer sourceViewer) {
if (fPreferenceStore == null)
return super.getTabWidth(sourceViewer);
@@ -605,6 +615,7 @@
*
* @since 3.0
*/
+ @Override
public IInformationControlCreator getInformationControlCreator(
ISourceViewer sourceViewer) {
return new IInformationControlCreator() {