Skip to content
This repository has been archived by the owner on Apr 6, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-12424] Use messages from base class.
  • Loading branch information
uhafner committed May 8, 2012
1 parent 7db20dd commit a530b8e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 83 deletions.
59 changes: 5 additions & 54 deletions src/main/java/hudson/plugins/warnings/WarningsResult.java
Expand Up @@ -5,7 +5,6 @@
import hudson.plugins.analysis.core.ParserResult;
import hudson.plugins.analysis.core.ResultAction;
import hudson.plugins.analysis.core.BuildResult;
import hudson.plugins.analysis.util.HtmlPrinter;
import hudson.plugins.warnings.parser.ParserRegistry;
import hudson.plugins.warnings.parser.Warning;

Expand Down Expand Up @@ -70,65 +69,17 @@ public String getHeader() {

@Override
public String getSummary() {
HtmlPrinter summary = new HtmlPrinter();
summary.append(ParserRegistry.getParser(group).getLinkName());
summary.append(": ");

int warnings = getNumberOfAnnotations();
if (warnings > 0) {
summary.append(summary.link(getUrl(), getSummaryText(warnings)));
}
else {
summary.append(getSummaryText(warnings));
}
summary.append(".");
return summary.toString();
}

private String getSummaryText(final int warnings) {
if (warnings == 1) {
return Messages.Warnings_ResultAction_OneWarning();
}
else {
return Messages.Warnings_ResultAction_MultipleWarnings(warnings);
}
}

private String getUrl() {
return WarningsDescriptor.getResultUrl(group);
return ParserRegistry.getParser(group).getLinkName() + ": "
+ createDefaultSummary(getUrl(), getNumberOfAnnotations(), getNumberOfModules());
}

@Override
protected String createDeltaMessage() {
HtmlPrinter summary = new HtmlPrinter();
if (getNumberOfNewWarnings() > 0) {
summary.append(summary.item(
summary.link(getUrl() + "/new", createNewText())));
}
if (getNumberOfFixedWarnings() > 0) {
summary.append(summary.item(
summary.link(getUrl() + "/fixed", createFixedText())));
}

return summary.toString();
return createDefaultDeltaMessage(getUrl(), getNumberOfNewWarnings(), getNumberOfFixedWarnings());
}

private String createFixedText() {
if (getNumberOfFixedWarnings() == 1) {
return Messages.Warnings_ResultAction_OneFixedWarning();
}
else {
return Messages.Warnings_ResultAction_MultipleFixedWarnings(getNumberOfFixedWarnings());
}
}

private String createNewText() {
if (getNumberOfNewWarnings() == 1) {
return Messages.Warnings_ResultAction_OneNewWarning();
}
else {
return Messages.Warnings_ResultAction_MultipleNewWarnings(getNumberOfNewWarnings());
}
private String getUrl() {
return WarningsDescriptor.getResultUrl(group);
}

@Override
Expand Down
Expand Up @@ -4,13 +4,6 @@ Warnings.ProjectAction.Name=Compiler Warnings

Warnings.Trend.Name=Compiler Warnings Trend

Warnings.ResultAction.OneWarning=1 warning
Warnings.ResultAction.MultipleWarnings={0} warnings
Warnings.ResultAction.OneNewWarning=1 new warning
Warnings.ResultAction.MultipleNewWarnings={0} new warnings
Warnings.ResultAction.OneFixedWarning=1 fixed warning
Warnings.ResultAction.MultipleFixedWarnings={0} fixed warnings

Warnings.ResultAction.HealthReportNoItem=Compiler Warnings: no warnings found.
Warnings.ResultAction.HealthReportSingleItem=Compiler Warnings: 1 warning found.
Warnings.ResultAction.HealthReportMultipleItem=Compiler Warnings: {0} warnings found.
Expand Down
Expand Up @@ -4,13 +4,6 @@ Warnings.ProjectAction.Name=Compiler Warnungen

Warnings.Trend.Name=Compiler Warnungen Trend

Warnings.ResultAction.OneWarning=eine Warnung
Warnings.ResultAction.MultipleWarnings={0} Warnungen
Warnings.ResultAction.OneNewWarning=eine neue Warnung
Warnings.ResultAction.MultipleNewWarnings={0} neue Warnungen
Warnings.ResultAction.OneFixedWarning=eine behobene Warnung
Warnings.ResultAction.MultipleFixedWarnings={0} behobene Warnungen

Warnings.ResultAction.HealthReportNoItem=Compiler Warnungen: Keine Warnungen gefunden.
Warnings.ResultAction.HealthReportSingleItem=Compiler Warnungen: Eine Warnung gefunden.
Warnings.ResultAction.HealthReportMultipleItem=Compiler Warnungen: {0} Warnungen gefunden.
Expand Down

This file was deleted.

Expand Up @@ -4,13 +4,6 @@ Warnings.ProjectAction.Name=\u30b3\u30f3\u30d1\u30a4\u30e9\u306e\u8b66\u544a

Warnings.Trend.Name=\u30b3\u30f3\u30d1\u30a4\u30e9\u306e\u8b66\u544a\u306e\u63a8\u79fb

Warnings.ResultAction.OneWarning=1\u500b\u306e\u8b66\u544a
Warnings.ResultAction.MultipleWarnings={0}\u500b\u306e\u8b66\u544a
Warnings.ResultAction.OneNewWarning=1\u500b\u306e\u65b0\u3057\u3044\u8b66\u544a
Warnings.ResultAction.MultipleNewWarnings={0}\u500b\u306e\u65b0\u3057\u3044\u8b66\u544a
Warnings.ResultAction.OneFixedWarning=1\u500b\u306e\u4fee\u6b63\u3055\u308c\u305f\u8b66\u544a
Warnings.ResultAction.MultipleFixedWarnings={0}\u500b\u306e\u4fee\u6b63\u3055\u308c\u305f\u8b66\u544a

Warnings.ResultAction.HealthReportNoItem=\u30b3\u30f3\u30d1\u30a4\u30e9\u306e\u8b66\u544a\uff1a \u8b66\u544a\u306f\u3042\u308a\u307e\u305b\u3093\u3002
Warnings.ResultAction.HealthReportSingleItem=\u30b3\u30f3\u30d1\u30a4\u30e9\u306e\u8b66\u544a: 1\u500b\u306e\u8b66\u544a\u304c\u3042\u308a\u307e\u3059\u3002
Warnings.ResultAction.HealthReportMultipleItem=\u30b3\u30f3\u30d1\u30a4\u30e9\u306e\u8b66\u544a: {0}\u500b\u306e\u8b66\u544a\u304c\u3042\u308a\u307e\u3059\u3002
Expand Down

1 comment on commit a530b8e

@buildhive
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jenkins » warnings-plugin #8 FAILURE
Looks like this commit caused a build failure
(what's this?)

Please sign in to comment.