generics
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/ImprovedAbstractConfigurationBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/ImprovedAbstractConfigurationBlock.java
index 146c260..3bcec55 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/ImprovedAbstractConfigurationBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/preferences/ImprovedAbstractConfigurationBlock.java
@@ -13,8 +13,8 @@
import java.util.List;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.dltk.ui.dialogs.StatusInfo;
import org.eclipse.dltk.internal.ui.dialogs.StatusUtil;
+import org.eclipse.dltk.ui.dialogs.StatusInfo;
import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore.OverlayKey;
import org.eclipse.dltk.ui.util.IStatusChangeListener;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -85,7 +85,7 @@
* storing any preference values.
* </p>
*/
- protected abstract List createOverlayKeys();
+ protected abstract List<OverlayKey> createOverlayKeys();
// Binding
@@ -166,10 +166,10 @@
}
private void addOverlayKeys() {
- List overlayKeys = createOverlayKeys();
+ List<OverlayKey> overlayKeys = createOverlayKeys();
if (overlayKeys != null) {
- OverlayKey[] keys = (OverlayKey[]) overlayKeys
- .toArray(new OverlayKey[overlayKeys.size()]);
+ OverlayKey[] keys = overlayKeys.toArray(new OverlayKey[overlayKeys
+ .size()]);
store.addKeys(keys);
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/AbstractContributedFoldingPreferenceBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/AbstractContributedFoldingPreferenceBlock.java
index 17de158..4d021bf 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/AbstractContributedFoldingPreferenceBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/AbstractContributedFoldingPreferenceBlock.java
@@ -6,6 +6,7 @@
import org.eclipse.dltk.ui.preferences.ImprovedAbstractConfigurationBlock;
import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
import org.eclipse.dltk.ui.preferences.PreferencesMessages;
+import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore.OverlayKey;
import org.eclipse.dltk.ui.util.SWTFactory;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.layout.GridData;
@@ -63,10 +64,10 @@
/**
* Adds the folding option preference overlay keys.
*/
- protected abstract void addOverlayKeys(List keys);
+ protected abstract void addOverlayKeys(List<OverlayKey> keys);
- protected final List createOverlayKeys() {
- ArrayList keys = new ArrayList();
+ protected final List<OverlayKey> createOverlayKeys() {
+ ArrayList<OverlayKey> keys = new ArrayList<OverlayKey>();
addOverlayKeys(keys);
return keys;
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/DocumentationFoldingPreferenceBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/DocumentationFoldingPreferenceBlock.java
index 8563c34..8c8f818 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/DocumentationFoldingPreferenceBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/DocumentationFoldingPreferenceBlock.java
@@ -5,6 +5,7 @@
import org.eclipse.dltk.ui.PreferenceConstants;
import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
import org.eclipse.dltk.ui.preferences.PreferencesMessages;
+import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore.OverlayKey;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
@@ -25,7 +26,8 @@
* also invoke this method.
* </p>
*/
- protected void addOverlayKeys(List keys) {
+ @Override
+ protected void addOverlayKeys(List<OverlayKey> keys) {
keys.add(new OverlayPreferenceStore.OverlayKey(
OverlayPreferenceStore.BOOLEAN,
PreferenceConstants.EDITOR_COMMENT_FOLDING_JOIN_NEWLINES));
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/SourceCodeFoldingPreferenceBlock.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/SourceCodeFoldingPreferenceBlock.java
index ed3811f..d5423a7 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/SourceCodeFoldingPreferenceBlock.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/text/folding/SourceCodeFoldingPreferenceBlock.java
@@ -5,6 +5,7 @@
import org.eclipse.dltk.ui.PreferenceConstants;
import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
import org.eclipse.dltk.ui.preferences.PreferencesMessages;
+import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore.OverlayKey;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
@@ -25,7 +26,8 @@
* also invoke this method.
* </p>
*/
- protected void addOverlayKeys(List keys) {
+ @Override
+ protected void addOverlayKeys(List<OverlayKey> keys) {
keys.add(new OverlayPreferenceStore.OverlayKey(
OverlayPreferenceStore.BOOLEAN, getInitiallyFoldClassesKey()));
keys.add(new OverlayPreferenceStore.OverlayKey(