From c27f8733409bc20daf4fbd092db3647c748db738 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 17 Jan 2008 06:31:05 +0000 Subject: [PATCH] improved the formatting git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6721 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Util.java | 13 +++++++++++++ .../java/hudson/node_monitors/DiskSpaceMonitor.java | 3 ++- core/src/main/java/hudson/util/ClockDifference.java | 6 +++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 975e25c947..bcc9f52838 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1,12 +1,14 @@ package hudson; import hudson.model.TaskListener; +import hudson.model.Hudson; import hudson.util.IOException2; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.taskdefs.Chmod; import org.apache.tools.ant.taskdefs.Copy; +import org.kohsuke.stapler.Stapler; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -610,6 +612,17 @@ public class Util { return createFileSet(baseDir,includes,null); } + /** + * Wraps with the error icon and the CSS class to render error message. + * @since 1.173 + */ + public static String wrapToErrorSpan(String s) { + s = ""+s+""; + return s; + } + public static final SimpleDateFormat XS_DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); // Note: RFC822 dates must not be localized! diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java index 897de8a91f..5610dd244e 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -1,6 +1,7 @@ package hudson.node_monitors; import hudson.FilePath; +import hudson.Util; import hudson.FilePath.FileCallable; import hudson.model.Computer; import hudson.model.Descriptor; @@ -35,7 +36,7 @@ public class DiskSpaceMonitor extends NodeMonitor { space/=1024L; // convert to MB if(space<1024) { // less than a GB - return ""+new BigDecimal(space).scaleByPowerOfTen(-3).toPlainString()+"GB"; + return Util.wrapToErrorSpan(new BigDecimal(space).scaleByPowerOfTen(-3).toPlainString()); } return space/1024+"GB"; diff --git a/core/src/main/java/hudson/util/ClockDifference.java b/core/src/main/java/hudson/util/ClockDifference.java index 3fda6cb011..c547fcf4a4 100644 --- a/core/src/main/java/hudson/util/ClockDifference.java +++ b/core/src/main/java/hudson/util/ClockDifference.java @@ -2,9 +2,12 @@ package hudson.util; import hudson.Util; import hudson.model.Node; +import hudson.model.Hudson; import java.io.IOException; +import org.kohsuke.stapler.Stapler; + /** * Represents a clock difference. Immutable. * @@ -57,7 +60,8 @@ public final class ClockDifference { public String toHtml() { String s = toString(); - if(isDangerous()) s = ""+s+""; + if(isDangerous()) + s = Util.wrapToErrorSpan(s); return s; }