[268561] Setup API Tooling
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedElementSelectionValidator.java b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedElementSelectionValidator.java
index 09f8f85..a21bc29 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedElementSelectionValidator.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedElementSelectionValidator.java
@@ -28,16 +28,16 @@
private IStatus fgErrorStatus= new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
private IStatus fgOKStatus= new StatusInfo();
- private Class[] fAcceptedTypes;
+ private Class<?>[] fAcceptedTypes;
private boolean fAllowMultipleSelection;
- private Collection fRejectedElements;
+ private Collection<?> fRejectedElements;
/**
* @param acceptedTypes The types accepted by the validator
* @param allowMultipleSelection If set to <code>true</code>, the validator
* allows multiple selection.
*/
- public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
+ public TypedElementSelectionValidator(Class<?>[] acceptedTypes, boolean allowMultipleSelection) {
this(acceptedTypes, allowMultipleSelection, null);
}
@@ -47,7 +47,7 @@
* allows multiple selection.
* @param rejectedElements A list of elements that are not accepted
*/
- public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection, Collection rejectedElements) {
+ public TypedElementSelectionValidator(Class<?>[] acceptedTypes, boolean allowMultipleSelection, Collection<?> rejectedElements) {
Assert.isNotNull(acceptedTypes);
fAcceptedTypes= acceptedTypes;
fAllowMultipleSelection= allowMultipleSelection;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedViewerFilter.java b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedViewerFilter.java
index ebd6ad2..7124e60 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedViewerFilter.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/TypedViewerFilter.java
@@ -20,14 +20,14 @@
*/
public class TypedViewerFilter extends ViewerFilter {
- private Class[] fAcceptedTypes;
+ private Class<?>[] fAcceptedTypes;
private Object[] fRejectedElements;
/**
* Creates a filter that only allows elements of gives types.
* @param acceptedTypes The types of accepted elements
*/
- public TypedViewerFilter(Class[] acceptedTypes) {
+ public TypedViewerFilter(Class<?>[] acceptedTypes) {
this(acceptedTypes, null);
}
@@ -38,7 +38,7 @@
* @param rejectedElements Element equals to the rejected elements are
* filtered out
*/
- public TypedViewerFilter(Class[] acceptedTypes, Object[] rejectedElements) {
+ public TypedViewerFilter(Class<?>[] acceptedTypes, Object[] rejectedElements) {
Assert.isNotNull(acceptedTypes);
fAcceptedTypes= acceptedTypes;
fRejectedElements= rejectedElements;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/dialogs/ComplexClassifierProvider.java b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/dialogs/ComplexClassifierProvider.java
index de87237..17e8948 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/dialogs/ComplexClassifierProvider.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/dialogs/ComplexClassifierProvider.java
@@ -94,7 +94,7 @@
int offset = 0;
boolean firstPart = true;
- for (Iterator iter = parts.iterator(); iter.hasNext(); firstPart = false) {
+ for (Iterator<String> iter = parts.iterator(); iter.hasNext(); firstPart = false) {
String part = (String) iter.next();
boolean found = false;
diff --git a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/wizards/PersistedValuesWizard.java b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/wizards/PersistedValuesWizard.java
index 2a45137..6eb7ebe 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/wizards/PersistedValuesWizard.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.common.ui/src/org/eclipse/m2m/internal/qvt/oml/common/ui/wizards/PersistedValuesWizard.java
@@ -77,7 +77,7 @@
* but some section just doesn't have some of key entries this section is returned (with
* lost entries added), if none found a new section is created and with key values set
*/
- public PreferenceSection loadValues(Map keys) {
+ public PreferenceSection loadValues(Map<String, ?> keys) {
// The root section, corresponding to the wizard
IDialogSettings section = myPlugin.getDialogSettings().getSection(getClass().getName());
if (section == null) {
@@ -165,9 +165,9 @@
private static final int SECTIONS_DIFFERENT = -1;
private static final int SECTIONS_EQUAL = 0;
private static final int SECTIONS_EQUAL_WITH_IMPLIED = 1;
- private int checkSectionEquals(IDialogSettings section, Map keys) {
+ private int checkSectionEquals(IDialogSettings section, Map<String,?> keys) {
int result = SECTIONS_EQUAL;
- for (Iterator i = keys.keySet().iterator(); i.hasNext();) {
+ for (Iterator<String> i = keys.keySet().iterator(); i.hasNext();) {
String key = (String) i.next();
String value = section.get(key);
if (!keys.get(key).equals(value)) {
@@ -186,9 +186,9 @@
* Initializes newly loaded section: stores key valus and sets a time stamp
* @param section
*/
- private void initSection(PreferenceSection section, Map keys) {
+ private void initSection(PreferenceSection section, Map<String, ?> keys) {
section.put(TIMESTAMP, new Date().getTime());
- for (Iterator i = keys.keySet().iterator(); i.hasNext();) {
+ for (Iterator<String> i = keys.keySet().iterator(); i.hasNext();) {
String key = (String) i.next();
section.put(key, (String) keys.get(key));
}
