From 01dd347fa0ec20129508e35d8526c3b0681f18f0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 9 Mar 2011 17:26:21 -0800 Subject: [PATCH] Making pronoun customizable --- .../src/main/java/hudson/matrix/MatrixConfiguration.java | 3 ++- core/src/main/java/hudson/model/AbstractItem.java | 9 ++++++++- core/src/main/java/hudson/model/AbstractProject.java | 5 ++++- core/src/main/java/hudson/model/ExternalJob.java | 3 ++- core/src/main/java/hudson/model/Job.java | 4 +++- core/src/main/java/hudson/slaves/SlaveComputer.java | 1 + .../main/java/hudson/util/AlternativeUiTextProvider.java | 4 +++- maven-plugin/src/main/java/hudson/maven/MavenModule.java | 3 ++- 8 files changed, 25 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index f9409ddce7..f80a4ac595 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -24,6 +24,7 @@ package hudson.matrix; import hudson.Util; +import hudson.util.AlternativeUiTextProvider; import hudson.util.DescribableList; import hudson.model.AbstractBuild; import hudson.model.Cause; @@ -200,7 +201,7 @@ public class MatrixConfiguration extends Project @Override public String getPronoun() { - return Messages.MatrixConfiguration_Pronoun(); + return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MatrixConfiguration_Pronoun()); } @Override diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 4208b84765..df287c0524 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -36,6 +36,8 @@ import hudson.model.listeners.SaveableListener; import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.security.ACL; +import hudson.util.AlternativeUiTextProvider; +import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.AtomicFileWriter; import hudson.util.IOException2; import org.apache.tools.ant.taskdefs.Copy; @@ -104,7 +106,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet * {@link Item}. Must start with a capital letter. */ public String getPronoun() { - return Messages.AbstractItem_Pronoun(); + return AlternativeUiTextProvider.get(PRONOUN, this, Messages.AbstractItem_Pronoun()); } @Exported @@ -500,4 +502,9 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet throw new CmdLineException(null,Messages.AbstractItem_NoSuchJobExists(name,AbstractProject.findNearest(name).getFullName())); return item; } + + /** + * Replaceable pronoun of that points to a job. Defaults to "Job"/"Project" depending on the context. + */ + public static final Message PRONOUN = new Message(); } diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index ad494bff6e..a4456a7888 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -353,7 +353,7 @@ public abstract class AbstractProject

,R extends A */ @Override public String getPronoun() { - return Messages.AbstractProject_Pronoun(); + return AlternativeUiTextProvider.get(PRONOUN, this,Messages.AbstractProject_Pronoun()); } /** @@ -1920,6 +1920,9 @@ public abstract class AbstractProject

,R extends A */ public static final Permission ABORT = BUILD; + /** + * Replaceable "Build Now" text. + */ public static final Message BUILD_NOW_TEXT = new Message(); /** diff --git a/core/src/main/java/hudson/model/ExternalJob.java b/core/src/main/java/hudson/model/ExternalJob.java index 6953bdfa22..fcc939eb56 100644 --- a/core/src/main/java/hudson/model/ExternalJob.java +++ b/core/src/main/java/hudson/model/ExternalJob.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.model.RunMap.Constructor; import hudson.Extension; +import hudson.util.AlternativeUiTextProvider; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -110,7 +111,7 @@ public class ExternalJob extends ViewJob implements Top @Override public String getPronoun() { - return Messages.ExternalJob_Pronoun(); + return AlternativeUiTextProvider.get(PRONOUN, this, Messages.ExternalJob_Pronoun()); } public static final class DescriptorImpl extends TopLevelItemDescriptor { diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 8991cf7c25..89fe3266f1 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -42,6 +42,8 @@ import hudson.search.SearchItem; import hudson.search.SearchItems; import hudson.security.ACL; import hudson.tasks.LogRotator; +import hudson.util.AlternativeUiTextProvider; +import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.ChartUtil; import hudson.util.ColorPalette; import hudson.util.CopyOnWriteList; @@ -242,7 +244,7 @@ public abstract class Job, RunT extends Run * Context object type. Use {@link Void} to indicate that there's no context. */ - public static class Message { + public static final class Message { // decided not to retain T as Class so that we can have Message>, for example. /** diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 59de43e742..dc1cf24bc4 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -44,6 +44,7 @@ import hudson.model.Saveable; import hudson.tasks.LogRotator; import hudson.tasks.Publisher; import hudson.tasks.Maven.MavenInstallation; +import hudson.util.AlternativeUiTextProvider; import hudson.util.DescribableList; import org.apache.maven.project.MavenProject; import org.kohsuke.stapler.StaplerRequest; @@ -314,7 +315,7 @@ public final class MavenModule extends AbstractMavenProject