[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2060] trunk/org.rubypeople.rdt.launching/src/org/ rubypeople/rdt/launching/RubyRuntime.java

[<caw...@us...>]

Revision: 2060
          http://svn.sourceforge.net/rubyeclipse/?rev=2060&view=rev
Author:   cawilliams
Date:     2007-02-28 05:59:28 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
clean up type safety warnings

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java	2007-02-28 13:54:01 UTC (rev 2059)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java	2007-02-28 13:59:28 UTC (rev 2060)
@@ -130,8 +130,8 @@
 	 * cycles in project dependencies when resolving loadpath container entries.
 	 * Counters used to know when entering/exiting to clear cache
 	 */
-	private static ThreadLocal fgProjects = new ThreadLocal(); // Lists
-	private static ThreadLocal fgEntryCount = new ThreadLocal(); // Integers
+	private static ThreadLocal<List<IRubyProject>> fgProjects = new ThreadLocal<List<IRubyProject>>(); // Lists
+	private static ThreadLocal<Integer> fgEntryCount = new ThreadLocal<Integer>(); // Integers
 	
 	/**
 	 * Default loadpath provider.
@@ -141,7 +141,7 @@
 	/**
 	 * Path providers keyed by id
 	 */
-	private static Map fgPathProviders = null;
+	private static Map<String, RuntimeLoadpathProvider> fgPathProviders = null;
 	
     /**
      *  Set of IDs of VMs contributed via vmInstalls extension point.
@@ -152,9 +152,9 @@
 	 * Resolvers keyed by variable name, container id,
 	 * and runtime loadpath entry id.
 	 */
-	private static Map fgVariableResolvers = null;
-	private static Map fgContainerResolvers = null;
-	private static Map fgRuntimeLoadpathEntryResolvers = null;
+	private static Map<String, RuntimeLoadpathEntryResolver> fgVariableResolvers = null;
+	private static Map<String, RuntimeLoadpathEntryResolver> fgContainerResolvers = null;
+	private static Map<String, RuntimeLoadpathEntryResolver> fgRuntimeLoadpathEntryResolvers = null;
     
 	protected RubyRuntime() {
 		super();
@@ -780,12 +780,11 @@
 			IRuntimeLoadpathEntryResolver2 resolver = getVariableResolver(rubyVmPath.segment(0));
 			if (resolver != null) {
 				return resolver.resolveVMInstall(entry);
-			} else {
-				resolver = getContainerResolver(rubyVmPath.segment(0));
-				if (resolver != null) {
-					return resolver.resolveVMInstall(entry);
-				}
 			}
+			resolver = getContainerResolver(rubyVmPath.segment(0));
+			if (resolver != null) {
+				return resolver.resolveVMInstall(entry);
+			}
 		}
 		
 		return getDefaultVMInstall();
@@ -873,9 +872,9 @@
 	private static void initializeResolvers() {
 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.PLUGIN_ID, EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRY_RESOLVERS);
 		IConfigurationElement[] extensions = point.getConfigurationElements();
-		fgVariableResolvers = new HashMap(extensions.length);
-		fgContainerResolvers = new HashMap(extensions.length);
-		fgRuntimeLoadpathEntryResolvers = new HashMap(extensions.length);
+		fgVariableResolvers = new HashMap<String, RuntimeLoadpathEntryResolver>(extensions.length);
+		fgContainerResolvers = new HashMap<String, RuntimeLoadpathEntryResolver>(extensions.length);
+		fgRuntimeLoadpathEntryResolvers = new HashMap<String, RuntimeLoadpathEntryResolver>(extensions.length);
 		for (int i = 0; i < extensions.length; i++) {
 			RuntimeLoadpathEntryResolver res = new RuntimeLoadpathEntryResolver(extensions[i]);
 			String variable = res.getVariableName();
@@ -1072,7 +1071,7 @@
 	private static void initializeProviders() {
 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.PLUGIN_ID, EXTENSION_POINT_RUNTIME_CLASSPATH_PROVIDERS);
 		IConfigurationElement[] extensions = point.getConfigurationElements();
-		fgPathProviders = new HashMap(extensions.length);
+		fgPathProviders = new HashMap<String, RuntimeLoadpathProvider>(extensions.length);
 		for (int i = 0; i < extensions.length; i++) {
 			RuntimeLoadpathProvider res = new RuntimeLoadpathProvider(extensions[i]);
 			fgPathProviders.put(res.getIdentifier(), res);
@@ -1259,7 +1258,7 @@
 	 */
 	public static IRuntimeLoadpathEntry[] computeUnresolvedRuntimeLoadpath(IRubyProject project) throws CoreException {
 		ILoadpathEntry[] entries = project.getRawLoadpath();
-		List loadpathEntries = new ArrayList(3);
+		List<IRuntimeLoadpathEntry> loadpathEntries = new ArrayList<IRuntimeLoadpathEntry>(3);
 		for (int i = 0; i < entries.length; i++) {
 			ILoadpathEntry entry = entries[i];
 			switch (entry.getEntryKind()) {
@@ -1424,11 +1423,11 @@
 				property = IRuntimeLoadpathEntry.BOOTSTRAP_CLASSES;
 				break;
 		}			
-		List resolved = new ArrayList(cpes.length);
-		List projects = (List) fgProjects.get();
+		List<IRuntimeLoadpathEntry> resolved = new ArrayList<IRuntimeLoadpathEntry>(cpes.length);
+		List<IRubyProject> projects = (List<IRubyProject>) fgProjects.get();
 		Integer count = (Integer) fgEntryCount.get();
 		if (projects == null) {
-			projects = new ArrayList();
+			projects = new ArrayList<IRubyProject>();
 			fgProjects.set(projects);
 			count = new Integer(0);
 		}
@@ -1440,11 +1439,11 @@
 				ILoadpathEntry cpe = cpes[i];
 				if (cpe.getEntryKind() == ILoadpathEntry.CPE_PROJECT) {
 					IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(cpe.getPath().segment(0));
-					IRubyProject jp = RubyCore.create(p);
-					if (!projects.contains(jp)) {
-						projects.add(jp);
-						IRuntimeLoadpathEntry loadpath = newDefaultProjectLoadpathEntry(jp);
-						IRuntimeLoadpathEntry[] entries = resolveRuntimeLoadpathEntry(loadpath, jp);
+					IRubyProject rp = RubyCore.create(p);
+					if (!projects.contains(rp)) {
+						projects.add(rp);
+						IRuntimeLoadpathEntry loadpath = newDefaultProjectLoadpathEntry(rp);
+						IRuntimeLoadpathEntry[] entries = resolveRuntimeLoadpathEntry(loadpath, rp);
 						for (int j = 0; j < entries.length; j++) {
 							IRuntimeLoadpathEntry e = entries[j];
 							if (!resolved.contains(e)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.