Polish generics

4 files changed, 11 insertions, 11 deletions

diff --git a/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java b/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java
index b9684aa09..ef3a56e69 100644
--- a/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java
+++ b/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java
@@ -33,7 +33,7 @@ public interface ICompilerConfiguration extends CompilerConfigurationChangeFlags
 	 * @see org.aspectj.ajde.core.JavaOptions#getDefaultJavaOptions or
 	 *      org.aspectj.org.eclipse.jdt.core.IJavaProject#getOptions(boolean)
 	 */
-	public Map /* String --> String */getJavaOptionsMap();
+	public Map<String,String> getJavaOptionsMap();
 
 	/**
 	 * The non-standard options, typically prefaced with -X when used with a command line compiler. The default is no non-standard
@@ -59,7 +59,7 @@ public interface ICompilerConfiguration extends CompilerConfigurationChangeFlags
 	 * 
 	 * @return a subset of those files that would be returned on getProjectSourceFiles() that have actually *changed*
 	 */
-	public List /* File */getProjectSourceFilesChanged();
+	public List<File> getProjectSourceFilesChanged();
 
 	/**
 	 * @return the classpath to use
@@ -95,7 +95,7 @@ public interface ICompilerConfiguration extends CompilerConfigurationChangeFlags
 	 * 
 	 * @return map from unique resource name to absolute path to source resource (String to File)
 	 */
-	public Map /* String --> java.io.File */getSourcePathResources();
+	public Map<String,File> getSourcePathResources();
 
 	/**
 	 * Returns a set of bit flags indicating what has changed in the configuration since it was previously read. This allows the
@@ -122,7 +122,7 @@ public interface ICompilerConfiguration extends CompilerConfigurationChangeFlags
 	 * @return a list of modified elements that should be checked (can be empty) or null if unknown (and in which case every
 	 *         classpath element will be checked)
 	 */
-	public List getClasspathElementsWithModifiedContents();
+	public List<String> getClasspathElementsWithModifiedContents();
 
 	//
 	// /**
diff --git a/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java b/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java
index caf2f05ea..5de225339 100644
--- a/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java
+++ b/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java
@@ -60,15 +60,15 @@ public final class JavaOptions {
 	public static final String GENERATE = CompilerOptions.GENERATE;
 	public static final String DO_NOT_GENERATE = CompilerOptions.DO_NOT_GENERATE;
 	
-	private static Map defaultOptionsMap;
+	private static Map<String,String> defaultOptionsMap;
 	
 	/**
 	 * @return the java options map with the default settings
 	 */
-	public static Map getDefaultJavaOptions() {
+	public static Map<String,String> getDefaultJavaOptions() {
 		if (defaultOptionsMap != null) return defaultOptionsMap;
 		
-		defaultOptionsMap = new HashMap();
+		defaultOptionsMap = new HashMap<String,String>();
 		defaultOptionsMap.put(COMPLIANCE_LEVEL, VERSION_14);
 		defaultOptionsMap.put(SOURCE_COMPATIBILITY_LEVEL, VERSION_13);
 		defaultOptionsMap.put(PRESERVE_ALL_LOCALS, OPTIMIZE);
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index 531e9b01d..4ab05c968 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -187,7 +187,7 @@ public class AjdeCoreBuildManager {
 		return formattedOptions.toString();
 	}
 
-	private String formatMap(Map options) {
+	private String formatMap(Map<String,? extends Object> options) {
 		if (options == null) {
 			return "<default>";
 		}
@@ -309,7 +309,7 @@ public class AjdeCoreBuildManager {
 		mergeInto(config.getAspectpath(), compilerConfig.getAspectPath());
 
 		// Process the JAVA OPTIONS MAP
-		Map jom = compilerConfig.getJavaOptionsMap();
+		Map<String,String> jom = compilerConfig.getJavaOptionsMap();
 		if (jom != null) {
 			String version = (String) jom.get(CompilerOptions.OPTION_Compliance);
 			if (version != null && !version.equals(CompilerOptions.VERSION_1_4)) {
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java b/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
index a944de996..7fe6a9cb1 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
@@ -42,7 +42,7 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage
 		return this.locationManager.getOutputLocationForResource(resource);
 	}
 
-	public List getAllOutputLocations() {
+	public List<File> getAllOutputLocations() {
 		return this.locationManager.getAllOutputLocations();
 	}
 
@@ -67,7 +67,7 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage
 	 * 
 	 * @return a map from inpath entries (jars/dirs) to handle components.
 	 */
-	public Map getInpathMap() {
+	public Map<File,String> getInpathMap() {
 		return this.locationManager.getInpathMap();
 	}