svn commit: r1776782 - /jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Dec 31 15:52:20 2016
New Revision: 1776782

URL: http://svn.apache.org/viewvc?rev=1776782&view=rev
Log:
Sonar : fix squid:S00115 "Rename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'"

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=1776782&r1=1776781&r2=1776782&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Sat Dec 31 15:52:20 2016
@@ -52,7 +52,7 @@ public final class NewDriver {
     private static final DynamicClassLoader loader;
 
     /** The directory JMeter is installed in. */
-    private static final String jmDir;
+    private static final String JMETER_INSTALLATION_DIRECTORY;
 
     private static final List<Exception> EXCEPTIONS_IN_INIT = new ArrayList<>();
 
@@ -80,7 +80,7 @@ public final class NewDriver {
                 tmpDir = userDir.getAbsoluteFile().getParent();
             }
         }
-        jmDir=tmpDir;
+        JMETER_INSTALLATION_DIRECTORY=tmpDir;
 
         /*
          * Does the system support UNC paths? If so, may need to fix them up
@@ -90,9 +90,9 @@ public final class NewDriver {
 
         // Add standard jar locations to initial classpath
         StringBuilder classpath = new StringBuilder();
-        File[] libDirs = new File[] { new File(jmDir + File.separator + "lib"),// $NON-NLS-1$ $NON-NLS-2$
-                new File(jmDir + File.separator + "lib" + File.separator + "ext"),// $NON-NLS-1$ $NON-NLS-2$
-                new File(jmDir + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
+        File[] libDirs = new File[] { new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib"),// $NON-NLS-1$ $NON-NLS-2$
+                new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "ext"),// $NON-NLS-1$ $NON-NLS-2$
+                new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
         for (File libDir : libDirs) {
             File[] libJars = libDir.listFiles(new FilenameFilter() {
                 @Override
@@ -230,7 +230,7 @@ public final class NewDriver {
      * @return the directory where JMeter is installed.
      */
     public static String getJMeterDir() {
-        return jmDir;
+        return JMETER_INSTALLATION_DIRECTORY;
     }
 
     /**
@@ -245,7 +245,7 @@ public final class NewDriver {
         } else {
             Thread.currentThread().setContextClassLoader(loader);
             if (System.getProperty("log4j.configuration") == null) {// $NON-NLS-1$ $NON-NLS-2$
-                File conf = new File(jmDir, "bin" + File.separator + "log4j.conf");// $NON-NLS-1$ $NON-NLS-2$
+                File conf = new File(JMETER_INSTALLATION_DIRECTORY, "bin" + File.separator + "log4j.conf");// $NON-NLS-1$ $NON-NLS-2$
                 System.setProperty("log4j.configuration", "file:" + conf);
             }
     
@@ -256,7 +256,7 @@ public final class NewDriver {
                 startup.invoke(instance, new Object[] { args });
             } catch(Throwable e){ // NOSONAR We want to log home directory in case of exception
                 e.printStackTrace(); // NOSONAR No logger at this step
-                System.err.println("JMeter home directory was detected as: "+jmDir);
+                System.err.println("JMeter home directory was detected as: "+JMETER_INSTALLATION_DIRECTORY);
             }
         }
     }