Skip to content

Commit 2877bd6

Browse files
authored
FolderComputation implements FullyNamedModelObject (#515)
2 parents d62fbbf + d845e8c commit 2877bd6

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<changelist>999999-SNAPSHOT</changelist>
2323
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
2424
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
25-
<jenkins.baseline>2.504</jenkins.baseline>
26-
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
25+
<jenkins.baseline>2.528</jenkins.baseline>
26+
<!-- TODO switch to LTS version when available -->
27+
<jenkins.version>2.528</jenkins.version>
2728
<no-test-jar>false</no-test-jar>
2829
<hpi.compatibleSinceVersion>5.2</hpi.compatibleSinceVersion>
2930
</properties>
@@ -60,7 +61,7 @@
6061
<dependency>
6162
<groupId>io.jenkins.tools.bom</groupId>
6263
<artifactId>bom-${jenkins.baseline}.x</artifactId>
63-
<version>5015.vb_52d36583443</version>
64+
<version>5506.va_222b_131ec34</version>
6465
<scope>import</scope>
6566
<type>pom</type>
6667
</dependency>

src/main/java/com/cloudbees/hudson/plugins/folder/computed/FolderComputation.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import hudson.model.Result;
4444
import hudson.model.Saveable;
4545
import hudson.model.StreamBuildListener;
46-
import hudson.model.TaskListener;
4746
import hudson.model.TopLevelItem;
4847
import hudson.model.listeners.SaveableListener;
4948
import hudson.model.queue.QueueTaskDispatcher;
@@ -72,6 +71,7 @@
7271
import edu.umd.cs.findbugs.annotations.CheckForNull;
7372
import edu.umd.cs.findbugs.annotations.NonNull;
7473
import edu.umd.cs.findbugs.annotations.Nullable;
74+
import jenkins.model.FullyNamedModelObject;
7575
import jenkins.security.stapler.StaplerNotDispatchable;
7676
import hudson.diagnosis.OldDataMonitor;
7777
import net.jcip.annotations.GuardedBy;
@@ -92,7 +92,7 @@
9292
* A particular “run” of {@link ComputedFolder}.
9393
* @since 4.11-beta-1
9494
*/
95-
public class FolderComputation<I extends TopLevelItem> extends Actionable implements Queue.Executable, Saveable, Loadable {
95+
public class FolderComputation<I extends TopLevelItem> extends Actionable implements FullyNamedModelObject, Queue.Executable, Saveable, Loadable {
9696

9797
/**
9898
* Our logger.
@@ -303,6 +303,11 @@ public String getFullName() {
303303
return folder.getFullName();
304304
}
305305

306+
@Override
307+
public String getFullDisplayName() {
308+
return folder.getFullDisplayName() + " (" + getDisplayName() + ")";
309+
}
310+
306311
/**
307312
* {@inheritDoc}
308313
*/

0 commit comments

Comments
 (0)