Bug 82370 Inline Policy.localize to enable NLS tooling

2 files changed, 14 insertions, 8 deletions

diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
index 7caa88bba..b586b75c9 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
@@ -73,8 +73,7 @@ public class CVSSSH2Plugin extends AbstractUIPlugin {
 	}
 	
 	public void start(BundleContext context) throws Exception {
-		super.start(context);	
-		Policy.localize("org.eclipse.team.internal.ccvs.ssh2.messages"); //$NON-NLS-1$
+		super.start(context);
 		initializeDefaultPreferences();
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
index 93fcbd228..6139862fa 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
@@ -19,13 +19,20 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 
 public class Policy {
-	protected static ResourceBundle bundle = null;
+	private static ResourceBundle bundle = null;
+	private static final String bundleName = "org.eclipse.team.internal.ccvs.ssh2.messages"; //$NON-NLS-1$
 
-	/**
-	 * Creates a NLS catalog for the given locale.
+	/*
+	 * Returns a resource bundle, creating one if it none is available. 
 	 */
-	public static void localize(String bundleName) {
-		bundle = ResourceBundle.getBundle(bundleName);
+	private static ResourceBundle getResourceBundle() {
+		// thread safety
+		ResourceBundle tmpBundle = bundle;
+		if (tmpBundle != null)
+			return tmpBundle;
+		// always create a new classloader to be passed in 
+		// in order to prevent ResourceBundle caching
+		return bundle = ResourceBundle.getBundle(bundleName);
 	}
 	
 	/**
@@ -34,7 +41,7 @@ public class Policy {
 	 */
 	public static String bind(String key) {
 		try {
-			return bundle.getString(key);
+			return getResourceBundle().getString(key);
 		} catch (MissingResourceException e) {
 			return key;
 		} catch (NullPointerException e) {