bug 319512: Missing type arguments compilation warnings

3 files changed, 10 insertions, 8 deletions

diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
index 4db869f9903..35b84c29cf1 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
@@ -12,6 +12,7 @@
 package org.eclipse.cdt.make.core.tests;
 
 import junit.framework.Test;
+import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.eclipse.cdt.make.builder.tests.StandardBuildTests;
@@ -22,11 +23,11 @@ public class AutomatedIntegrationSuite extends TestSuite {
 	public AutomatedIntegrationSuite() {
 	}
 
-	public AutomatedIntegrationSuite(Class theClass, String name) {
+	public AutomatedIntegrationSuite(Class<? extends TestCase> theClass, String name) {
 		super(theClass, name);
 	}
 
-	public AutomatedIntegrationSuite(Class theClass) {
+	public AutomatedIntegrationSuite(Class<? extends TestCase> theClass) {
 		super(theClass);
 	}
 
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCProfileInstance.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCProfileInstance.java
index cb88f27340e..f0ec41fbef8 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCProfileInstance.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCProfileInstance.java
@@ -109,7 +109,7 @@ public class SCProfileInstance {
 	public IScannerInfoCollector createScannerInfoCollector() {
 		ScannerInfoCollector collector = profile.getScannerInfoCollectorElement();
 		if (collector != null) {
-			return (IScannerInfoCollector) collector.createScannerInfoCollector();
+			return collector.createScannerInfoCollector();
 		}
 		return null;
 	}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
index 5f35e100410..8a135dce48d 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfile.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector;
 import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
 import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigScope;
 import org.eclipse.core.runtime.CoreException;
@@ -42,9 +43,9 @@ public class ScannerConfigProfile {
 		public ScannerInfoCollector(IConfigurationElement configElem) {
 			this.configElem = configElem;
 		}
-		public Object createScannerInfoCollector() {
+		public IScannerInfoCollector createScannerInfoCollector() {
 			try {
-				return configElem.createExecutableExtension("class"); //$NON-NLS-1$
+				return (IScannerInfoCollector) configElem.createExecutableExtension("class"); //$NON-NLS-1$
 			} catch (CoreException e) {
 				MakeCorePlugin.log(e);
 				return null;
@@ -319,9 +320,9 @@ public class ScannerConfigProfile {
 		if(supportsContext == null){
 			ScannerInfoCollector cr = getScannerInfoCollectorElement();
 			if(cr != null){
-				Object o = cr.createScannerInfoCollector();
-				if(o != null){
-					Class clazz = o.getClass();
+				IScannerInfoCollector collector = cr.createScannerInfoCollector();
+				if(collector != null){
+					Class<? extends IScannerInfoCollector> clazz = collector.getClass();
 					try {
 						clazz.getMethod("setInfoContext", new Class[] {InfoContext.class}); //$NON-NLS-1$
 						supportsContext = Boolean.TRUE;