Skip to content

Commit b707a36

Browse files
committed
Update the labels
1 parent 77d2fc3 commit b707a36

File tree

11 files changed

+22
-16
lines changed

11 files changed

+22
-16
lines changed

src/main/java/org/jenkinsci/plugins/workflow/log/FileLogStorageFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static final class DescriptorImpl extends LogStorageFactoryDescriptor<Fil
3131
@NonNull
3232
@Override
3333
public String getDisplayName() {
34-
return "File Log Storage Factory";
34+
return "Standard file logger";
3535
}
3636
}
3737
}

src/main/java/org/jenkinsci/plugins/workflow/log/tee/TeeLogStorageFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public class TeeLogStorageFactory implements LogStorageFactory {
2727
@DataBoundConstructor
2828
public TeeLogStorageFactory(LogStorageFactory primary, LogStorageFactory secondary) {
2929
if (primary == null) {
30-
throw new IllegalArgumentException("Primary LogStorageFactory cannot be null");
30+
throw new IllegalArgumentException("Primary Pipeline logger cannot be null");
3131
}
3232
if (secondary == null) {
33-
throw new IllegalArgumentException("Secondary LogStorageFactory cannot be null");
33+
throw new IllegalArgumentException("Secondary Pipeline logger cannot be null");
3434
}
3535
if (primary.getClass() == secondary.getClass()) {
36-
throw new IllegalArgumentException("Primary and secondary LogStorageFactory must be distinct, but both were " + primary.getClass());
36+
throw new IllegalArgumentException("Primary and secondary Pipeline loggers must be distinct, but both were " + primary.getClass());
3737
}
3838
this.primary = primary;
3939
this.secondary = secondary;
@@ -54,13 +54,13 @@ public LogStorage forBuild(@NonNull FlowExecutionOwner b) {
5454
var primaryLogStorage = this.primary.forBuild(b);
5555
if (primaryLogStorage == null) {
5656
return new BrokenLogStorage(new IllegalArgumentException(String.format(
57-
"The primary TeeLogStorageFactory of type %s returned null",
57+
"The primary Pipeline logger of type %s returned null",
5858
primary.getClass().getName())));
5959
}
6060
var secondaryLogStorage = this.secondary.forBuild(b);
6161
if (secondaryLogStorage == null) {
6262
return new BrokenLogStorage(new IllegalArgumentException(String.format(
63-
"The secondary TeeLogStorageFactory of type %s returned null",
63+
"The secondary Pipeline logger of type %s returned null",
6464
primary.getClass().getName())));
6565
}
6666
return new TeeLogStorage(primaryLogStorage, secondaryLogStorage);
@@ -72,7 +72,7 @@ public static final class DescriptorImpl extends LogStorageFactoryDescriptor<Tee
7272
@NonNull
7373
@Override
7474
public String getDisplayName() {
75-
return "Tee Log Storage Factory";
75+
return "Multiple loggers";
7676
}
7777

7878
@Override

src/main/resources/org/jenkinsci/plugins/workflow/log/configuration/PipelineLoggingGlobalConfiguration/config.jelly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
3-
<f:section title="${%Pipeline Logging}">
3+
<f:section title="${%Pipeline logging}">
44
<f:block>
55
${%description(descriptor.getDefaultFactoryDescriptor().getDisplayName(), descriptor.getDefaultFactoryPlugin())}
66
</f:block>
77
<f:dropdownDescriptorSelector
8-
field="factory" title="${%Logging Factory}"
8+
field="factory" title="${%Pipeline logger}"
99
descriptors="${descriptor.getLogStorageFactoryDescriptors()}"
1010
/>
1111
</f:section>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
description=Define the logging factory to use for pipeline logging. Without any explicit configuration, the default logging factory will be "{0}" (from {1}).
1+
description=Specify the Pipeline logger. The default logger is "{0}" (from {1}).

src/main/resources/org/jenkinsci/plugins/workflow/log/tee/TeeLogStorageFactory/config.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
3-
<f:section title="${%Tee Log Storage Factory}">
3+
<f:section title="${%Multiple loggers}">
44
<f:block>
55
${%description}
66
</f:block>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
description=Controls the Tee Log Storage factories order. Primary allows read and writes. Secondary allows writes only.
1+
description=Specify the multiple loggers order.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p>
2+
<b>Primary</b> allows read and writes.
3+
</p>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p>
2+
<b>Secondary</b> allows writes only.
3+
</p>

src/test/java/org/jenkinsci/plugins/workflow/log/configuration/PipelineLoggingGlobalConfigurationJCasCTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void custom_default_factory_ui() throws Throwable {
7777
form.getFirstByXPath("//*[@id='pipeline-logging']/../descendant::select/option[@selected]/text()");
7878
assertThat(selectedText, nullValue());
7979
var description = form.getFirstByXPath("//*[@id='pipeline-logging']/../descendant::div[@colspan]/text()");
80-
assertThat(description.toString(), containsString("My Custom Log"));
80+
assertThat(description.toString(), containsString("My custom log"));
8181
checkNoPipelineLoggingCasCConfiguration();
8282
}
8383

@@ -162,7 +162,7 @@ public static final class DescriptorImpl extends LogStorageFactoryDescriptor<Log
162162
@NonNull
163163
@Override
164164
public String getDisplayName() {
165-
return "My Custom Log";
165+
return "My custom log";
166166
}
167167

168168
@Override

src/test/java/org/jenkinsci/plugins/workflow/log/configuration/PipelineLoggingGlobalConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static final class DescriptorImpl extends LogStorageFactoryDescriptor<Log
133133
@NonNull
134134
@Override
135135
public String getDisplayName() {
136-
return "My Custom Log";
136+
return "My custom log";
137137
}
138138

139139
@Override

0 commit comments

Comments
 (0)