svn commit: r1201086 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

[se...@apache.org]

Author: sebb
Date: Fri Nov 11 22:47:10 2011
New Revision: 1201086

URL: http://svn.apache.org/viewvc?rev=1201086&view=rev
Log:
Javadoc

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1201086&r1=1201085&r2=1201086&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Fri Nov 11 22:47:10 2011
@@ -124,6 +124,10 @@ public class JMeterUtils implements Unit
      * @param file
      *            the file to load
      * @return the Properties from the file
+     * @see #getJMeterProperties()
+     * @see #loadJMeterProperties(String)
+     * @see #initLogging()
+     * @see #initLocale()
      */
     public static Properties getProperties(String file) {
         loadJMeterProperties(file);
@@ -505,9 +509,13 @@ public class JMeterUtils implements Unit
     }
     /**
      * This gets the currently defined appProperties. It can only be called
-     * after the {@link #getProperties(String)} method is called.
+     * after the {@link #getProperties(String)} or {@link #loadJMeterProperties(String)} 
+     * method has been called.
      *
-     * @return The JMeterProperties value
+     * @return The JMeterProperties value, 
+     *         may be null if {@link #loadJMeterProperties(String)} has not been called
+     * @see #getProperties(String)
+     * @see #loadJMeterProperties(String)
      */
     public static Properties getJMeterProperties() {
         return appProperties;