Index: PluginDescriptor.java
===================================================================
RCS file: /home/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginDescriptor.java,v
retrieving revision 1.32
diff -u -r1.32 PluginDescriptor.java
--- PluginDescriptor.java	23 Jul 2002 13:54:34 -0000	1.32
+++ PluginDescriptor.java	1 Aug 2002 14:24:02 -0000
@@ -45,6 +45,8 @@
 	// Places to look for library files 
 	private static String[] WS_JAR_VARIANTS = buildWSVariants();
 	private static String[] OS_JAR_VARIANTS = buildOSVariants();
+	// Next static var is not really needed. 
+	// At best, for performance reasons, one could create a hashtable of nl_jar_variants, indexed by locale.
 	private static String[] NL_JAR_VARIANTS = buildNLVariants();
 	private static String[] JAR_VARIANTS = buildVanillaVariants();
 
@@ -65,7 +67,12 @@
 	return (String[])result.toArray(new String[result.size()]);
 }
 private static String[] buildNLVariants() {
-	String nl = BootLoader.getNL();	
+	return buildNLVariants(BootLoader.getNL());
+}
+private static String[] buildNLVariants(String nl) {	
+	// Theoretically, we could create a hash table of all the nl variants
+	// built, indexed by the nl string. This would avoid extra computation 
+	// and memory allocation. 
 	ArrayList result = new ArrayList();
 	IPath base = new Path("nl"); //$NON-NLS-1$
 	
@@ -909,6 +916,7 @@
 
 private URL findNL(URL install, IPath path, Map override) {
 	String nl = null;
+
 	if (override != null)
 		try {
 			// check for override
@@ -923,8 +931,9 @@
 		return null;
 
 	URL result = null;
-	for (int i=0; i<NL_JAR_VARIANTS.length; i++) {
-		IPath filePath = new Path(NL_JAR_VARIANTS[i]).append(path);
+	String[] nl_jar_variants = buildNLVariants(nl);
+	for (int i=0; i<nl_jar_variants.length; i++) {
+		IPath filePath = new Path(nl_jar_variants[i]).append(path);
 		result = findInPlugin(install, filePath);
 		if (result != null)
 			return result;
@@ -980,4 +989,4 @@
 	}
 	return null;
 }
-}
+}
\ No newline at end of file