Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix simple problems detected by intellij #66

Merged
merged 1 commit into from
Dec 11, 2022
Merged

fix simple problems detected by intellij #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 72 additions & 98 deletions ...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions ...plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/checkboxContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand All @@ -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>
Expand Down
7 changes: 3 additions & 4 deletions ...l/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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'}">
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions ...el/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}">
Expand Down
6 changes: 2 additions & 4 deletions ...son/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/jsonContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('.', '_')}"/>

Expand Down Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions ...dson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/multiLevel.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">

Expand Down
6 changes: 2 additions & 4 deletions ...on/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/radioContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand All @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions ...n/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/selectContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down
4 changes: 1 addition & 3 deletions .../plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition/textboxContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>