Author: sebb
Date: Tue May 29 12:24:26 2007
New Revision: 542630
URL: http://svn.apache.org/viewvc?view=rev&rev=542630
Log:
Add NON-NLS markers.
Add getJMeterBinDir() method.
Fix findFile() to take account of separators.
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java?view=diff&rev=542630&r1=542629&r2=542630
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
Tue May 29 12:24:26 2007
@@ -254,7 +254,7 @@
}
public static String[] getSearchPaths() {
- String p = JMeterUtils.getPropDefault("search_paths", null);
+ String p = JMeterUtils.getPropDefault("search_paths", null); //
$NON-NLS-1$
String[] result = new String[1];
if (p != null) {
@@ -282,8 +282,6 @@
* Changes the current locale: re-reads resource strings and notifies
* listeners.
*
- * author Oliver Rossmueller
- *
* @param loc -
* new locale
*/
@@ -319,24 +317,16 @@
/**
* Gets the current locale.
*
- * author Oliver Rossmueller
- *
* @return current locale
*/
public static Locale getLocale() {
return locale;
}
- /**
- * author Oliver Rossmueller
- */
public static void addLocaleChangeListener(LocaleChangeListener
listener) {
localeChangeListeners.add(listener);
}
- /**
- * author Oliver Rossmueller
- */
public static void removeLocaleChangeListener(LocaleChangeListener
listener) {
localeChangeListeners.remove(listener);
}
@@ -344,7 +334,6 @@
/**
* Notify all listeners interested in locale changes.
*
- * author Oliver Rossmueller
*/
private static void notifyLocaleChangeListeners() {
LocaleChangeEvent event = new
LocaleChangeEvent(JMeterUtils.class, locale);
@@ -900,7 +889,7 @@
* @param errorMsg - the error message.
*/
public static void reportErrorToUser(String errorMsg) {
- reportErrorToUser(errorMsg,
JMeterUtils.getResString("error_title"));
+ reportErrorToUser(errorMsg,
JMeterUtils.getResString("error_title")); // $NON-NLS-1$
}
/**
@@ -1011,16 +1000,31 @@
return retVal.toString();
}
- // End Method
+ /**
+ * Get the JMeter home directory - does not include the trailing
separator.
+ *
+ * @return the home directory
+ */
public static String getJMeterHome() {
return jmDir;
}
+ /**
+ * Get the JMeter bin directory - does not include the trailing
separator.
+ *
+ * @return the bin directory
+ */
+ public static String getJMeterBinDir() {
+ return jmBin;
+ }
+
public static void setJMeterHome(String home) {
jmDir = home;
+ jmBin = jmDir + File.separator + "bin"; // $NON-NLS-1$
}
- private static String jmDir;
+ private static String jmDir; // JMeter Home directory (excludes
trailing separator)
+ private static String jmBin; // JMeter bin directory (excludes trailing
separator)
/**
@@ -1082,7 +1086,7 @@
public static File findFile(String fileName){
File f =new File(fileName);
if (!f.exists()){
- f=new
File(getJMeterHome()+File.separator+"bin"+fileName); // $NON-NLS-1$
+ f=new File(getJMeterBinDir(),fileName);
}
return f;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
