fix simple problems detected by intellij (#66)

jenkinsci · Dec 11, 2022 · 7261bf6 · 7261bf6
1 parent ba59ef7
commit 7261bf6
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 127 deletions.
diff --git a/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java b/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
diff --git a/...plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/checkboxContent.jelly b/...plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/checkboxContent.jelly
@@ -3,10 +3,7 @@
  See the file license.txt for copying permission. 
 -->
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 
   <j:set var="parameterDefinitionInfo" value="${it.parameterDefinitionInfo}"/>
   <j:set var="defaultValueMap" value="${parameterDefinitionInfo.defaultValueMap}"/>
@@ -25,7 +22,7 @@
             <input type="checkbox" name="${it.name}.value" value="${value}" json="${value}"
               checked="${defaultValueMap[value] ? 'true' : null}"/>
             <label class="attach-previous" title="${attrs.tooltip}">
-              <j:out value="${descriptionPropertyValue}"/>
+              <st:out value="${descriptionPropertyValue}"/>
             </label>
           </td>
         </tr>

diff --git a/...l/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/config.jelly b/...l/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/config.jelly
@@ -3,8 +3,7 @@
  See the file license.txt for copying permission. 
 -->
 <?jelly escape-by-default='true'?>
-<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">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <f:entry title="Name" field="name">
     <f:textbox/>
   </f:entry>
@@ -28,7 +27,7 @@
 
   <f:radioBlock name="parameterGroup" title="Basic Parameter Types" value="0"
     checked="${parameterType eq 'basic'}">
-    <f:entry name="type" title="Parameter Type" field="type">
+    <f:entry title="Parameter Type" field="type">
       <select name="type">
         <j:choose>
           <j:when test="${instance.type eq 'PT_SINGLE_SELECT'}">
@@ -243,7 +242,7 @@
   </f:radioBlock>
   <f:radioBlock name="parameterGroup" title="Multi-level Parameter Types" value="1"
     checked="${parameterType eq 'multilevel'}">
-    <f:entry name="type" title="Parameter Type" field="type">
+    <f:entry title="Parameter Type" field="type">
       <select name="type">
         <option value="PT_MULTI_LEVEL_SINGLE_SELECT"
           selected="${instance.type eq 'PT_MULTI_LEVEL_SINGLE_SELECT' ? 'true' : null}">Multi-Level

diff --git a/...el/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/index.jelly b/...el/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/index.jelly
@@ -3,9 +3,7 @@
  See the file license.txt for copying permission. 
 -->
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
 
   <j:choose>
     <j:when test="${it.hasUnapprovedScripts()}">

diff --git a/...son/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/jsonContent.jelly b/...son/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/jsonContent.jelly
@@ -3,9 +3,7 @@
  See the file license.txt for copying permission. 
 -->
 <?jelly escape-by-default='fala'?>
-<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:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 
   <j:set var="normalizedParameterName" value="${it.name.replace('.', '_')}"/>
 
@@ -63,7 +61,7 @@
 
     <j:if test="${not empty jsonEditorScript}">
       (function(editor, valueInput) {
-      <j:out value="${jsonEditorScript}"/>
+      <st:out value="${jsonEditorScript}"/>
       })(editor_${normalizedParameterName}, document.getElementById("editor_${it.name}_value"));
     </j:if>
   </script>

diff --git a/...dson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/multiLevel.jelly b/...dson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/multiLevel.jelly
@@ -1,7 +1,5 @@
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core">
 
   <script type="text/javascript">
 

diff --git a/...on/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/radioContent.jelly b/...on/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/radioContent.jelly
@@ -3,9 +3,7 @@
  See the file license.txt for copying permission. 
 -->
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 
   <j:set var="parameterDefinitionInfo" value="${it.parameterDefinitionInfo}"/>
   <j:set var="defaultValueMap" value="${parameterDefinitionInfo.defaultValueMap}"/>
@@ -24,7 +22,7 @@
             <input type="radio" name="${it.name}.value" value="${value}"
               checked="${defaultValueMap[value] eq true?'true':null}"/>
             <label class="attach-previous">
-              <j:out value="${descriptionPropertyValue}"/>
+              <st:out value="${descriptionPropertyValue}"/>
             </label>
           </td>
         </tr>

diff --git a/...n/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/selectContent.jelly b/...n/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/selectContent.jelly
@@ -4,9 +4,7 @@
 -->
 
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core">
 
   <j:set var="parameterDefinitionInfo" value="${it.parameterDefinitionInfo}"/>
   <j:set var="defaultValueMap" value="${parameterDefinitionInfo.defaultValueMap}"/>

diff --git a/.../plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/textboxContent.jelly b/.../plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/textboxContent.jelly
@@ -4,8 +4,6 @@
 -->
 
 <?jelly escape-by-default='true'?>
-<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:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <f:textbox name="value" value="${it.effectiveDefaultValue}"/>
 </j:jelly>