Fix variable names

abhargav-mw · abhargav-mw · commit ded8cd0dcdae · 2021-01-04T19:00:01.000+05:30
diff --git a/src/main/java/com/mathworks/ci/MatlabInstallation.java b/src/main/java/com/mathworks/ci/MatlabInstallation.java
@@ -70,9 +70,9 @@ public static boolean isEmpty() {
     }
 
     public static MatlabInstallation getInstallation(String name) {
-        for (MatlabInstallation _inst : getAll()) {
-            if (name.equals(_inst.getName())) {
-                return _inst;
+        for (MatlabInstallation inst : getAll()) {
+            if (name.equals(inst.getName())) {
+                return inst;
             }
         }
         return null;
diff --git a/src/main/java/com/mathworks/ci/MatlabInstallationAxis.java b/src/main/java/com/mathworks/ci/MatlabInstallationAxis.java
@@ -45,11 +45,11 @@ public String getDisplayName() {
 
         @Override
         public boolean isInstantiable() {
-            return !checkMatlabInstallationEmpty();
+            return !isMatlabInstallationEmpty();
         }
 
-        public boolean checkUseMATLABVersion(Object it) {
-            return MatlabItemListener.getMATLABBuildWrapperCheckForPrj(((MatrixProject) it).getFullName()) && !checkMatlabInstallationEmpty();
+        public boolean checkUseMatlabVersion(Object it) {
+            return MatlabItemListener.getMatlabBuildWrapperCheckForPrj(((MatrixProject) it).getFullName()) && !isMatlabInstallationEmpty();
         }
 
         public MatlabInstallation[] getInstallations () {
@@ -60,7 +60,7 @@ public String getUseMatlabWarning() {
             return useMatlabWarning;
         }
 
-        public boolean checkMatlabInstallationEmpty() {
+        public boolean isMatlabInstallationEmpty() {
             return MatlabInstallation.isEmpty();
         }
 
diff --git a/src/main/java/com/mathworks/ci/MatlabItemListener.java b/src/main/java/com/mathworks/ci/MatlabItemListener.java
@@ -23,8 +23,8 @@
 
 @Extension
 public final class MatlabItemListener extends ItemListener {
-    private static final Map<String, Boolean> prjCheckMATLABAxis = new HashMap<>();
-    private static final Map<String, Boolean> prjCheckMATLABBuildWrapper = new HashMap<>();
+    private static final Map<String, Boolean> prjCheckMatlabAxis = new HashMap<>();
+    private static final Map<String, Boolean> prjCheckMatlabBuildWrapper = new HashMap<>();
 
     @Override
     public void onLoaded(){
@@ -52,40 +52,40 @@ private void checkSingleItem(Item item){
         check((MatrixProject) item);
     }
 
-    private void check(MatrixProject _prj) {
-        checkForAxis(_prj);
-        checkForBuildWrapper(_prj);
+    private void check(MatrixProject prj) {
+        checkForAxis(prj);
+        checkForBuildWrapper(prj);
     }
 
-    private void checkForAxis(MatrixProject _prj) {
+    private void checkForAxis(MatrixProject prj) {
         boolean checkForAxis = false;
-        Collection<MatrixConfiguration> conf = _prj.getActiveConfigurations();
-        for(MatrixConfiguration _conf : conf){
-            String a = _conf.getCombination().get(Message.getValue("Axis.matlab.key"));
-            if (a != null) {
+        Collection<MatrixConfiguration> configurations = prj.getActiveConfigurations();
+        for(MatrixConfiguration conf : configurations){
+            String matlabAxisValue = conf.getCombination().get(Message.getValue("Axis.matlab.key"));
+            if (matlabAxisValue != null) {
                 checkForAxis = true;
                 break;
             }
         }
-        prjCheckMATLABAxis.put(_prj.getFullName(), checkForAxis);
+        prjCheckMatlabAxis.put(prj.getFullName(), checkForAxis);
     }
 
-    private void checkForBuildWrapper(MatrixProject _prj) {
+    private void checkForBuildWrapper(MatrixProject prj) {
         boolean checkForBuildWrapper = false;
-        for(Object _bWrapper : _prj.getBuildWrappersList().toArray()) {
-            if(_bWrapper instanceof UseMatlabVersionBuildWrapper){
-                checkForBuildWrapper = ((UseMatlabVersionBuildWrapper) _bWrapper).getMatlabInstallationName() != null || ((UseMatlabVersionBuildWrapper) _bWrapper).getMatlabRootFolder() != null;
+        for(Object bWrapper : prj.getBuildWrappersList().toArray()) {
+            if(bWrapper instanceof UseMatlabVersionBuildWrapper){
+                checkForBuildWrapper = ((UseMatlabVersionBuildWrapper) bWrapper).getMatlabInstallationName() != null;
                 break;
             }
         }
-        prjCheckMATLABBuildWrapper.put(_prj.getFullName(), checkForBuildWrapper);
+        prjCheckMatlabBuildWrapper.put(prj.getFullName(), checkForBuildWrapper);
     }
 
-    public static boolean getMATLABAxisCheckForPrj(String prjName) {
-        return prjCheckMATLABAxis.get(prjName) != null && prjCheckMATLABAxis.get(prjName);
+    public static boolean getMatlabAxisCheckForPrj(String prjName) {
+        return prjCheckMatlabAxis.get(prjName) != null && prjCheckMatlabAxis.get(prjName);
     }
 
-    public static boolean getMATLABBuildWrapperCheckForPrj(String prjName) {
-        return prjCheckMATLABBuildWrapper.get(prjName) != null && prjCheckMATLABBuildWrapper.get(prjName);
+    public static boolean getMatlabBuildWrapperCheckForPrj(String prjName) {
+        return prjCheckMatlabBuildWrapper.get(prjName) != null && prjCheckMatlabBuildWrapper.get(prjName);
     }
 }
diff --git a/src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java b/src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java
@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.Function;
 
 import hudson.matrix.MatrixProject;
@@ -126,7 +125,7 @@ public boolean checkAxisAdded() {
             if (!isMatrix) {
                 return false;
             }
-            return MatlabItemListener.getMATLABAxisCheckForPrj(project.getFullName()) && !MatlabInstallation.isEmpty();
+            return MatlabItemListener.getMatlabAxisCheckForPrj(project.getFullName()) && !MatlabInstallation.isEmpty();
         }
 
         public String getMatlabAxisWarning() {
diff --git a/src/main/resources/com/mathworks/ci/MatlabInstallationAxis/config.jelly b/src/main/resources/com/mathworks/ci/MatlabInstallationAxis/config.jelly
@@ -2,15 +2,15 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
 
     <j:choose>
-        <j:when test="${descriptor.checkUseMATLABVersion(it)}">
+        <j:when test="${descriptor.checkUseMatlabVersion(it)}">
             <f:block>
                 <div class = "warning">${descriptor.useMatlabWarning}</div>
             </f:block>
         </j:when>
     </j:choose>
 
     <j:choose>
-        <j:when test="${descriptor.checkMatlabInstallationEmpty()}">
+        <j:when test="${descriptor.isMatlabInstallationEmpty()}">
             <f:block>
                 <div class = "error">${descriptor.noInstallationError}</div>
             </f:block>
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -13,7 +13,7 @@ builder.matlab.automatictestoption.display.name = Automatic
 builder.matlab.customcommandoption.display.name = Custom
 Releaseinfo.matlab.version.not.found.error = Error finding MATLAB release for given MATLAB root. Verify MATLAB root path.
 matlab.not.found.error = Unable to launch MATLAB from the specified location. Verify the path to MATLAB root folder.
-matlab.not.found.error.for.node = Unable to launch MATLAB %s on the node %s. Verify global tool configuration for the specified node.
+matlab.not.found.error.for.node = Unable to launch MATLAB '%s' on the node '%s'. Verify global tool configuration for the specified node.
 Builder.matlab.modelcoverage.support.warning = To generate a Cobertura model coverage report, use MATLAB R2018b or a newer release.
 Builder.matlab.exportstmresults.support.warning = To export Simulink Test Manager results, use MATLAB R2019a or a newer release.
 Builder.matlab.runner.script.target.file.linux.name = run_matlab_command.sh

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ public static boolean isEmpty() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public static MatlabInstallation getInstallation(String name) {`
`73`		`- for (MatlabInstallation _inst : getAll()) {`
`74`		`- if (name.equals(_inst.getName())) {`
`75`		`- return _inst;`
	`73`	`+ for (MatlabInstallation inst : getAll()) {`
	`74`	`+ if (name.equals(inst.getName())) {`
	`75`	`+ return inst;`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public String getDisplayName() {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public boolean isInstantiable() {`
`48`		`- return !checkMatlabInstallationEmpty();`
	`48`	`+ return !isMatlabInstallationEmpty();`
`49`	`49`	`}`
`50`	`50`
`51`		`- public boolean checkUseMATLABVersion(Object it) {`
`52`		`- return MatlabItemListener.getMATLABBuildWrapperCheckForPrj(((MatrixProject) it).getFullName()) && !checkMatlabInstallationEmpty();`
	`51`	`+ public boolean checkUseMatlabVersion(Object it) {`
	`52`	`+ return MatlabItemListener.getMatlabBuildWrapperCheckForPrj(((MatrixProject) it).getFullName()) && !isMatlabInstallationEmpty();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public MatlabInstallation[] getInstallations () {`
`@@ -60,7 +60,7 @@ public String getUseMatlabWarning() {`
`60`	`60`	`return useMatlabWarning;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public boolean checkMatlabInstallationEmpty() {`
	`63`	`+ public boolean isMatlabInstallationEmpty() {`
`64`	`64`	`return MatlabInstallation.isEmpty();`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`import java.util.ArrayList;`
`14`	`14`	`import java.util.Arrays;`
`15`	`15`	`import java.util.List;`
`16`		`-import java.util.Objects;`
`17`	`16`	`import java.util.function.Function;`
`18`	`17`
`19`	`18`	`import hudson.matrix.MatrixProject;`
`@@ -126,7 +125,7 @@ public boolean checkAxisAdded() {`
`126`	`125`	`if (!isMatrix) {`
`127`	`126`	`return false;`
`128`	`127`	`}`
`129`		`- return MatlabItemListener.getMATLABAxisCheckForPrj(project.getFullName()) && !MatlabInstallation.isEmpty();`
	`128`	`+ return MatlabItemListener.getMatlabAxisCheckForPrj(project.getFullName()) && !MatlabInstallation.isEmpty();`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`public String getMatlabAxisWarning() {`