X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.java
index 97f3c42..1c60d30 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.java
@@ -4,43 +4,39 @@ import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
 public class PHPPreferencesMessages {
 
-  static IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-  static String resourceBundleName;
-  static {
-    resourceBundleName = store.getString(IPreferenceConstants.RESOURCE_BUNDLE);
-  }
-  private static ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName);
-
-  private PHPPreferencesMessages() {
-  }
-
-  public static String getString(String key) {
-    try {
-      return resourceBundle.getString(key);
-    } catch (MissingResourceException e) {
-      return '!' + key + '!';
-    }
-  }
-  public static void setResourceBundle(String newResourceBundle) {
-    resourceBundle = ResourceBundle.getBundle(newResourceBundle);
-  }
-
-  public static String getFormattedString(String key, String arg) {
-    return getFormattedString(key, new String[] { arg });
-  }
-
-  public static String getFormattedString(String key, String[] args) {
-    return MessageFormat.format(getString(key), args);
-  }
-
-  public static ResourceBundle getResourceBundle() {
-    return resourceBundle;
-  }
+	private static final String RESOURCE_BUNDLE = PHPPreferencesMessages.class
+			.getName();
+
+	private static ResourceBundle fgResourceBundle = ResourceBundle
+			.getBundle(RESOURCE_BUNDLE);
+
+	private PHPPreferencesMessages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key
+	 *            the string used to get the bundle value, must not be null
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		return MessageFormat.format(getString(key), new Object[] { arg });
+	}
+
+	/**
+	 * Gets a string from the resource bundle and formats it with arguments
+	 */
+	public static String getFormattedString(String key, Object[] args) {
+		return MessageFormat.format(getString(key), args);
+	}
 }